bump to 2.22.3.1. Fix delicious plugin. clean up old revisions

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64

4 files changed, 29 insertions, 82 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 02bd1ddd5aa0..ca98b5bab44a 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.89 2008/07/30 22:02:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.90 2008/08/04 21:43:15 eva Exp $
+
+*deskbar-applet-2.22.3.1 (04 Aug 2008)
+
+  04 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.22.1.ebuild, -deskbar-applet-2.22.2.1.ebuild,
+  +deskbar-applet-2.22.3.1.ebuild:
+  bump to 2.22.3.1. Fix delicious plugin.
 
   30 Jul 2008; Brent Baude <ranger@gentoo.org> deskbar-applet-2.22.3.ebuild:
   Marking deskbar-applet-2.22.3 ppc stable for bug 229709
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index fe40c50ab04f..a0d6f431e467 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX deskbar-applet-2.19.5-multilib.patch 4273 RMD160 d7463d7d9f1c49ad9d7cf2328b05b321aace8257 SHA1 80e1d11db28d3fb43fd996d40bcf43e8c2655c77 SHA256 64534097fdc608d5dff58a16ee6de62267928a55026aff0039c361255a6d2bbe
 DIST deskbar-applet-2.20.3.tar.bz2 753652 RMD160 c7245a88f881b86a9352b7c0a0e40ce91708e30a SHA1 8241bf20e9c847448cb9037910ce1045316d4047 SHA256 20c4af80682c1a9018f70d33bde4a27dc87c8b5d37ba558c8db4218017414d8c
-DIST deskbar-applet-2.22.1.tar.bz2 842795 RMD160 ea0d2d27b2af22389db63eafe28d2723fdef64cb SHA1 e1f7784af5ac4493b3800424018b4a10eac69425 SHA256 503a7ac4d066ee08b6dcaf2da60c7e6ad639bb63a7a179214294cc7ed625c4bf
-DIST deskbar-applet-2.22.2.1.tar.bz2 819331 RMD160 46cf96eb518831d98c421f3d2aa57ec933feb40a SHA1 ab7f5ca0f2bddf762de097588b64f3e4fad29a40 SHA256 6c67dee22acd8ac25029686715142f3739e9238f999daefbbd9a88233f8452f6
+DIST deskbar-applet-2.22.3.1.tar.bz2 818973 RMD160 a6082d020853cf8b354625a1a0e85547bc60697f SHA1 4742a8822f6c8b1a3ff9ebd7650930aa02947233 SHA256 c2c629a3ee8f6b530d4e07a0e39ec3dcc07988579f12289131ba1c3f8ead0f0c
 DIST deskbar-applet-2.22.3.tar.bz2 818747 RMD160 48ab40ada04172da3082e4a35f141adf81f929ad SHA1 ff1904fc4c5c52377b39306c07dcfcca2e4ac0e5 SHA256 b0746a571e3bdeccc36f42b1320163eed578eeecc9c432138c8b3d7bbe2cbd7f
 EBUILD deskbar-applet-2.20.3.ebuild 1861 RMD160 16d674301c6bd19f9ad399d878c154070f07d4b9 SHA1 d2c7de180a17d046d77b3db658bdea9fc665ba59 SHA256 8847a820943087caa3bff2853d4ad4ec30652d650dc58056720d8f324ce06113
-EBUILD deskbar-applet-2.22.1.ebuild 2083 RMD160 083661c1c0f9612236620f6f9e062cdd1cc22a87 SHA1 f237decdf25a24c2cd3ce050aa63c699012dc246 SHA256 551282a7083981081398f72cd3b19fcf067cf0b4c72df5c439cc8e38f3428efe
-EBUILD deskbar-applet-2.22.2.1.ebuild 2085 RMD160 331446149eccfc3b2cb310dfc625b8e88c368562 SHA1 153544fbc9fec554e1390a100161bd3575644bae SHA256 c1a24e9a3e79ef5a46959fd807e5e43b6842aa7a351c23c6a99510fc63601aae
+EBUILD deskbar-applet-2.22.3.1.ebuild 2138 RMD160 92f1361e3c246a2e0b0a7469f820ce841392f8f1 SHA1 ce4cad63b3653994112659b86390264cc0d253c6 SHA256 b08f86cbc9e177984340a2a3a78f917cb92008819da8204e9dbcc6af86f5e847
 EBUILD deskbar-applet-2.22.3.ebuild 2084 RMD160 291120cd3d50363d4f2382853ee3a56c81040ede SHA1 bec9a9aeaa1c4403f03c635241ddd6cab0942574 SHA256 1b4f9eaa397b3259aad3ba6973028eb545ee543c28e8903371c6ed0e8ecf1ca2
-MISC ChangeLog 12927 RMD160 30592c97f923fa09861b89caca35e1c39cbda150 SHA1 08d591ecb681f91b2970ab84047ecb6aef68cfe3 SHA256 1c2ba512be847d8b35ade4f7830b5e8d396868fd9cbd9d5bb8b4069cb3a8fd9d
+MISC ChangeLog 13162 RMD160 d7da85e191edb86188c35d10c250b845d5336d63 SHA1 5fbcfd676f3e33534b301af2216bb2599c97908c SHA256 9aa85c6a6f1c1f3b83d5eaee624146c2289c307d295c1a66a5edf491707e6b6e
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEUEARECAAYFAkiXd/cACgkQ1fmVwcYIWAZEVACfddyZi0uxhbpZMzdYWZQRdy8n
+9V0Al3iCwcMo1KJ4/0TQkgtgYD/FuXA=
+=l/Ib
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
deleted file mode 100644
index 4afebc9b1be8..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
+++ /dev/null
@@ -1,72 +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.1.ebuild,v 1.3 2008/06/29 20:41:36 eva 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"
-
-# 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/gnome-python-2.10
-		 >=gnome-base/gnome-desktop-2.10
-		 >=dev-python/dbus-python-0.80.2
-		 >=dev-python/gnome-python-desktop-2.14.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"
-
-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.22.2.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1.ebuild
index 3d3f46983b7b..e52fa29b9b60 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.2 2008/06/29 20:41:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1.ebuild,v 1.1 2008/08/04 21:43:15 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -10,7 +10,7 @@ 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"
+IUSE="eds spell test"
 
 # TODO: check if gnome-doc-utils doesn't imply scrollkeeper
 
@@ -30,12 +30,16 @@ DEPEND="${RDEPEND}
 		>=sys-devel/autoconf-2.60
 		  app-text/scrollkeeper
 		  app-text/gnome-doc-utils
-		  dev-util/pkgconfig"
+		  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"
+	G2CONF="${G2CONF}
+		$(use_enable eds evolution)
+		--exec-prefix=/usr
+		--disable-scrollkeeper"
 }
 
 src_unpack() {