old

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

8 files changed, 8 insertions, 347 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/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