New version for GNOME 2.26. Drop use of glade and gnome-vfs. Clean up old revisions.

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

2 files changed, 39 insertions, 31 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 719f37148832..2cf60ce35bc4 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.117 2009/04/27 14:10:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.118 2009/05/10 22:47:10 eva Exp $
+
+*deskbar-applet-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.22.3.1.ebuild, +deskbar-applet-2.26.1.ebuild:
+  New version for GNOME 2.26. Drop use of glade and gnome-vfs. Clean up old
+  revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> deskbar-applet-2.24.3:
   Stable for HPPA (bug #260063).
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild
index bd5aff97dc2e..d7ea67547403 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.3.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.22.3.1.ebuild,v 1.7 2008/11/13 19:36:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild,v 1.1 2009/05/10 22:47:10 eva Exp $
 
-inherit gnome2 eutils autotools python
+GCONF_DEBUG="no"
+
+inherit 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"
+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/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 )"
+	>=x11-libs/gtk+-2.12
+	>=gnome-base/gnome-desktop-2.10
+	>=gnome-base/gconf-2
+
+	>=dev-python/pygtk-2.12
+	>=dev-python/pygobject-2.15.3
+	>=dev-python/dbus-python-0.80.2
+
+	>=dev-python/gconf-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/libwnck-python-2.22.0
+
+	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 )"
+	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"
 
@@ -45,21 +52,15 @@ pkg_setup() {
 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_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/deskbar
 	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
 
 	ebeep 5