Review dependencies and clean up old revisions.

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

4 files changed, 14 insertions, 166 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 328cf8a21ce3..cdcff2de04d2 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.114 2009/03/18 15:39:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.115 2009/03/21 12:25:37 eva Exp $
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.22.3.1-r1.ebuild, -deskbar-applet-2.24.2.ebuild,
+  deskbar-applet-2.24.3.ebuild:
+  Review dependencies and clean up old revisions.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org>
   deskbar-applet-2.24.3.ebuild:
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1-r1.ebuild
deleted file mode 100644
index aed767b2d973..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1-r1.ebuild
+++ /dev/null
@@ -1,79 +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/deskbar-applet/deskbar-applet-2.22.3.1-r1.ebuild,v 1.1 2008/09/14 19:28:17 ford_prefect Exp $
-
-inherit gnome2 eutils autotools python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="eds spell test"
-
-# TODO: check if gnome-doc-utils doesn't imply scrollkeeper
-
-RDEPEND=">=dev-lang/python-2.4
-		 >=x11-libs/gtk+-2.10
-		 >=dev-python/pygtk-2.10
-		 >=dev-python/gconf-python-2.22.1
-		 >=dev-python/gnome-vfs-python-2.22.1
-		 >=dev-python/libgnome-python-2.22.1
-		 >=gnome-base/gnome-desktop-2.10
-		 >=dev-python/dbus-python-0.80.2
-		 >=dev-python/gnome-applets-python-2.22.0
-		 >=dev-python/libwnck-python-2.22.0
-		 >=gnome-base/gconf-2
-		 eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
-		 spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=sys-devel/autoconf-2.60
-		  app-text/scrollkeeper
-		  app-text/gnome-doc-utils
-		  dev-util/pkgconfig
-		test? ( ~app-text/docbook-xml-dtd-4.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable eds evolution)
-		--exec-prefix=/usr
-		--disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix installing libs into pythondir
-	epatch "${FILESDIR}"/${PN}-2.19.5-multilib.patch
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
-	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-
-	ebeep 5
-	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
-	ewarn "gnome-extra/gnome-utils.  If it is not present, the dictionary "
-	ewarn "plugin will fail silently."
-	epause 5
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/deskbar
-	python_mod_cleanup /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-}
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.24.2.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.24.2.ebuild
deleted file mode 100644
index efdc5092e62e..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.24.2.ebuild
+++ /dev/null
@@ -1,81 +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/deskbar-applet/deskbar-applet-2.24.2.ebuild,v 1.2 2008/11/29 20:17:27 eva Exp $
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="eds spell test"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=x11-libs/gtk+-2.12
-	>=dev-python/pygtk-2.12
-	>=dev-python/pygobject-2.12
-	>=gnome-base/gnome-desktop-2.10
-	>=dev-python/dbus-python-0.80.2
-	dev-python/gnome-desktop-python
-	>=dev-python/gconf-python-2.22.1
-	>=dev-python/gnome-vfs-python-2.22.1
-	>=dev-python/libgnome-python-2.22.1
-	>=dev-python/gnome-applets-python-2.22.0
-	>=dev-python/libwnck-python-2.22.0
-	>=gnome-base/gconf-2
-	eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
-	spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable eds evolution)
-		--exec-prefix=/usr
-		--disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix installing libs into pythondir
-	epatch "${FILESDIR}/${PN}-2.24.1-multilib.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# needed to build on a libtool-1 system, bug #243822
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
-	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-
-	ebeep 5
-	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
-	ewarn "gnome-extra/gnome-utils.  If it is not present, the dictionary "
-	ewarn "plugin will fail silently."
-	epause 5
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/deskbar
-	python_mod_cleanup /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-}
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild
index a45f78c760c1..067b5d6bba5d 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild,v 1.7 2009/03/18 15:39:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild,v 1.8 2009/03/21 12:25:37 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -16,16 +16,19 @@ IUSE="eds spell test"
 
 RDEPEND=">=dev-lang/python-2.4
 	>=x11-libs/gtk+-2.12
-	>=dev-python/pygtk-2.12
-	>=dev-python/pygobject-2.12
 	>=gnome-base/gnome-desktop-2.10
 	>=dev-python/dbus-python-0.80.2
-	dev-python/gnome-desktop-python
+
+	>=dev-python/pygtk-2.12
+	>=dev-python/pygobject-2.12
 	>=dev-python/gconf-python-2.22.1
-	>=dev-python/gnome-vfs-python-2.22.1
 	>=dev-python/libgnome-python-2.22.1
 	>=dev-python/gnome-applets-python-2.22.0
+	>=dev-python/gnome-desktop-python-2.22.0
+	>=dev-python/gnome-keyring-python-2.22.0
+	>=dev-python/gnome-vfs-python-2.22.1
 	>=dev-python/libwnck-python-2.22.0
+
 	>=gnome-base/gconf-2
 	eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
 	spell? ( >=gnome-extra/gnome-utils-2.16.2 )"