Change deps to use split gnome-python (gconf, gnome-vfs, libgnome) and gnome-python-desktop (gnome-applets, libwnck) bindings. Thanks to Nirbheek Chauhan (bheekling) for the initial work on this.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 i686

3 files changed, 90 insertions, 2 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 988b6a9c8eb4..772618bca0ae 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,14 @@
 # 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.97 2008/09/09 11:25:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.98 2008/09/14 19:28:17 ford_prefect Exp $
+
+*deskbar-applet-2.22.3.1-r1 (14 Sep 2008)
+
+  14 Sep 2008; Arun Raghavan <ford_prefect@gentoo.org>
+  +deskbar-applet-2.22.3.1-r1.ebuild:
+  Change deps to use split gnome-python (gconf, gnome-vfs, libgnome) and
+  gnome-python-desktop (gnome-applets, libwnck) bindings. Thanks to Nirbheek
+  Chauhan (bheekling) for the initial work on this.
 
   09 Sep 2008; Raúl Porcel <armin76@gentoo.org>
   deskbar-applet-2.22.3.1.ebuild:
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index aeecabc50c32..6ced01a31c3b 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -3,7 +3,8 @@ DIST deskbar-applet-2.20.3.tar.bz2 753652 RMD160 c7245a88f881b86a9352b7c0a0e40ce
 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.3.1-r1.ebuild 2269 RMD160 848a53dfe2fdd7e4121233d18a36bef5397fad22 SHA1 78c38f29d7b42d5fe039a60a8211e24c64b74091 SHA256 f0c5506f67bc8ce019991ee88c7ce556277970bc2b11e9419109e168381b0871
 EBUILD deskbar-applet-2.22.3.1.ebuild 2137 RMD160 3567d2aa07c2ba8a932f765b363b8cfdca78afc0 SHA1 9e86a4d7643ffac33d4dbd03eb073cc59bf8e4c6 SHA256 b286f3d2184e9691b4e5468b6292f0ac2955451d191408ec07d9e46442e012a7
 EBUILD deskbar-applet-2.22.3.ebuild 2081 RMD160 e5a98ea3da19d4a713b9f0fe47ee429510935e40 SHA1 a6f5ce51055dc501dc3ee5723a9de68fc6b0a4a1 SHA256 182d98c26c0a0af6baecaeb9f415e97db45947e3b6323157302fc7e936935b39
-MISC ChangeLog 13737 RMD160 339a018d9ccf6144c8c3f4533a5465824fdccdf1 SHA1 789291755f09476bb9da2fa153223cbc74f0d399 SHA256 9eed222e6786619f594f476dd1cb1f1246e426047365e0ae6c6c6f8699be2600
+MISC ChangeLog 14081 RMD160 85d0956090569bbb1f263a5151cb8f26368bfb8f SHA1 4c26d2a0e232bc0652527c5814a4a68ac7c70f9c SHA256 865bc19e0bfc4420e7a862f67aa38622dd7f25d8243ef8e9153a00eea5344430
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
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
new file mode 100644
index 000000000000..aed767b2d973
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1-r1.ebuild
@@ -0,0 +1,79 @@
+# 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
+}