bump to 2.20.0 & fix QA warnings

(Portage version: 2.1.3.12)

6 files changed, 144 insertions, 6 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 4e2fa4dde134..6b66bef56e5c 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.64 2007/09/23 13:41:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.65 2007/10/13 13:24:27 eva Exp $
+
+  13 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  deskbar-applet-2.16.2-r1.ebuild, deskbar-applet-2.18.1.ebuild:
+  fix QA warnings
+
+*deskbar-applet-2.20.0 (13 Oct 2007)
+
+  13 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/deskbar-applet-2.19.5-multilib.patch,
+  +deskbar-applet-2.20.0.ebuild:
+  bump to 2.20.0
 
   23 Sep 2007; Tom Gall <tgall@gentoo.org> deskbar-applet-2.18.1.ebuild:
   stable on ppc64
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
index b5a187ea8dc5..e2563e3472f7 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.16.2-r1.ebuild,v 1.12 2007/08/02 05:39:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild,v 1.13 2007/10/13 13:24:27 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -39,10 +39,10 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Fix installing libs into pythondir
-	epatch ${FILESDIR}/${PN}-2.15.3-multilib.patch
+	epatch "${FILESDIR}"/${PN}-2.15.3-multilib.patch
 
 	# Unset DISPLAY before tests; bug #148056
-	epatch ${FILESDIR}/${PN}-2.16.1-display.patch
+	epatch "${FILESDIR}"/${PN}-2.16.1-display.patch
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
index 57ee5b37833f..3a36ff16598c 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.1.ebuild,v 1.11 2007/09/23 13:41:19 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild,v 1.12 2007/10/13 13:24:27 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -39,7 +39,7 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Fix installing libs into pythondir
-	epatch ${FILESDIR}/${PN}-2.15.3-multilib.patch
+	epatch "${FILESDIR}"/${PN}-2.15.3-multilib.patch
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.20.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.20.0.ebuild
new file mode 100644
index 000000000000..6039a24af1b7
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.20.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 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.20.0.ebuild,v 1.1 2007/10/13 13:24:27 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"
+
+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.71
+		 >=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
+		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
+
+	# Fix tests
+	echo "deskbar/ui/preferences/ModuleListView.py" >> po/POTFILES.in
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ebeep 5
+	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
+	ewarn "gnome-utils.  If it is not present, the dictionary plugin will "
+	ewarn "fail silently."
+	epause 5
+}
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch
new file mode 100644
index 000000000000..8fc73d2480b9
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch
@@ -0,0 +1,66 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/core/gnomedesktop/Makefile.am deskbar-applet-2.19.5/deskbar/core/gnomedesktop/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/core/gnomedesktop/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/core/gnomedesktop/Makefile.am	2007-07-11 14:44:32.000000000 -0400
+@@ -1,6 +1,6 @@
+ INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
+ 
+-_gnomedesktopdir = $(pythondir)/deskbar/core/gnomedesktop
++_gnomedesktopdir = $(pyexecdir)/deskbar/core/gnomedesktop
+ _gnomedesktop_LTLIBRARIES = _gnomedesktop.la
+ _gnomedesktop_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gnomedesktop
+ _gnomedesktop_la_LIBADD = $(DESKBAR_LIBS)
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/core/keybinder/Makefile.am deskbar-applet-2.19.5/deskbar/core/keybinder/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/core/keybinder/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/core/keybinder/Makefile.am	2007-07-11 14:44:53.000000000 -0400
+@@ -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 --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/handlers/evolution/Makefile.am deskbar-applet-2.19.5/deskbar/handlers/evolution/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/handlers/evolution/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/handlers/evolution/Makefile.am	2007-07-11 14:45:45.000000000 -0400
+@@ -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 --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/handlers/gdmclient/Makefile.am deskbar-applet-2.19.5/deskbar/handlers/gdmclient/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/handlers/gdmclient/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/handlers/gdmclient/Makefile.am	2007-07-11 14:45:35.000000000 -0400
+@@ -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 --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/osutils/Makefile.am deskbar-applet-2.19.5/deskbar/osutils/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/osutils/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/osutils/Makefile.am	2007-07-11 15:07:35.000000000 -0400
+@@ -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 init_osutils
+ _osutils_la_LIBADD = $(DESKBAR_LIBS)
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/ui/iconentry/Makefile.am deskbar-applet-2.19.5/deskbar/ui/iconentry/Makefile.am
+--- deskbar-applet-2.19.5.orig/deskbar/ui/iconentry/Makefile.am	2007-07-09 17:25:59.000000000 -0400
++++ deskbar-applet-2.19.5/deskbar/ui/iconentry/Makefile.am	2007-07-11 14:45:19.000000000 -0400
+@@ -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 --git a/gnome-extra/deskbar-applet/files/digest-deskbar-applet-2.20.0 b/gnome-extra/deskbar-applet/files/digest-deskbar-applet-2.20.0
new file mode 100644
index 000000000000..5465e96396b8
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/digest-deskbar-applet-2.20.0
@@ -0,0 +1,3 @@
+MD5 3b7ae77476f7b11e53e50c8751e4ca1f deskbar-applet-2.20.0.tar.bz2 755569
+RMD160 81ed3da0ac266d6f9d50b703fdd00680c7e567d7 deskbar-applet-2.20.0.tar.bz2 755569
+SHA256 71b964ee21838c8b84e2bad4194f348613f6435b1c500d87776ea61de19cf264 deskbar-applet-2.20.0.tar.bz2 755569