3 files changed, 12 insertions, 60 deletions
diff --git a/dev-util/catfish/ChangeLog b/dev-util/catfish/ChangeLog
index d209b569bc5e..fbb058d06476 100644
--- a/dev-util/catfish/ChangeLog
+++ b/dev-util/catfish/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/catfish
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/ChangeLog,v 1.17 2014/08/02 13:47:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/ChangeLog,v 1.18 2014/08/03 04:27:05 ssuominen Exp $
+
+  03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> -catfish-0.6.4.ebuild:
+  old
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> catfish-1.0.2.ebuild:
   Stable for x86, wrt bug #502536
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 057ec5a849fc..ac2f497ca875 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST catfish-0.6.4.tar.bz2 63322 SHA256 3b3033e18edc65e3a578e8f06a2e66202d93704247bf14c39d393ecfff321522 SHA512 e18b5d3d2d97a84b629bb10ed4b3985e50eee6426a086695cee83c14f77edaf6887e01405d8fc63715c16fb527b1d395b8addf0efbc77164a4ebc9fd8d879b0e WHIRLPOOL 988f0d2ad881d4a41e8fc9bf304ea6d1cc47ce011ff41cef70dbb961ebbdc86fa423ab6d374a481c6ef03e38e650f11ceb7bae590c1db49a26f94dba7d55f108
 DIST catfish-1.0.2.tar.bz2 74200 SHA256 797d80aa185dda99eef74c4d75f0afe5797af41b1de67d3103005f7a4861c02a SHA512 a0f1c070a256e96b64911e5fafdacf659dc8434414c05c10d510784a480d0d785235724e709100cdd6e79b54d2c4438b506b78ca7406c7228a0a1710a8860422 WHIRLPOOL d6952dbf5af6a31cc0e70d3c60d293fd4c929e96d51c36acfeb85b8673014120fd037620a8175cd854e15c4ac6ccd0f0ac89f059b1dadabe3ff1122e5736fbb0
-EBUILD catfish-0.6.4.ebuild 1179 SHA256 d9e38d1ca5e79248367c043bf59166efacba3e09aeaf6731e84d76494f4d95f5 SHA512 df5b64fb8db909e707cc3b12a884be424d2a573b7170af2e2a2b9da09faa47eececf4e5afecd2553b0664ed6157a4d72bb7fcb31e88bf77d9269f715454a2fbf WHIRLPOOL 78863e9213d3e88443bf6327d64cf875de40abb1e3f3989d14fc8179dfcf2a55a93f9256296c9a5a82c1fcc732c76d91bd808f6c2b6116386d827cfd53122dad
 EBUILD catfish-1.0.2.ebuild 1282 SHA256 3fe2bcb5970f13417409dcfaedcedd6ad1f92e34068d0666b66f60f7e330cc4e SHA512 d1dc7ec84d4527176089bf6ef04df57dc04ce03c833d4b4db55ce0b4a3a2f4d7a9b4c77d0e77d543a6a1d51edf6f11917e86b8beaddcaec81f532042bfdcbcd2 WHIRLPOOL 4bbb63c8b692dad56debc877d7bee2b102636e0011f82329a1a2b491fce4963af39af2c0a2e4301ec380d3d0e5fdcbc6ecfd58395b96ffd8bb6603c8549af994
-MISC ChangeLog 2970 SHA256 4d134b1066bdc3096714d4e014d63b01e9d2bce260c9b98243e50c2c833e559b SHA512 aeb5d3bdaff9f473dbe105ec73a1017dfd1de0fd294e582accfecc550b297b163161caeb25c4b7ecf9abe3e75f85e9b5a0d24522067648624d6a288e75346bbd WHIRLPOOL a18ea2b7be4d76721bb9b3aee6a558cca361dab257c639b6e1df63b6e7844e7475653e738d845b64ba916c33e0c64ae04bf4c6794c467d96f102237c76d898e1
+MISC ChangeLog 3060 SHA256 80ec2cf3aef2553ea7cd4f9fa5ed005c2502b66cf04558b901ebfad996111c59 SHA512 c1922892d6d4017762ccdd2fcc7fbf6e33c73a3f1f0f8113ed2d3fec3befdff1d749cf08ed6eb7024a77577150b2f5942a6842c22acc1b8a4f951b733306621e WHIRLPOOL 8aa596bc3f3db7e286c8e5713b9ede13b990177b692b81e13ce06b6fad721deced930a100c42696bdbce3e3042b8de08706caec16a40c5bda4d00a8f7133178d
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3Ov2AAoJELp701BxlEWfWY0P+wayU0MmytBOocxIIm4T1dM7
-j4rS9c38iVaExteF48/AOQ6a5YdRti4YGEyiVsdZ1ZloFfB3dZNcfop2cehJQGIb
-JnlNEHJm4GMVpBG8ZBlKRWJZ5/M2pmEQI0UGXZDmbw9eMgDYUFamAmRZCIus3OX0
-H5ELT5g12Ip8OUC0WYrn0lYbxA2d5j6zU5kC4C5R9JVyyyj5yHQC3IL4JWZHEGlg
-E6p4Kv63IfoZJ3TUro0Wb1Lm7APCMi+bJSx2bWPVcITrTENPwGg3eokL29W47kri
-dKwBKiGFq8xHxLPfiWdsfB2NWQAziWGyyd4WBm4iit9VlUMFRZNyyv7s+nAuDEnZ
-79qgMHWj/r3YXWU6Q984mPvu0aNukhimTDT6xNvHVqhu97C5RtjPkYgOV1s9MuQU
-EXkzdmO0xHS5ujzRTdRvfWKfC0ZwZjQP3FnvdtBx3eDt+ggSv2jsnT9t1No314s0
-yomxI8plJ6dPUmHQfiCK8A3M1WHPahCnkP8yy74bjuoYL9KGZzpeU3jLFhCFp74d
-3ytj6yDwrJTg8JXU7eKXpiwW6NTtczfeNxQJ6bdTDOoWpVRX4+4ZMB0jc3yDLK+4
-Hx/CJsWfuG1wvn+iURFCgde1++3FhRHvmLOX1w69jkvvu6opPTL+FmKUaBINl8IC
-2unr+In7L5ZmkgG7CkdJ
-=9mMp
+iQEcBAEBCAAGBQJT3boMAAoJEEdUh39IaPFNJWMH/0S5WoukQd3NfffhgBGXcHWV
+i6OrlKTUnWfT4WECMpls/5CFG9X6XtRWihUYltNKCrGLjxElEyDbjEScJsr4t1Da
+aUTFx21O+93MC87zSI7eFbztrjRuQOsSZjM/p010FfOm/7bFaT7jngDCimKhADCs
+bs/UY3PiKPB+gnf0WIC9oHHQZ/TOFWu1kzTgV4fm46gXhWxElxilQypSbtQHWg54
+Qe+IrRIq/I5jNA+0VmBSX8x3zIEG/JkKivJE5DbcSQKHsjH4MjLEi5kghlqTnQdJ
+ynVY7cdsJH8EgXmqUN/VDemSvxHHJXoAI/my2YPVnTOxTEL+BbBOOivYhHD4VAM=
+=JLg0
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catfish/catfish-0.6.4.ebuild b/dev-util/catfish/catfish-0.6.4.ebuild
deleted file mode 100644
index 94aff0e85329..000000000000
--- a/dev-util/catfish/catfish-0.6.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catfish/catfish-0.6.4.ebuild,v 1.4 2013/10/13 09:12:59 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit gnome2-utils python-single-r1
-
-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/pygobject:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-	sed -i -e "s:share/doc/\$(APPNAME):share/doc/${PF}:" Makefile.in.in || die
-}
-
-src_configure() {
-	./configure --prefix=/usr --python="${EPYTHON}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }