gentoo resync : 28.04.2019

4 files changed, 3 insertions, 111 deletions

diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 96adf587f27a..a244ed42cc3b 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,7 +1,3 @@
-DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
-DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
-EBUILD catfish-1.2.2.ebuild 1505 BLAKE2B faa976f3a9b71d1e3c61e3ff34a6aa994572d0f5e948e0d8b12cd09a6bc078d9e4d69d3bebfca9acbb64fd7e9a85ec0f9389fa407b35966a63663f3240cc73d4 SHA512 ad5ae1955a0fd0607bc42c40d05dd0fe7442a57ccdee60e150016d9e6fea7c7b8dcebda300dbca14db701a0589feac2ff8a4a8917c054eafd4a76d113daddfe6
-EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 604b7dbefd52af2d03b84c3470f3d87544132a7ac2381b88d56e8240eebc565d5b45f10076976ec011890fb160454336d7e754555536caa0fe5f1cb891c86d6a SHA512 fa0c10c2b546fa033463782e125b47de71765cfb0ea34dea8c0a6469793ba68bc411c5d50255c81cf089aff8080fb0db313dbfd4dc99c4cb834175cfa9d4dfff
-EBUILD catfish-1.4.7.ebuild 953 BLAKE2B 4f4435e59d8e4001617ce367643a8595f5c98449adc3ddd1891ecbbb4bcad12556533a09e5f8b4f0521b339d92e178d2412073a57c2ad7946093efbf0e865a12 SHA512 f2018305babd9b7c9e8cafd5d02436f852dd1bd9e3baa2c8e11926671575e85b9ffab063646233eff0324cb2345fb942e8d7a7b4dbd4aef4d2e0a9f31fc85949
+EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
deleted file mode 100644
index 42bde6bcd260..000000000000
--- a/dev-util/catfish/catfish-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/"
-SRC_URI="https://launchpad.net/${PN}-search/${PV%.*}/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-devel/gettext
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	strip-linguas -i po/
-	if ! [[ -z "${LINGUAS}" ]]; then
-		local lang langs=$(find po/ -name '*.po' | sed -e 's|po/||g;s|.po||g')
-		for lang in $langs; do
-			if ! has ${lang} ${LINGUAS}; then
-				rm po/${lang}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang .
-	sed -i -e "s:share/doc/\$(APPNAME):share/doc/${PF}:" Makefile.in.in || die
-}
-
-src_configure() {
-	# not autotools based
-	./configure --prefix=/usr --python="${EPYTHON}" || die
-}
-
-src_install() {
-	default
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/catfish/catfish-1.4.6.ebuild b/dev-util/catfish/catfish-1.4.6.ebuild
deleted file mode 100644
index 8d005bda8b69..000000000000
--- a/dev-util/catfish/catfish-1.4.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.7.ebuild b/dev-util/catfish/catfish-1.4.7.ebuild
index cdd0e8511b7a..4f37b98187f3 100644
--- a/dev-util/catfish/catfish-1.4.7.ebuild
+++ b/dev-util/catfish/catfish-1.4.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]