old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

9 files changed, 16 insertions, 364 deletions

diff --git a/dev-util/catfish/ChangeLog b/dev-util/catfish/ChangeLog
index acff707bdaa9..f6f4ba11353f 100644
--- a/dev-util/catfish/ChangeLog
+++ b/dev-util/catfish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/catfish
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/ChangeLog,v 1.5 2013/04/27 16:23:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/ChangeLog,v 1.6 2013/04/27 16:25:24 ssuominen Exp $
+
+  27 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -catfish-0.3.2.ebuild,
+  -catfish-0.3.2-r1.ebuild, -catfish-0.4.0.2.ebuild,
+  -files/catfish-0.3.2-fix_gtkiconload.patch,
+  -files/catfish-0.3.2-fix_tracker_backend.patch, -files/catfish-gentoo.patch,
+  -files/catfish-gentoo.patch-r1:
+  old
 
 *catfish-0.6.3 (27 Apr 2013)
 
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index f23dcf01eddf..437f3d42de84 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX catfish-0.3.2-fix_gtkiconload.patch 741 SHA256 1ad415febd9e1abd3748899ff68a60c5522274df83ca2148cbbcd36dd3bc1c08 SHA512 935289343a9526114a23b7e4ffb891adb64e1c4e26c90225a953a7e2510778136d0a3d915579a1beb641694230eb0d570bddd4aaef66b55c5513f7b1ffcd57e3 WHIRLPOOL c585fcb0b65c4d07f2cd8eddfbca05daf9dee306557c30c20a8b1a106e89164440a6bff96c34745ad9056dfbd2906b595f8445077f9d2bf2fa16da6b6a31508b
-AUX catfish-0.3.2-fix_tracker_backend.patch 573 SHA256 45893d91fd08783f8a8b1fbb3a1033c2dfd7be408ca1733a320994dca2383cf4 SHA512 3aa0d339915953f15c65cc8570204bc83be9e63aa0d87ea15947f50d07f405f9fc6a44cfa9bd00e6648b41ce0b11c54ec11841536b21ee819284b5026b4ff918 WHIRLPOOL 43b61b0a511dac375603fa1f9a95edb5ba434f21802cd1e9792ed944f783ca5b956c6b8f985ea14dcec0219930382380514b108ee1a43d4a4671c72d9e6bbc8d
-AUX catfish-gentoo.patch 2518 SHA256 bd66b75cd314d9a0b005693992bc5e829d2cf200d88488201cb02ecfeb8d45f0 SHA512 4a7afe88b8637822b26859065fba02cd0fba5b0ff5fff12f91e5738fe0b14b44013f59062c2054372c86d0b29c32e6886225019d0096cf1f00a48f77d95a242b WHIRLPOOL 87799064f6399b19655b9989b1baa6215bca93be928df5ee2e519f30c1419e13cc2e9fad75f301eeb1ad574adf9382a32c559146b3db2f9078e88f50b9978868
-AUX catfish-gentoo.patch-r1 2060 SHA256 649ca0467afa1ae8b77f68e19fa98625d7dd73680da75f76bd8d91dbf1387d65 SHA512 cde6dd4fc1c47a743fe7176e2b5a0e539100e96fed6116e9d029618319fc4cec83b267522aada0acc3e3a07dff36f8739fce27723794bc824b3dba4157f14318 WHIRLPOOL 66267b4e5abb1f7f1ae8506dc472c1956f397a8b43511bd57a657119122b084f9ac4e3801ffd4ae710708dd2ed1cd72176ee94b17fa8ced1b2be5654a74cf02e
-DIST catfish-0.3.2.tar.gz 35702 SHA256 15266b1961ba64552b969c4c84752c931fd29412fe142835cbc3dde6385588f4 SHA512 f1d077f0ac19a8b15211dbd53e2190083db6ff1d26ac26885929ac5185a9167278a73622c4b418f1d20d9a99c1e48b3a96e12dcc604e639ea54459f6d0d1d5ff WHIRLPOOL 0de93e7af620c48ebf2498a11f80a1ef0ef75c9174f3a662ac07a535b0caffd107ecf09219796b8db17bd6c9a97237b4b18285f3586def7c6e7301b9c25c5cad
-DIST catfish-0.4.0.2.tar.bz2 41330 SHA256 f316c6ca7e79407d193564c5c0d83d707021b15c8429b79fda437bf2e2e56ee8 SHA512 e9c1fc93747bb7d6fa741d99c032ef1675fa4981150ee81c2c991a5b79cd94261768d474a535d105625ba13b9ee3f8debc6de01366f688a2cdeb34115161b86c WHIRLPOOL 720263460fa8774f7e55a5883a2cce95d8d3e12a8471300b2c6a122cff8065f2aa17c041fc63112546116fa5b33387c9c04ab956a96c952334ca27efafb2da44
 DIST catfish-0.6.3.tar.bz2 58582 SHA256 f09f99b623a18c5bc2e216d97515cbced4545959824364f94a3a51a1d16cb56a SHA512 9d5bc56c4779c34370e4cc40b71b3fbd95ce49fbc8fc5da63eb7ba897ad30abbf9a6494d1eed0e8b17cd61747ef8c8fda982d9c9de58e17b10dbad28ed82d1bc WHIRLPOOL 48d095d0b812ce5a4c81f3719ba350ffe4b0e7b6bdc10d651898f674f1f1349bed796afcc899bf2247400819ab79de1818760f09cfb055edf06d8d98c14f7921
