Update to use EAPI=2 and fix dependencies. Remove old revisions.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

5 files changed, 18 insertions, 171 deletions

diff --git a/gnome-extra/hamster-applet/ChangeLog b/gnome-extra/hamster-applet/ChangeLog
index f429a3635d08..51f6308cf4be 100644
--- a/gnome-extra/hamster-applet/ChangeLog
+++ b/gnome-extra/hamster-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/hamster-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.7 2009/03/15 22:04:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.8 2009/03/21 12:35:23 eva Exp $
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -hamster-applet-2.24.1.ebuild, -hamster-applet-2.24.2.ebuild,
+  hamster-applet-2.24.3.ebuild:
+  Update to use EAPI=2 and fix dependencies. Remove old revisions.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org>
   hamster-applet-2.24.3.ebuild:
diff --git a/gnome-extra/hamster-applet/Manifest b/gnome-extra/hamster-applet/Manifest
index f0927756676e..cb57d975f9bc 100644
--- a/gnome-extra/hamster-applet/Manifest
+++ b/gnome-extra/hamster-applet/Manifest
@@ -3,18 +3,14 @@ Hash: SHA1
 
 AUX hamster-applet-2.24.0-gnomevfs.patch 744 RMD160 ad2da96b98822ddf16c7f9bce53f260a20c8928b SHA1 dc13b7280a4dbc3eeb70bf68115b11a180bd7128 SHA256 0571434947b125da75a9a62cb159136a60334c5250c49dbb777a4267de0f8f55
 AUX hamster-applet-2.24.0-python25.patch 1959 RMD160 302d2fd687d35462b23ce7becb8f3019f6656905 SHA1 9530e3aee51a3d8494e17af3de0f65098d18d60f SHA256 55b7fbb935da813fea51905c61a23a4fcdbae9581a7ea97b194e6981b7cb9a55
-DIST hamster-applet-2.24.1.tar.bz2 429935 RMD160 907c069bc4073531aeb8bbb84a3f17480227c2af SHA1 cb86182a4f7aad173471c637592fa3e63f500e95 SHA256 a3d2c732d2406a6967395b5e84755332ff118a35c9f00a6a1d54b6513208218a
-DIST hamster-applet-2.24.2.tar.bz2 401252 RMD160 6b4887d3f49fa8209607df6af44daadda9470170 SHA1 45d114b8311eca761c9faf668d1c6bf0e29d68fc SHA256 2bd0f14b5421193106fd8d3ba21c7a5880bda348e1ea4bf589e6c51acfdb4f6d
 DIST hamster-applet-2.24.3.tar.bz2 401534 RMD160 4c9c1a52e81b961de3a37916fc49a5c84a23a861 SHA1 6425b707c622d6f5c8f3caed4c7fc91d50aa2641 SHA256 f59f0647eab59b852402aeca208fba49aeda515cfbae504309f94a7c59784b22
-EBUILD hamster-applet-2.24.1.ebuild 1854 RMD160 ad83e008c1f4bf4d515389e99b7001fb52e3e9ba SHA1 a75b0f87faebd3915ae4bf9af233e102931fa01e SHA256 fb34587565e169aff094c86c56733f222b6f262f163ff076dcc9d82f212bb172
-EBUILD hamster-applet-2.24.2.ebuild 1611 RMD160 bdcc900d8c339c0b5b29ae319f81c28cf7983fba SHA1 5d3cd4a6d1fada2d915ba11607ecf92069810d5b SHA256 00b9d643646c6e95ccaba94dfe13674b56cbf4486f85ae30b03f3f8218b7766a
-EBUILD hamster-applet-2.24.3.ebuild 1612 RMD160 8840e0b93a9ded1595aa7eb4b1300ecb6a951179 SHA1 bfbd7fb3631a8473ae0ae037865f499018ca8f9f SHA256 5ca0cac699e08bfd563646375f1d0bc36da5d19f86b69a2ae4b736a90e17e299
-MISC ChangeLog 1476 RMD160 2a9575ad2e46b670fa6ecd78f4ff51aa36525cd8 SHA1 716245321c955bdff06fc8f46862f4aa293f8acf SHA256 fa15a3cfb5a521f7e47cf09ca784f36930b77df779eb82daf0a2ef98b8804ac6
+EBUILD hamster-applet-2.24.3.ebuild 1412 RMD160 cb244e3d4fb73bfce93b4ccb4d4efc20a2f8e30e SHA1 576b69fcbb49c59626ab5c7baa3f95cac1bb221d SHA256 ab35bf46509fc2d62622a7d8c76b1f1cbf002ffa76c234bbcbb627ceba76c381
+MISC ChangeLog 1691 RMD160 cd51a2e7bd6b0b6d7691f805e355ec28b7990bf0 SHA1 a7ca83de9d2616bc4e95d17dc0d6f3c7bd97b3bb SHA256 72067a2e0d5b18ddc9b5ff56e4872d8688320aa3180d6be196e98f74d17aba33
 MISC metadata.xml 356 RMD160 6547f0bc2bc56bf2d45d562045db0430e5cc8c90 SHA1 cb8155da094785b94dfb43e2ae95f8061f4c26f4 SHA256 d1b867ff5d8db648194a023f5b919ebaf9ef8f5878c9c6f4883c36c72393f6c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm9e3QACgkQkKaRLQcq0GIkLQCfdQHBy8NtHSMeUx1P3QxQO9ZK
