New version for GNOME-2.22.2. Bug fixes and notably fixes gentoo bug #223847.

Package-Manager: portage-2.1.5.2

3 files changed, 87 insertions, 5 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 0fa48308750e..c402eae1d9ad 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.84 2008/05/29 17:04:56 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.85 2008/05/31 14:21:48 eva Exp $
+
+*deskbar-applet-2.22.2.1 (31 May 2008)
+
+  31 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +deskbar-applet-2.22.2.1.ebuild:
+  New version for GNOME-2.22.2. Bug fixes and notably fixes gentoo bug
+  #223847.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org>
   deskbar-applet-2.22.1.ebuild:
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index 60051bb0a81c..7501c120f689 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -6,15 +6,17 @@ AUX deskbar-applet-2.19.5-multilib.patch 4273 RMD160 d7463d7d9f1c49ad9d7cf2328b0
 DIST deskbar-applet-2.20.3.tar.bz2 753652 RMD160 c7245a88f881b86a9352b7c0a0e40ce91708e30a SHA1 8241bf20e9c847448cb9037910ce1045316d4047 SHA256 20c4af80682c1a9018f70d33bde4a27dc87c8b5d37ba558c8db4218017414d8c
 DIST deskbar-applet-2.22.0.1.tar.bz2 836470 RMD160 7b75c645972328bc7ab3994e8bdc95fb94baf1cb SHA1 c68e0403aa2ecf20b3758b2273fcbd904e7b9b3b SHA256 6f17abbf17dc6206bb6041876a54590bf5180b90664b04d49a2c3111ff509c91
 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
 EBUILD deskbar-applet-2.20.3.ebuild 1903 RMD160 69afe0dc4b8ddf66656122336b7c4d3901379e45 SHA1 9ee404b59a8f51735b29f281703e6f5b93a993bb SHA256 e5782ec8ef0c501812993c9c9df82b30e69bf0430ddd054c45b5e5504342416a
 EBUILD deskbar-applet-2.22.0.1.ebuild 1972 RMD160 ca62bc63bf2bbcddbe737338902c4631ed0a12f6 SHA1 1e8c998226713e83ea8cb1ccc99368c93e8290c9 SHA256 280cd11fc66d1ce87f0a8a51ae840a93a3fae495633a3205ddb812c1af4cb765
 EBUILD deskbar-applet-2.22.1.ebuild 2128 RMD160 0fa7e9683079d0c5ba015111b3c4f5596de53014 SHA1 6e48cfe0096fd6665712aeacba3cd15e5d15e0ff SHA256 d04bc7587c5623fb9527bc217f3a7cf1f476be3c355d0e521ad7e200698edd46
-MISC ChangeLog 11975 RMD160 e89d5245136835f18b0223b028cdd8bf98b3b6b2 SHA1 2a26c4a69a38e0ed3e1963c395885aefea8cd1fa SHA256 f30a5c7a9632da4fcf32c9ee7eb9b2174ebe42c633e0bc91a4266da2c80dba88
+EBUILD deskbar-applet-2.22.2.1.ebuild 2126 RMD160 de716a1a290f70d31286fc0f4ecc44b7a1607a0e SHA1 a9f0bf024472cb8bb3bddd4146dd6059498e856a SHA256 b9ad075e2cb675b1445e3630b2ee8e18e22fdd8b64c1b71a5576b848e608636b
+MISC ChangeLog 12183 RMD160 6514b954b306a82fb7e466eb771e7add30a3d503 SHA1 56c8a2b0ca07bda28467f0fb2aee34837e1c4952 SHA256 9ac5e9d6e61b76977de9e5615058cc3a58b429abca2b8374ac0c16f45fd57b9d
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+4jwACgkQQU4yORhF8iAe9wCffMgjDHN/Ihe/4gXTx9JAH+0z
-ZQYAoI2zI8fjNXnsAh9XzVSgGEGO6m9S
-=B9j5
+iEYEARECAAYFAkhBXwgACgkQ1fmVwcYIWAbfCgCeJEIIlnngEpQa5AaWnwzP8eRS
+kSkAnjea0S+62ndj7KkWodLmqG8pRyDx
+=H5C7
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
new file mode 100644
index 000000000000..2a14269a2cce
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2008/05/31 14:21:48 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
+		 >=dev-python/gnome-python-extras-2.14
+		 >=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
+}