Version bump for Gnome 2.32

Package-Manager: portage-2.1.9.23/cvs/Linux x86_64

8 files changed, 121 insertions, 437 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 9eaa078acef6..77a2f491e25f 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.142 2010/10/17 15:42:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.143 2010/10/29 21:29:20 pacho Exp $
+
+*deskbar-applet-2.32.0 (29 Oct 2010)
+
+  29 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/deskbar-applet-2.24.1-multilib.patch,
+  -deskbar-applet-2.26.2.ebuild, -deskbar-applet-2.26.2-r1.ebuild,
+  -files/deskbar-applet-2.26.2-double-label.patch,
+  -deskbar-applet-2.28.0.ebuild, +deskbar-applet-2.32.0.ebuild:
+  Version bump for Gnome 2.32: Use accessor functions so it compiles with
+  -DGSEAL_ENABLE, AccelEntry: Specify UTF-8 encoding at the top of the file,
+  removed gdmclient import and fixed switch user action, translation
+  updates. Make it compile when using python3 as main interpreter. Remove
+  old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   deskbar-applet-2.30.1.ebuild:
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index 1b2100ee4bf4..5e5a4e6a6f29 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -1,11 +1,16 @@
-AUX deskbar-applet-2.24.1-multilib.patch 8612 RMD160 7f22e4708189a5f68b9deed5532cdf75c5af5b9c SHA1 c056ae90dbb7471e92ef871d73779be00ad82ac4 SHA256 05f1e68a00a0007ffac40fb198705212add8b0da94175712fcf1e86cac84192a
-AUX deskbar-applet-2.26.2-double-label.patch 819 RMD160 88fd0989d067e9f0cbf3e28689959e6155041a1a SHA1 dcd80257c79126dc71cde28414089c34d8c021bb SHA256 cf41b7f4a59a399aa432cc2158d2bfd54b7018db38ba0ac934d298b47e7758c9
-DIST deskbar-applet-2.26.2.tar.bz2 981493 RMD160 439be94415675764d94aac06f8cb63ef56fef941 SHA1 4a203f094020ad3c743f2e1c888f3003302ecfcc SHA256 9c40f81d96c172311f4ca4c05c6718401d0958a3eb0dd7bee1dae580be0d78f6
-DIST deskbar-applet-2.28.0.tar.bz2 1087593 RMD160 308f8d5a09f82254334de77aa3fbf697e12116b0 SHA1 4901a7e0b62c092d0d3b5ebf4a0bab539b7bc5ec SHA256 bdac5c8a3595078911c1aba9f1013c936cdaaed41efbd87d092dfbc04b0ea2cb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST deskbar-applet-2.30.1.tar.bz2 1064879 RMD160 473b0ef8e18ea61a72a609f044ff11518b8fcc74 SHA1 f7647bc06692fcbf5e6d82daa6c15f5bcfa10206 SHA256 0754e15db1b5295dbb7e4134bafe06ffad054cf09d8f3034b95b14a0af534a89
-EBUILD deskbar-applet-2.26.2-r1.ebuild 2440 RMD160 0635554579462d3287be2853923e8b4613f0b251 SHA1 3bb720f506851a6fdf669e650808db124f2e676d SHA256 629b3310a0c6c30eec13e642f20fb3e31d94f95a9e0f5fe8e8fd6145bfd7591c
-EBUILD deskbar-applet-2.26.2.ebuild 2333 RMD160 31fcfaf1fd023fc803a87509a81de4f254677a50 SHA1 e2bd303334d6376fe68002ca3a52e9066e5885d4 SHA256 6675e5d4f65de50dd411b6e4f9375122d47c504dcd8382cf21d31763a852cfed
-EBUILD deskbar-applet-2.28.0.ebuild 2162 RMD160 437d3b1b90d416730bee7ca32aa677ba1d79eea8 SHA1 0669069f15f0bc1b9fab0cd0c21cc79c21a72c19 SHA256 2b34e52ee2c8e5e44bf3879ff2a6df23369621b0194099edcbb116d1419d653f
+DIST deskbar-applet-2.32.0.tar.bz2 1068070 RMD160 9359f23b353c5ce80aad8a07b298b8deafe94e5f SHA1 8bc918fe59c63f600b79288787dc48f2e8d452fa SHA256 123f2231ac8449f8376030c1b25394f9bab18d5d219292afc6f27eda77d4e684
 EBUILD deskbar-applet-2.30.1.ebuild 2206 RMD160 1a5def136f4f1d195ceee5b5f9f9e78144423187 SHA1 4045b529c0107dff03dcc39464b122d2348903f0 SHA256 cc1bfb8fe22a1927aa9df9890f1fa01454b8695d9d4d19c26ffefade3a7f22c8
-MISC ChangeLog 20995 RMD160 8fb2bd770ce51fafdd6818366c9ba0c2926e6024 SHA1 22d2796029cec035b1d695c555373456e3d78286 SHA256 78c4b79e1d89c6aa16054378b5b0f362203aeb6d8c2ea169c0b9ba3412b9cf1a
+EBUILD deskbar-applet-2.32.0.ebuild 2393 RMD160 29b94bb7e8e9db9675fb20578f3df90c08bfad16 SHA1 d6b838982a501ec682b75a54d02096a639ac1bf8 SHA256 5042070bd43d3a5c710b3efacf86223ff015587716caf1f484a3fcea417c9a07
+MISC ChangeLog 21608 RMD160 982a798b8fd14211b47e5189cd7976aba25c47af SHA1 1f3704032f7e9e64286adab0d7402a0a7cb0f794 SHA256 fe49a8278bc9759f1199973d84916ffc2abb47c5236541c64c413cb2d49ac8a0
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzLPLUACgkQCaWpQKGI+9QA8gCeNVoCbKtdemnHZ4yOwFGSD30s
+zX4An3K58dbpjOCfw1kc/SBGCd+ejeBx
+=ELHs
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
deleted file mode 100644
index f54049780d41..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 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.26.2-r1.ebuild,v 1.6 2010/07/20 02:14:54 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="eds spell"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=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
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	~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 crash while opening preferences dialog
-	epatch "${FILESDIR}/${PN}-2.26.2-double-label.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	# Needed for import gnomedesktop in configure, bug #270524
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/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.26.2.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild
deleted file mode 100644
index 674e42d529d7..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 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.26.2.ebuild,v 1.11 2010/07/20 02:14:54 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
-IUSE="eds spell"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=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
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	~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 intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	# Needed for import gnomedesktop in configure, bug #270524
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/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.28.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild
deleted file mode 100644
index 0b094bc3e0f0..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 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.28.0.ebuild,v 1.6 2010/08/14 18:49:57 armin76 Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="eds spell"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=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/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
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	~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
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	# Needed for import gnomedesktop in configure, bug #270524
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/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.32.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild
new file mode 100644
index 000000000000..31d5f416f940
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 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.32.0.ebuild,v 1.1 2010/10/29 21:29:20 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="An Omnipresent Versatile Search Interface"
+HOMEPAGE="http://projects.gnome.org/deskbar-applet/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="eds spell"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.20:2
+	>=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/gnome-applets-python-2.22
+	>=dev-python/gnome-desktop-python-2.22
+	>=dev-python/gnome-keyring-python-2.22
+	>=dev-python/libwnck-python-2.22
+
+	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
+	app-text/docbook-xml-dtd:4.2"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		$(use_enable eds evolution)
+		--exec-prefix=/usr
+		--disable-scrollkeeper"
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() {
+	# Needed for import gnomedesktop in configure, bug #270524
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+	python_clean_installation_image
+	python_convert_shebangs 2 "${ED}"usr/libexec/${PN}/${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize deskbar
+	python_mod_optimize /usr/libexec/deskbar-applet/deskbar-applet
+	python_mod_optimize /usr/libexec/deskbar-applet/modules-2.20-compatible
+
+	if ! has_version gnome-extra/gnome-utils; then
+		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."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup deskbar
+	python_mod_cleanup /usr/libexec/deskbar-applet/modules-2.20-compatible
+}
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch
deleted file mode 100644
index 7de6dc7c6953..000000000000
--- a/gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -Nura deskbar-applet-2.24.1.old/deskbar/core/keybinder/Makefile.am deskbar-applet-2.24.1/deskbar/core/keybinder/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/core/keybinder/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/core/keybinder/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_keybinderdir = $(pythondir)/deskbar/core/keybinder
-+_keybinderdir = $(pyexecdir)/deskbar/core/keybinder
- _keybinder_LTLIBRARIES = _keybinder.la
- _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder
- _keybinder_la_LIBADD = $(DESKBAR_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/core/Makefile.am deskbar-applet-2.24.1/deskbar/core/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/core/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/core/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,6 +1,6 @@
- SUBDIRS = keybinder updater _userdirs
- 	
--deskbar_coredir = $(pythondir)/deskbar/core
-+deskbar_coredir = $(pyexecdir)/deskbar/core
- deskbar_core_PYTHON = \
- 	__init__.py \
- 	BrowserMatch.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/core/updater/Makefile.am deskbar-applet-2.24.1/deskbar/core/updater/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/core/updater/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/core/updater/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,4 +1,4 @@
--updaterdir = $(pythondir)/deskbar/core/updater
-+updaterdir = $(pyexecdir)/deskbar/core/updater
- updater_PYTHON = \
- 	__init__.py \
- 	Capuchin.py
-diff -Nura deskbar-applet-2.24.1.old/deskbar/core/_userdirs/Makefile.am deskbar-applet-2.24.1/deskbar/core/_userdirs/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/core/_userdirs/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/core/_userdirs/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) $(GLIB_CFLAGS)
- 
--__userdirsdir = $(pythondir)/deskbar/core/_userdirs
-+__userdirsdir = $(pyexecdir)/deskbar/core/_userdirs
- __userdirs_LTLIBRARIES = __userdirs.la
- __userdirs_la_LDFLAGS = -module -avoid-version -export-symbols-regex init__userdirs
- __userdirs_la_LIBADD = $(DESKBAR_LIBS) $(GLIB_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/actions/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/actions/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/handlers/actions/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/handlers/actions/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -1,4 +1,4 @@
--deskbar_actionsdir = $(pythondir)/deskbar/handlers/actions
-+deskbar_actionsdir = $(pyexecdir)/deskbar/handlers/actions
- deskbar_actions_PYTHON = \
- 	__init__.py \
- 	ActionsFactory.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/evolution/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/evolution/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/handlers/evolution/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/handlers/evolution/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS)
- 
--_evolutiondir = $(pythondir)/deskbar/handlers/evolution
-+_evolutiondir = $(pyexecdir)/deskbar/handlers/evolution
- _evolution_LTLIBRARIES = _evolution.la
- _evolution_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_evolution
- _evolution_la_LIBADD = $(EVOLUTION_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/gdmclient/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/gdmclient/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/handlers/gdmclient/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/handlers/gdmclient/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_gdmclientdir = $(pythondir)/deskbar/handlers/gdmclient
-+_gdmclientdir = $(pyexecdir)/deskbar/handlers/gdmclient
- _gdmclient_LTLIBRARIES = _gdmclient.la
- _gdmclient_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gdmclient
- _gdmclient_la_LIBADD = $(DESKBAR_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/handlers/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/handlers/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -4,7 +4,7 @@
- SUBDIRS += evolution
- endif
- 
--deskbar_handlers_modulesdir = $(pythondir)/deskbar/handlers
-+deskbar_handlers_modulesdir = $(pyexecdir)/deskbar/handlers
- deskbar_handlers_modules_PYTHON = __init__.py
- 
- deskbar_handlersdir = $(libdir)/deskbar-applet/modules-2.20-compatible
-diff -Nura deskbar-applet-2.24.1.old/deskbar/interfaces/Makefile.am deskbar-applet-2.24.1/deskbar/interfaces/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/interfaces/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/interfaces/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,4 +1,4 @@
--deskbar_interfacesdir = $(pythondir)/deskbar/interfaces
-+deskbar_interfacesdir = $(pyexecdir)/deskbar/interfaces
- deskbar_interfaces_PYTHON = \
- 	__init__.py \
- 	Action.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/Makefile.am deskbar-applet-2.24.1/deskbar/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -6,7 +6,7 @@
- deskbarbindir = $(libdir)/deskbar-applet
- deskbarbin_SCRIPTS = deskbar-applet
- 
--deskbardir = $(pythondir)/deskbar
-+deskbardir = $(pyexecdir)/deskbar
- deskbar_PYTHON = \
- 	defs.py \
- 	gtkexcepthook.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/osutils/Makefile.am deskbar-applet-2.24.1/deskbar/osutils/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/osutils/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/osutils/Makefile.am	2008-10-24 08:53:31.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_osutilsdir = $(pythondir)/deskbar/osutils
-+_osutilsdir = $(pyexecdir)/deskbar/osutils
- _osutils_LTLIBRARIES = _osutils.la
- _osutils_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_osutils
- _osutils_la_LIBADD = $(DESKBAR_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/cuemiac/Makefile.am deskbar-applet-2.24.1/deskbar/ui/cuemiac/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/ui/cuemiac/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/ui/cuemiac/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,4 +1,4 @@
--deskbar_cuemiacdir = $(pythondir)/deskbar/ui/cuemiac
-+deskbar_cuemiacdir = $(pyexecdir)/deskbar/ui/cuemiac
- deskbar_cuemiac_PYTHON = \
- 	__init__.py \
- 	CuemiacActionsTreeView.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/iconentry/Makefile.am deskbar-applet-2.24.1/deskbar/ui/iconentry/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/ui/iconentry/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/ui/iconentry/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_iconentrydir = $(pythondir)/deskbar/ui/iconentry
-+_iconentrydir = $(pyexecdir)/deskbar/ui/iconentry
- _iconentry_LTLIBRARIES = _iconentry.la
- _iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry
- _iconentry_la_LIBADD = $(DESKBAR_LIBS)
-diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/Makefile.am deskbar-applet-2.24.1/deskbar/ui/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/ui/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/ui/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,6 +1,6 @@
- SUBDIRS = cuemiac iconentry preferences
- 
--deskbar_uidir = $(pythondir)/deskbar/ui
-+deskbar_uidir = $(pyexecdir)/deskbar/ui
- deskbar_ui_PYTHON = \
- 	__init__.py \
- 	About.py \
-diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/preferences/Makefile.am deskbar-applet-2.24.1/deskbar/ui/preferences/Makefile.am
---- deskbar-applet-2.24.1.old/deskbar/ui/preferences/Makefile.am	2008-10-24 08:50:46.000000000 +0200
-+++ deskbar-applet-2.24.1/deskbar/ui/preferences/Makefile.am	2008-10-24 08:53:30.000000000 +0200
-@@ -1,4 +1,4 @@
--deskbar_preferencesdir = $(pythondir)/deskbar/ui/preferences
-+deskbar_preferencesdir = $(pyexecdir)/deskbar/ui/preferences
- deskbar_preferences_PYTHON = \
- 	__init__.py \
- 	AccelEntry.py \
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch
deleted file mode 100644
index edf59922f3a3..000000000000
--- a/gnome-extra/deskbar-applet/files/deskbar-applet-2.26.2-double-label.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- deskbar-applet-2.26.2/data/prefs-dialog.ui.orig	2009-10-07 23:24:09.000000000 -0400
-+++ deskbar-applet-2.26.2/data/prefs-dialog.ui	2009-10-07 23:24:17.000000000 -0400
-@@ -1229,7 +1229,7 @@
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">12</property>
-                                 <child>
--                                  <object class="GtkLabel" id="label1315">
-+                                  <object class="GtkLabel" id="label1315b">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">_Keyboard shortcut to focus:</property>
-                                     <property name="use_underline">True</property>