-1a4AnRL7cdOv0mVJ9SPSpOVqSXOl98YD
-=mh63
+iEYEARECAAYFAknE3xEACgkQ1fmVwcYIWAaFRACeIE57muO+R02qxPyvKkjtDj87
+u60AoLeTwWmjVuqeV/vggLEEhrGaC8A4
+=n1Oh
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.24.1.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.24.1.ebuild
deleted file mode 100644
index 46a23c1cc6b2..000000000000
--- a/gnome-extra/hamster-applet/hamster-applet-2.24.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.24.1.ebuild,v 1.2 2008/10/29 20:29:04 eva Exp $
-EAPI=1
-
-GCONF_DEBUG="no"
-SCROLLKEEPER_UPDATE="no"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="Time tracking for the masses, in a GNOME applet"
-HOMEPAGE="http://projecthamster.wordpress.com/"
-
-# license on homepage is out-of-date, was changed to GPL-2 on 2008-04-16
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eds"
-
-RDEPEND="
-	|| ( >=dev-lang/python-2.5
-		 ( dev-lang/python:2.4
-		   dev-python/pysqlite:2 ) )
-	dev-python/gnome-applets-python
-	dev-python/gconf-python
-	dev-python/dbus-python
-	eds? ( dev-python/evolution-python )
-	>=dev-python/pygobject-2.14
-	>=dev-python/pygtk-2.12
-	>=x11-libs/gtk+-2.12
-	x11-libs/libXScrnSaver"
-
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	>=dev-util/intltool-0.37.1
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	local msg="Rebuild dev-lang/python-2.5 with the sqlite USE flag"
-	if has_version ">=dev-lang/python-2.5" && \
-		! built_with_use dev-lang/python sqlite ; then
-		eerror "${msg}"
-		die "${msg}"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow use of python 2.5, upstream bug #554249
-	epatch "${FILESDIR}/${PN}-2.24.0-python25.patch"
-
-	# Remove dependency on gnome-vfs, upstream bug #554250
-	epatch "${FILESDIR}/${PN}-2.24.0-gnomevfs.patch"
-
-	AT_M4DIR="m4" eautoreconf
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/hamster
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/hamster
-}
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.24.2.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.24.2.ebuild
deleted file mode 100644
index af8107ea05b9..000000000000
--- a/gnome-extra/hamster-applet/hamster-applet-2.24.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.24.2.ebuild,v 1.1 2008/11/24 20:59:09 eva Exp $
-
-EAPI="1"
-GCONF_DEBUG="no"
-SCROLLKEEPER_UPDATE="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Time tracking for the masses, in a GNOME applet"
-HOMEPAGE="http://projecthamster.wordpress.com/"
-
-# license on homepage is out-of-date, was changed to GPL-2 on 2008-04-16
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eds"
-
-RDEPEND="
-	|| ( >=dev-lang/python-2.5
-		 ( dev-lang/python:2.4
-		   dev-python/pysqlite:2 ) )
-	dev-python/gnome-applets-python
-	dev-python/gconf-python
-	dev-python/dbus-python
-	eds? ( dev-python/evolution-python )
-	>=dev-python/pygobject-2.14
-	>=dev-python/pygtk-2.12
-	>=x11-libs/gtk+-2.12
-	x11-libs/libXScrnSaver"
-
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	>=dev-util/intltool-0.37.1
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	local msg="Rebuild dev-lang/python-2.5 with the sqlite USE flag"
-	if has_version ">=dev-lang/python-2.5" && \
-		! built_with_use dev-lang/python sqlite ; then
-		eerror "${msg}"
-		die "${msg}"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/hamster
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/hamster
-}
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild
index 549c12966f98..a02f31f54d64 100644
--- a/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild
+++ b/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild,v 1.3 2009/03/15 22:04:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.24.3.ebuild,v 1.4 2009/03/21 12:35:23 eva Exp $
 
-EAPI="1"
+EAPI="2"
 GCONF_DEBUG="no"
 SCROLLKEEPER_UPDATE="no"
 
@@ -18,11 +18,12 @@ KEYWORDS="amd64 x86"
 IUSE="eds"
 
 RDEPEND="
-	|| ( >=dev-lang/python-2.5
+	|| ( >=dev-lang/python-2.5[sqlite]
 		 ( dev-lang/python:2.4
 		   dev-python/pysqlite:2 ) )
-	dev-python/gnome-applets-python
 	dev-python/gconf-python
+	dev-python/libgnome-python
+	dev-python/gnome-applets-python
 	dev-python/dbus-python
 	eds? ( dev-python/evolution-python )
 	>=dev-python/pygobject-2.14
@@ -38,18 +39,7 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_setup() {
-	local msg="Rebuild dev-lang/python-2.5 with the sqlite USE flag"
-	if has_version ">=dev-lang/python-2.5" && \
-		! built_with_use dev-lang/python sqlite ; then
-		eerror "${msg}"
-		die "${msg}"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
+src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile