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

(Portage version: 2.2_rc25/cvs/Linux x86_64)

4 files changed, 12 insertions, 161 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/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