-EBUILD catfish-0.3.2-r1.ebuild 1469 SHA256 85f39f0193bc3160e5a76dc4fe5cb237015b67ae27e99f7275c61d1c5abc4923 SHA512 387eb988a45041e42cf2ca7086dc35c12f02ff15919d2cac30ee9158d5d6a95b3fe269090d24c5d637eea7330c61aff9efd504c29e7f94479703295e6d7fe22a WHIRLPOOL 700f7425820548c998738173d969221f661307a07d5e9bb9a09c25ce9261131c1229d1aebb910aa587a915ef454ea47e7b84214e2317c5e96ae97c4c04875b26
-EBUILD catfish-0.3.2.ebuild 1366 SHA256 3700b322fb2f96c149c0772703a63ab5e4b2fd969608a476d144f7309b755938 SHA512 3e0a76caffad18cf2111d8ad7923c955b1a6cfe0323988d8e3dbf3ca477c0310a43fd43aca1ffee1e246123eb9bc8d3b98f689c7224137ba3f377130100b031d WHIRLPOOL d8a471c70b7be6893ac480e15d727fededd45215a8b5fbee4f03aa6aed0327bbdde43d482e4ce1c45d7171a40c3c6ae882f52daec4b57a862c39a041ea6f053d
-EBUILD catfish-0.4.0.2.ebuild 1407 SHA256 ef54884e0435c6a48b1cd7b3d4a3496335a5768887a1b04689d4a8c5215516ef SHA512 28135d3d02fd9b6d5560817ae7d51d55fa26969463034637f099331056b6ec99ed41c8f065e45813dfc520cac709778dee7244cf69172d4016f57e64342c8b8d WHIRLPOOL b916594a35224124ca38e74dd6001de4db777eee6a9a2999f7212b473d737ff1295b84b4f8536f580750f65a00a87ca11074bb4978c88ecc6502f6efa5bbb6db
 EBUILD catfish-0.6.3.ebuild 1175 SHA256 478b12d79783eeac122e748508a8fe32ad55923f446ba80d4ded7ae5924fb63c SHA512 87256937bb007597b0fb71a3f0de2957cea6e5d8e8652d8dd42e2b801b5e42995dc27a261e3e6dc8d3ac1a1d77a5a3aa925996a6a2562133cf41e225fe179592 WHIRLPOOL 3c28ece98d0dfb1d0d31f40c910479774081d9528df6e53f4b18f9862cc6d222e6414f8bbb339f1c4148540f869d479da16a11c80abf6ef9d9fdb9ab08a06bad
