From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 12 Apr 2020 03:41:30 +0100
Subject: gentoo Easter resync : 12.04.2020

---
 dev-util/diffuse/Manifest                       |  4 +-
 dev-util/diffuse/diffuse-0.4.8-r1.ebuild        | 59 -------------------------
 dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild |  2 +-
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 dev-util/diffuse/diffuse-0.4.8-r1.ebuild

(limited to 'dev-util/diffuse')

diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 644ed61ed67c..13c0bccb34c5 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,3 @@
-DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
 DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
-EBUILD diffuse-0.4.8-r1.ebuild 1239 BLAKE2B 8c34de327c24f6d2c376e86302ecebf020196d3c3e8aafcc8fa5367c57cc3ea2ae816eb256664436502ee708fe39dc1315811e55caca2aff56e74855de71c4e0 SHA512 b6b34b7f7609cd5aae6c0850346c99d73386ddb78dbd467ed3cd64949e10a73aa9d4c892720c53eb66c22df38ae739ce637ec1672696778812299257697470ad
-EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1416 BLAKE2B 0df539779ca60e8a2cad6e218e889439da3988307c7b95918d559d5e7220c58a9ff8faca4493985b44637a9b3839fd7ddc6fe68ac77e29164ceb746d1b0023ad SHA512 fbfc3cd53209517743dae6bea1cc5fc46acef0e64e433ed1bc6f41991097065eabd2963b205585bf2033798bed14170beec72e49d2bcda7eb49527d0d7ce3541
+EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1414 BLAKE2B 472e1cc2fcf4ba492b00a74c25dffab8f2db7fc28af51208cff12a8072812dfe0d5ce6d4c862e6692a2641716dd0095b53ea74f426567ac601ce2d7919b8ebd9 SHA512 957ca0ff76bf1bb0b9fda46e67df07cf0360accfd0254ae027f1d7bf78da9080cff2a0302194a6a12090de9feaa144368742736be05e990f41a6e3d3152e5e91
 MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
diff --git a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
deleted file mode 100644
index 5a0d5a3968a4..000000000000
--- a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-	')"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
index 1cb786be52c5..c11d80eb5f9a 100644
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-- 
cgit v1.2.3