Revision bump including multiple fixes from 2.32 and master upstream branches (including upstream fix for bug #357197 by Alessandro Surace and using gnome-applications.menu instead of applications.menu as it's our default value until upstream resolve their bug #623221 in a better way). Also drops --with-in-process-applets configure option to prevent annoying error messages about applets disappearing 'unexpectedly' when removing wncklet, clock or notification-area applets (upstream default value for this is 'none'). Remove old.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 58 insertions, 87 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 72595e1ee888..2efaae4c950c 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.331 2011/03/22 19:11:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.332 2011/04/03 15:44:39 pacho Exp $
+
+*gnome-panel-2.32.1-r2 (03 Apr 2011)
+
+  03 Apr 2011; Pacho Ramos <pacho@gentoo.org> -gnome-panel-2.30.2.ebuild,
+  -gnome-panel-2.32.1.ebuild, +gnome-panel-2.32.1-r2.ebuild:
+  Revision bump including multiple fixes from 2.32 and master upstream branches
+  (including upstream fix for bug #357197 by Alessandro Surace and using
+  gnome-applications.menu instead of applications.menu as it's our default
+  value until upstream resolve their bug #623221 in a better way). Also drops
+  --with-in-process-applets configure option to prevent annoying error messages
+  about applets disappearing 'unexpectedly' when removing wncklet, clock or
+  notification-area applets (upstream default value for this is 'none'). Remove
+  old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-panel-2.32.1-r1.ebuild:
   Marking gnome-panel-2.32.1-r1 ppc stable for bug 353436
diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
deleted file mode 100644
index b02bb78c3c79..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 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.30.2.ebuild,v 1.11 2011/03/16 10:45:17 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc eds networkmanager policykit"
-
-RDEPEND="=dev-lang/python-2*
-	>=gnome-base/gnome-desktop-2.26.0:2
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.18.0:2
-	>=x11-libs/gtk+-2.19.7:2
-	>=dev-libs/libgweather-2.27.90:2
-	dev-libs/libxml2:2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4:2
-	>=x11-libs/libwnck-2.19.5:1
-	>=gnome-base/gconf-2.6.1:2
-	>=media-libs/libcanberra-0.23[gtk]
-	>=gnome-base/gnome-menus-2.27.92
-	>=gnome-base/libbonobo-2.20.4
-	gnome-base/librsvg:2
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.2
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )
-	policykit? ( >=sys-auth/polkit-0.91 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# eautoreconf needs
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --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
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild
index 79576064b878..b8fc1b657ef7 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2011 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.32.1.ebuild,v 1.5 2011/03/16 10:45:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild,v 1.1 2011/04/03 15:44:39 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.4"
 
-inherit gnome2 python
+inherit gnome2 python eutils autotools
 
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2
+	http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
@@ -34,7 +36,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	bonobo? (
 		>=gnome-base/libbonobo-2.20.4
 		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/orbit-2.4:2
+		>=gnome-base/orbit-2.4
 		>=x11-libs/libwnck-2.19.5:1 )
 	eds? ( >=gnome-extra/evolution-data-server-1.6 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
@@ -45,7 +47,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40
 	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
+	doc? ( >=dev-util/gtk-doc-1 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
 # eautoreconf needs
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am
@@ -56,7 +60,6 @@ pkg_setup() {
 		--disable-static
 		--disable-scrollkeeper
 		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
 		$(use_enable bonobo)
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)
@@ -65,6 +68,42 @@ pkg_setup() {
 	python_set_active_version 2
 }
 
+src_unpack() {
+	# If gobject-introspection is installed, we don't need the extra .m4
+	if has_version "dev-libs/gobject-introspection"; then
+		unpack ${P}.tar.bz2 ${P}-patches.tar.bz2
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# List the objects before the libraries to fix build with --as-needed
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# Try to improve panel behavior on multiscreen systems, bug #348253, upstream #632369
+	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen.patch"
+	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch"
+
+	# Apply multiple bugfixes from 2.32 and master branches
+	# Also use gnome-applications.menu instead of applications.menu as it's the default value for us.
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	AT_M4DIR=${WORKDIR} eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# gnome-panel does not need la files for applets
+	find "${ED}"/usr/$(get_libdir)/${PN} -name "*.la" -delete
+	# no package could ever need this, remove it before anyone tries to
+	rm "${ED}"/usr/$(get_libdir)/libpanel-applet-3.la
+}
+
 pkg_postinst() {
 	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
 	local gconftool="${EROOT}usr/bin/gconftool-2"