-MISC ChangeLog 1197 SHA256 48ad9750298ba3b7a7c7198f31e4e3249c3738648705365020faaf075ba27bb8 SHA512 ab7bbf1338aab435bdfbc117187bbd611201528d9b444956845992a5366ae38903b510284c127454a0815350550add145b3c81582e856f32fcfe75db078842f9 WHIRLPOOL 213c43e70b7294ec8849c94000a4f78d7cf4aba9006c867dcfb5015639df089ad387f634f7af911fcaa6bd173df74dbb6dcf391fb700446764f6f6c792b8650c
+MISC ChangeLog 1493 SHA256 39804db82b2feac02c081be2f0648e7037fd8eb142c67df220fce87fe2478f9a SHA512 0ac088f521b5b7982391e2398dd3ff043e3842e71ddb4f56cf71d633b3f3be9f4c77148a9c38494599923a7e7b761c0180219683008898ad957f9f66e459b0e1 WHIRLPOOL a35191a8997a9039ae9d3bdd3ba717ee8e89e2abfea7cfb77a803aa61e38e9174fdc42ba50996e4f960341834a5ce6511c1abdd27c880b0afaedbb8de59799d6
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRe/s9AAoJEEdUh39IaPFNIqwH/RXf8cdaTEXGI1KT52W4vAae
-XHfUORQT5m2TtMtTWo8S2Ec4S8zOfN1V3K0yAQZoy3co4vDCmxpbs4TU2E9BcWYg
-KTkwNMG6/Ws/MiPYQjJ84cWVeUIm7z1tluw37Dv1sG9J0BFJeFMY0UELBL96S0j7
-W+2iRvrQ2v+rnfhZ48iGeEJf9yUwLtwpK0Mq9bg4fRbt5kMxkokeAvJKE11by4zU
-xVMrf3CpFK4N+Efib0r4yln/5K2htMR6YGWEEtYv33H+a9vy2/X1hY5p/bt4wybd
-atn5fLqOeCSzf9y/pWxjIgVrRIEPwDCkOt7UbyPIGy6poGDoaj6YkKMBV+bherg=
-=+LSt
+iQEcBAEBCAAGBQJRe/uaAAoJEEdUh39IaPFNUt4IAJpgkdvbVveZxiCZsnF7kVmu
+9RHpst31M8EAmbfQefn+zBuxC6Ua/x7nSJgyReMIpuG5nBP5s4SwVwi7E6J8wCx8
+1k1dXCQLYEJxidDNy+b2UADWkvTJSzCDXy+aYq9FcST/t3DP9HV9zo0INKEwV73u
+z2S30CHDwZ6dOAg8SHmiDHQTri4lEocXIKz7iMcTOzyX6Sp8ajZ4TtkV8+TEA7Oz
+4LPBLjtcQaVBxQheoZRjWnpKkcHlN/Xz0TuwUDpgptbZfqm0osyRO+q6Kd2uh4Rh
+Od/p+yJRjRFQ5tJgvJ1kumrew4p28dCQt9Pnj1zXQPMJt5ZNffikLcApr5dmDlo=
+=RHKS
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catfish/catfish-0.3.2-r1.ebuild b/dev-util/catfish/catfish-0.3.2-r1.ebuild
deleted file mode 100644
index 215aba9ef7a1..000000000000
--- a/dev-util/catfish/catfish-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/catfish-0.3.2-r1.ebuild,v 1.1 2012/08/02 14:20:19 ssuominen Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.7"
-inherit eutils gnome2-utils multilib python
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="http://software.twotoasts.de/index.php?/pages/catfish_summary.html"
-SRC_URI="http://www.twotoasts.de/media/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	>=dev-python/pygtk-2
-	dev-python/pyxdg"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-gentoo.patch \
-		"${FILESDIR}"/${P}-fix_tracker_backend.patch \
-		"${FILESDIR}"/${P}-fix_gtkiconload.patch
-
-	python_convert_shebangs 2 {build,catfish}.py
-
-	cat <<-EOF > "${T}"/${PN}
-	#!/bin/sh
-	cd /usr/$(get_libdir)/${PN}
-	python2 ${PN}.pyc "\$@"
-	EOF
-}
-
-src_configure() {
-	./configure --prefix=/usr || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-
-	dobin "${T}"/${PN}
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/catfish/catfish-0.3.2.ebuild b/dev-util/catfish/catfish-0.3.2.ebuild
deleted file mode 100644
index ea86bb57597c..000000000000
--- a/dev-util/catfish/catfish-0.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/catfish-0.3.2.ebuild,v 1.2 2012/02/05 01:41:24 floppym Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.7"
-inherit eutils gnome2-utils multilib python
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="http://software.twotoasts.de/index.php?/pages/catfish_summary.html"
-SRC_URI="http://www.twotoasts.de/media/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	>=dev-python/pygtk-2
-	dev-python/pyxdg"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gentoo.patch
-
-	python_convert_shebangs 2 {build,catfish}.py
-
-	cat <<-EOF > "${T}"/${PN}
-	#!/bin/sh
-	cd /usr/$(get_libdir)/${PN}
-	python2 ${PN}.pyc "\$@"
-	EOF
-}
-
-src_configure() {
-	./configure --prefix=/usr || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-
-	dobin "${T}"/${PN}
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/catfish/catfish-0.4.0.2.ebuild b/dev-util/catfish/catfish-0.4.0.2.ebuild
deleted file mode 100644
index fb56271eacc8..000000000000
--- a/dev-util/catfish/catfish-0.4.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/catfish-0.4.0.2.ebuild,v 1.1 2012/10/05 17:53:01 ssuominen Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.7"
-inherit eutils gnome2-utils multilib python
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="http://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/"
-SRC_URI="http://launchpad.net/${PN}-search/${PV%.*.*}/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	>=dev-python/pygtk-2
-	dev-python/pyxdg"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gentoo.patch-r1
-
-	python_convert_shebangs 2 {build,catfish}.py
-
-	cat <<-EOF > "${T}"/${PN}
-	#!/bin/sh
-	cd /usr/$(get_libdir)/${PN}
-	python2 ${PN}.pyc "\$@"
-	EOF
-}
-
-src_configure() {
-	./configure --prefix=/usr || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-
-	dobin "${T}"/${PN}
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/catfish/files/catfish-0.3.2-fix_gtkiconload.patch b/dev-util/catfish/files/catfish-0.3.2-fix_gtkiconload.patch
deleted file mode 100644
index b8e7434eb416..000000000000
--- a/dev-util/catfish/files/catfish-0.3.2-fix_gtkiconload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://patch-tracker.debian.org/patch/series/view/catfish/0.3.2-2/40Fix_gtkiconload.dpatch
-
---- catfish.py
-+++ catfish.py
-@@ -707,9 +707,12 @@
-             return self.icon_cache[name]
-         except KeyError:
-             icon_size = gtk.icon_size_lookup(icon_size)[0]
--            icon = self.icon_theme.load_icon(name, icon_size, 0)
--            self.icon_cache[name] = icon
--            return icon
-+            try:
-+                icon = self.icon_theme.load_icon(name, icon_size, 0)
-+                self.icon_cache[name] = icon
-+                return icon
-+            except gobject.GError:
-+                return
- 
-     def get_thumbnail(self, path, icon_size=0, mime_type=None):
-         """Try to fetch a small thumbnail."""
diff --git a/dev-util/catfish/files/catfish-0.3.2-fix_tracker_backend.patch b/dev-util/catfish/files/catfish-0.3.2-fix_tracker_backend.patch
deleted file mode 100644
index 5015784cf954..000000000000
--- a/dev-util/catfish/files/catfish-0.3.2-fix_tracker_backend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://patch-tracker.debian.org/patch/series/view/catfish/0.3.2-2/30Fix_tracker_backend.dpatch
-
---- catfish.py
-+++ catfish.py
-@@ -629,6 +629,7 @@
-                     if self.options.debug: print 'Debug:', msg
-                     query = generic_query()
-                 for filename in query.run(keywords, folder, exact, hidden, limit):
-+                    filename = filename.strip()
-                     if self.abort_find or len(listmodel) == limit: break
-                     filename = filename.split(os.linesep)[0]
-                     # Convert uris to filenames
diff --git a/dev-util/catfish/files/catfish-gentoo.patch b/dev-util/catfish/files/catfish-gentoo.patch
deleted file mode 100644
index e2cc794d96de..000000000000
--- a/dev-util/catfish/files/catfish-gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-The Makefile.in part of this patch is not suitable for upstream!
-
---- catfish.desktop
-+++ catfish.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Type=Application
- Name=Catfish
- Comment=File search
-@@ -8,7 +7,7 @@
- Comment[es]=Buscador de archivos
- Comment[fi]=Etsi tiedostoja
- Comment[fr]=Recherche de fichiers
--Categories=GTK;Utility;Filesystem;
-+Categories=GTK;Utility;System;Filesystem;
- Exec=catfish
- Icon=catfish
- Terminal=false
---- Makefile.in
-+++ Makefile.in
-@@ -3,9 +3,9 @@
- PYTHON=`which python`
- LANGUAGE_FILES=$(patsubst po/%.po, locale/%/LC_MESSAGES/$(APPNAME).mo, $(wildcard po/*.po))
- DESTDIR=
-+LIBDIR=lib
- 
- all: $(LANGUAGE_FILES)
--	$(PYTHON) ./build.py build $(APPNAME)
- 	sed -e s,%prefix%,$(PREFIX), $(APPNAME).in > $(APPNAME)
- 	chmod +x $(APPNAME)
- 
-@@ -14,29 +14,19 @@
- 	msgfmt $< -o $@
- 
- install: all
--	install -d $(DESTDIR)/$(PREFIX)/bin
--	install $(APPNAME) $(DESTDIR)/$(PREFIX)/bin
--
--	install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).pyc $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
-+	install -d $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
-+	install $(APPNAME).py $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
-+	install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
- 	install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
--	ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
--
--	install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
-+	ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)/$(APPNAME).svg
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/applications
- 	install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications
- 
- 	cp -rf locale $(DESTDIR)/$(PREFIX)/share
--	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
-+	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)/locale
- 
- uninstall:
- 	rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop
diff --git a/dev-util/catfish/files/catfish-gentoo.patch-r1 b/dev-util/catfish/files/catfish-gentoo.patch-r1
deleted file mode 100644
index 815e4ff9c7f5..000000000000
--- a/dev-util/catfish/files/catfish-gentoo.patch-r1
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -3,9 +3,9 @@
- PYTHON=`which python`
- LANGUAGE_FILES=$(patsubst po/%.po, locale/%/LC_MESSAGES/$(APPNAME).mo, $(wildcard po/*.po))
- DESTDIR=
-+LIBDIR=lib
- 
- all: $(LANGUAGE_FILES)
--	$(PYTHON) ./build.py build $(APPNAME)
- 	sed -e s,%prefix%,$(PREFIX), $(APPNAME).in > $(APPNAME)
- 	chmod +x $(APPNAME)
- 
-@@ -14,29 +14,19 @@
- 	msgfmt $< -o $@
- 
- install: all
--	install -d $(DESTDIR)/$(PREFIX)/bin
--	install $(APPNAME) $(DESTDIR)/$(PREFIX)/bin
--
--	install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).pyc $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
-+	install -d $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
-+	install $(APPNAME).py $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
-+	install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
- 	install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
--	ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
--
--	install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
-+	ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)/$(APPNAME).svg
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/applications
- 	install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications
- 
- 	cp -rf locale $(DESTDIR)/$(PREFIX)/share
--	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
-+	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(APPNAME)/locale
- 
- uninstall:
- 	rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop