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.

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

4 files changed, 71 insertions, 91 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/Manifest b/gnome-base/gnome-panel/Manifest
index 4008e57c1f51..29f3f7b68c48 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,11 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-panel-2.32.1-as-needed.patch 1030 RMD160 4c22c1f159fdf618d10ba6a0290beb3389f2c61d SHA1 3836698dfd6650873220e448f5a5e1ff0ba8b2c7 SHA256 c311d13448ced0c74470f9c655fda55fc056245831f5a800f5493a5a4de19bf5
 AUX gnome-panel-2.32.1-fix-multiscreen.patch 7513 RMD160 a211a3cbed6c572ae98377f34afae33b3bd0b840 SHA1 679f8f263c1f8de2a9aac159fad81bbbaa20098b SHA256 5bdb4fe08e79bc504b29aa4752bfb563b26870571f419cef447ebfe8c639dcb2
 AUX gnome-panel-2.32.1-fix-multiscreen2.patch 1451 RMD160 dcf898a075215ee807960b91d671fb6be8b6598f SHA1 d3433f9559060fbb99bbfb8ab66b8f0c637e9a80 SHA256 fd9cf2e5a0374fc8d68f9f30117d5c502e510eb8eb11fcea021594f7549bca89
-DIST gnome-panel-2.30.2.tar.bz2 3125757 RMD160 b5828e0235a6fb5faa011179ff8fcc0574bf3c6b SHA1 4be902269d4dd4af1e988d522ae613946890ec0a SHA256 f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6
+DIST gnome-panel-2.32.1-patches.tar.bz2 6686 RMD160 b5b4c18d36ad135eb49c154a4539b815b33cc73d SHA1 7c13dad85a3e8ffe861d05e1560d715052e92a6e SHA256 b0e2f59e370a2a7da2cd5fd1513cc50cf2bf210fac765e05603d81f91e7bbcea
 DIST gnome-panel-2.32.1.tar.bz2 3132156 RMD160 03a440cee7e219b42a0375ae2d2d53fbd17b604b SHA1 561ec56307854b5cbd6b0d0a0b7f9e0e6c2a0127 SHA256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
-EBUILD gnome-panel-2.30.2.ebuild 2307 RMD160 08f7815b7a8e760d69e3f8809e8fbd8aa3de78e2 SHA1 2715a5ace0790f267259379641ef9e7bfa196afe SHA256 ac39fc958fe9104c67d947679091ad8b045a0cfc85b443dd2173ad3e53a0bb56
 EBUILD gnome-panel-2.32.1-r1.ebuild 3540 RMD160 e64751f8016bdde33f7ba03d20d7d4c4603f8ad1 SHA1 2c40ede1007a896acca8b0c9fd832a1e87b4ffe9 SHA256 65f8b6cfa69b55a903f54b3a8744887b9f232a9a7467dcac28971a5054c2907f
-EBUILD gnome-panel-2.32.1.ebuild 2499 RMD160 b4590071eb861188c93a49b4ea9e7a7a325badd4 SHA1 4372e75aa99229512dc6a414f4f4722a17b95b01 SHA256 3c9d8ba010884cb634dd821223390d780e965981d74af0300a860fe1a0d5aefe
-MISC ChangeLog 46030 RMD160 59dcafbbc01e687a003e3ee3530d2ecda3862bbc SHA1 09f4752866815b4e4986342600583e7648103ccf SHA256 017bf02b8e3fa146957a2ed2af99c35bcfe911b0fa0191f242ac3c908861f56b
+EBUILD gnome-panel-2.32.1-r2.ebuild 3764 RMD160 71f905a985e648ace880363768c353510b1c44fd SHA1 2565c995f292d86a4e4fcb6c6d57a6f7ba60dd56 SHA256 b41d41db9d23115f6f718e13b05398f63c340f8621a75195fa2b9738bad4917b
+MISC ChangeLog 46752 RMD160 4371194ec58b4618634c57adb8dd192b961d52e5 SHA1 12517087a93f54d5d46182d9779928a7451c3c20 SHA256 4ba64ce1a329f1dfccfca39fa24105caf5de687944bba3c8ae6c4b5f3bd64d21
 MISC metadata.xml 374 RMD160 9f8a135b00284a040f08bf8e7899cccab4151f16 SHA1 bbb2909c690abb23de3685b93e48c1497adbf688 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Yle0ACgkQCaWpQKGI+9R2pQCfSCafv+BaXvE90OCdOZLrhyCf
+hJUAmwTa7zGxrWNg4cPrQn5Tlo2aRxiO
+=D+t9
+-----END PGP SIGNATURE-----
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"