Review dependencies and clean up old revisions.

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

5 files changed, 26 insertions, 171 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/Manifest b/gnome-extra/deskbar-applet/Manifest
index 52fdaea3dad5..83cd2f53b3b3 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -1,11 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX deskbar-applet-2.19.5-multilib.patch 4273 RMD160 d7463d7d9f1c49ad9d7cf2328b05b321aace8257 SHA1 80e1d11db28d3fb43fd996d40bcf43e8c2655c77 SHA256 64534097fdc608d5dff58a16ee6de62267928a55026aff0039c361255a6d2bbe
 AUX deskbar-applet-2.24.1-multilib.patch 8612 RMD160 7f22e4708189a5f68b9deed5532cdf75c5af5b9c SHA1 c056ae90dbb7471e92ef871d73779be00ad82ac4 SHA256 05f1e68a00a0007ffac40fb198705212add8b0da94175712fcf1e86cac84192a
 DIST deskbar-applet-2.22.3.1.tar.bz2 818973 RMD160 a6082d020853cf8b354625a1a0e85547bc60697f SHA1 4742a8822f6c8b1a3ff9ebd7650930aa02947233 SHA256 c2c629a3ee8f6b530d4e07a0e39ec3dcc07988579f12289131ba1c3f8ead0f0c
-DIST deskbar-applet-2.24.2.tar.bz2 931165 RMD160 0b33dbd098c11582085a8b633fd9c1074777c9bb SHA1 731a0e97b51c75992f6fe01afe8288c8b8f31c11 SHA256 0ebb2dcaeb67997bfa37b93fa412545622bdcf6b36213a32272f6be02c0f14db
 DIST deskbar-applet-2.24.3.tar.bz2 933238 RMD160 bb75ae2bc3e740641578b771b5ad74679cde7b23 SHA1 d52ffb898847f505c052b79b80cec0e20026ebf6 SHA256 8bf875f051553c9cef6ba9c27ad9f7477395e15cf954013cc0fe228e66dda5f6
-EBUILD deskbar-applet-2.22.3.1-r1.ebuild 2269 RMD160 848a53dfe2fdd7e4121233d18a36bef5397fad22 SHA1 78c38f29d7b42d5fe039a60a8211e24c64b74091 SHA256 f0c5506f67bc8ce019991ee88c7ce556277970bc2b11e9419109e168381b0871
 EBUILD deskbar-applet-2.22.3.1.ebuild 2133 RMD160 2182e7e0233587f0d78e14715d7e6c53ecf7a0a8 SHA1 7b9ce9c55fffddb5ce16fc851d75950f00267597 SHA256 0096ed00b6b5beabff11456e02517948cdf9437afdba38e419b552916f1d84aa
-EBUILD deskbar-applet-2.24.2.ebuild 2280 RMD160 04bf234e2c8d75cb960fda3ee2421ca9bd8074ef SHA1 3fc44c88f70a24e08ab25cdbc078c94d4071c65b SHA256 1720bdd7bcd7d85cbccccc1af47f77ed33ddeaad93032560fd8e0e07da602468
-EBUILD deskbar-applet-2.24.3.ebuild 2296 RMD160 5ad18ed64388060a3c5b7c0a0bcd49675495c31d SHA1 9555b8caa3802a6c77d92f3b74d3ded6675d6e81 SHA256 2583ff9e4f860bcecd251bd1d118304bcc7c86a15b249165674ecf3afe17a2ab
-MISC ChangeLog 16444 RMD160 fd7e420cada49b1c6e781238a1b92df259508f94 SHA1 df917578c92cfc35bd368bb755f4b77698c290a1 SHA256 e974687b2b8a88c6ad9dc7ec0cfd1682357f816070f3da8b725f2e1894550723
+EBUILD deskbar-applet-2.24.3.ebuild 2345 RMD160 c86099632af299193c895079e4abb1f68803fdd6 SHA1 31306b69605b78c352989a6da39d2f4e08ac051c SHA256 0ce8d6bf6fb6c669d19cb74b2a328e9cc91c9bce15ec46c7e60255341c63961f
+MISC ChangeLog 16646 RMD160 7da75911cca237d6e2dc46baeb1829d937d99ed0 SHA1 33b4f8087045cd5e2f18abd9c3be52d8298aaf79 SHA256 fa409fa6aa059975e2372972de858bfd7d8098eb865817452c3cc36a15feb72a
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknE3MgACgkQ1fmVwcYIWAbBNwCeN5TWGx0BXq/T/VucGWdQHI65
+7T8AmQHzDYribwror4aZxxa03nq2Q7AG
+=PPVo
+-----END PGP SIGNATURE-----
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 )"