bump to 2.20.1 and fix some QA warnings

(Portage version: 2.1.3.13)

5 files changed, 89 insertions, 7 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 6e30a5603765..2cbc0de8abeb 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.230 2007/10/06 21:28:23 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.231 2007/10/17 20:31:24 eva Exp $
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-panel-2.16.3.ebuild, gnome-panel-2.18.3.ebuild:
+  fix QA warnings
+
+*gnome-panel-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-panel-2.20.1.ebuild:
+  bump to 2.20.1
 
 *gnome-panel-2.20.0.1 (06 Oct 2007)
 
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.20.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.20.1
new file mode 100644
index 000000000000..70aa0a6a382f
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.20.1
@@ -0,0 +1,3 @@
+MD5 87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2 2820992
+RMD160 9648be6685038114066790136caf0cbade68ffba gnome-panel-2.20.1.tar.bz2 2820992
+SHA256 3ec39b085b905946fa891cb01ae320166a85e11e850f29bf622057a00a4d1b01 gnome-panel-2.20.1.tar.bz2 2820992
diff --git a/gnome-base/gnome-panel/gnome-panel-2.16.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.16.3.ebuild
index 6dc53a220011..9e0930a9414e 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.16.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.16.3.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-base/gnome-panel/gnome-panel-2.16.3.ebuild,v 1.11 2007/08/25 14:24:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.16.3.ebuild,v 1.12 2007/10/17 20:31:24 eva Exp $
 
 inherit gnome2
 
@@ -47,7 +47,7 @@ src_unpack() {
 
 	# FIXME : uh yeah, this is nice
 	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed"
+	sed -i 's:--load:-v:' "${S}"/gnome-panel/Makefile.in || die "sed failed"
 }
 
 pkg_postinst() {
@@ -55,7 +55,7 @@ pkg_postinst() {
 	if [ -e "$entries" ]; then
 		einfo "setting panel gconf defaults..."
 		GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-		${ROOT}/usr/bin/gconftool-2 --direct --config-source \
+		"${ROOT}"/usr/bin/gconftool-2 --direct --config-source \
 			${GCONF_CONFIG_SOURCE} --load=${entries}
 	fi
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
index e96b97a837e0..33a1738c61eb 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.18.3.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-base/gnome-panel/gnome-panel-2.18.3.ebuild,v 1.9 2007/09/22 09:25:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild,v 1.10 2007/10/17 20:31:24 eva Exp $
 
 inherit gnome2
 
@@ -49,7 +49,7 @@ src_unpack() {
 
 	# FIXME : uh yeah, this is nice
 	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed"
+	sed -i 's:--load:-v:' "${S}"/gnome-panel/Makefile.in || die "sed failed"
 }
 
 pkg_postinst() {
@@ -57,7 +57,7 @@ pkg_postinst() {
 	if [ -e "$entries" ]; then
 		einfo "setting panel gconf defaults..."
 		GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-		${ROOT}/usr/bin/gconftool-2 --direct --config-source \
+		"${ROOT}"/usr/bin/gconftool-2 --direct --config-source \
 			${GCONF_CONFIG_SOURCE} --load=${entries}
 	fi
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild
new file mode 100644
index 000000000000..ba1dafd1c729
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild,v 1.1 2007/10/17 20:31:24 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc eds"
+
+RDEPEND=">=gnome-base/gnome-desktop-2.12
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.13.0
+	>=x11-libs/gtk+-2.11.3
+	>=gnome-base/libglade-2.5
+	>=gnome-base/libgnome-2.13
+	>=gnome-base/libgnomeui-2.5.4
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/orbit-2.4
+	>=gnome-base/gnome-vfs-2.14.2
+	>=x11-libs/libwnck-2.19.5
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-menus-2.11.1
+	>=gnome-base/libbonobo-2
+	>=dev-libs/dbus-glib-0.71
+	x11-libs/libXau
+	media-libs/libpng
+	>=x11-libs/cairo-1.0.0
+	eds? ( >=gnome-extra/evolution-data-server-1.6 )"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper $(use_enable eds) \
+			--with-in-process-applets=clock,notification-area,wncklet"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# FIXME : uh yeah, this is nice
+	# We should patch in a switch here and send it upstream
+	sed -i 's:--load:-v:' "${S}/gnome-panel/Makefile.in" || die "sed failed"
+}
+
+pkg_postinst() {
+	local entries="/etc/gconf/schemas/panel-default-setup.entries"
+
+	if [ -e "$entries" ]; then
+		einfo "setting panel gconf defaults..."
+		GCONF_CONFIG_SOURCE=`"${ROOT}usr/bin/gconftool-2" --get-default-source`
+		"${ROOT}usr/bin/gconftool-2" --direct --config-source \
+			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
+	fi
+
+	# Calling this late so it doesn't process the GConf schemas file we already
+	# took care of.
+	gnome2_pkg_postinst
+}