Version bump with bugfixes and translation updates, fix bonobo deps and require eggdbus (bug #343841), remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

5 files changed, 14 insertions, 214 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 1f7760e67c03..4c2bd035db89 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.318 2010/12/03 05:10:23 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.319 2010/12/04 17:50:20 pacho Exp $
+
+*gnome-panel-2.32.1 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-panel-2.28.0.ebuild,
+  -files/gnome-panel-2.28.0-clock-applet-missing-cflags.patch,
+  -files/gnome-panel-2.28.0-crashes-xrandr.patch, -gnome-panel-2.32.0.2.ebuild,
+  +gnome-panel-2.32.1.ebuild:
+  Version bump with bugfixes and translation updates, fix bonobo deps and
+  require eggdbus (bug #343841), remove old.
 
   03 Dec 2010; Arun Raghavan <ford_prefect@gentoo.org>
   gnome-panel-2.32.0.2.ebuild:
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.28.0-clock-applet-missing-cflags.patch b/gnome-base/gnome-panel/files/gnome-panel-2.28.0-clock-applet-missing-cflags.patch
deleted file mode 100644
index ccfd3f5899c9..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.28.0-clock-applet-missing-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a2cb0e91f58b22832f4efc51acf1d1dd3efb6969 Mon Sep 17 00:00:00 2001
-From: Maxim Britov <maxim@office.modum.by>
-Date: Tue, 6 Oct 2009 19:16:51 +0200
-Subject: [PATCH] Fix missing $(PANEL_CFLAGS) for clock applet
-
----
- applets/clock/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
-index da5e0d9..a9b95f9 100644
---- a/applets/clock/Makefile.am
-+++ b/applets/clock/Makefile.am
-@@ -8,6 +8,7 @@ INCLUDES =							\
- 	$(WARN_CFLAGS)						\
- 	$(CLOCK_CFLAGS)						\
- 	$(POLKIT_CFLAGS)					\
-+	$(PANEL_CFLAGS)						\
- 	$(LIBPANEL_APPLET_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\"				\
- 	-DBUILDERDIR=\""$(uidir)"\"				\
--- 
-1.6.5.rc2
-
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.28.0-crashes-xrandr.patch b/gnome-base/gnome-panel/files/gnome-panel-2.28.0-crashes-xrandr.patch
deleted file mode 100644
index 3e72ee7c94fc..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.28.0-crashes-xrandr.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 66b8e290bd0b767183cba583917907940b5b425a Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 06 Oct 2009 10:47:52 +0000
-Subject: [panel] Fix crashes in various conditions with the new randr code
-
-If nothing had probed the randr screen resources before us and the X
-server is supporting randr 1.3, then we got no output, and therefore no
-monitor. The fix here is to actively probe for resources if we detect
-this case. See https://bugzilla.gnome.org/show_bug.cgi?id=597101
-
-Also, in some cases, all outputs appear disconnected. See
-https://bugzilla.novell.com/show_bug.cgi?id=543876
-
-To be completely on the safe side, if we get no monitor information from
-randr, even if it is successful, we fallback to the GTK+ method.
----
-diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
-index 8a05221..4ed76ae 100644
---- a/gnome-panel/panel-multiscreen.c
-+++ b/gnome-panel/panel-multiscreen.c
-@@ -136,9 +136,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
- 	xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
- 
- #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3))
--	if (have_randr_1_3)
-+	if (have_randr_1_3) {
- 		resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
--	else
-+		if (resources->noutput == 0) {
-+			/* This might happen if nothing tried to get randr
-+			 * resources from the server before, so we need an
-+			 * active probe. See comment #27 in
-+			 * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
-+			XRRFreeScreenResources (resources);
-+			resources = XRRGetScreenResources (xdisplay, xroot);
-+		}
-+	} else
- 		resources = XRRGetScreenResources (xdisplay, xroot);
- #else
- 	resources = XRRGetScreenResources (xdisplay, xroot);
-@@ -205,6 +213,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
- 		return FALSE;
- 	}
- 
-+	if (geometries->len == 0) {
-+		/* This can happen in at least one case:
-+		 * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
-+		 * monitors appear disconnected (possibly because the  screen
-+		 * is behing a KVM switch) -- see comment #8.
-+		 * There might be other cases too, so we stay on the safe side.
-+		 */
-+		g_array_free (geometries, TRUE);
-+		return FALSE;
-+	}
-+
- 	*monitors_ret = geometries->len;
- 	*geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE);
- 
-@@ -238,9 +257,15 @@ panel_multiscreen_get_raw_monitors_for_screen (GdkScreen     *screen,
- 					       int           *monitors_ret,
- 					       GdkRectangle **geometries_ret)
- {
--	if (panel_multiscreen_get_randr_monitors_for_screen (screen,
--							     monitors_ret,
--							     geometries_ret))
-+	gboolean res;
-+
-+	*monitors_ret = 0;
-+	*geometries_ret = NULL;
-+
-+	res = panel_multiscreen_get_randr_monitors_for_screen (screen,
-+							       monitors_ret,
-+							       geometries_ret);
-+	if (res && *monitors_ret > 0)
- 		return;
- 
- 	panel_multiscreen_get_gdk_monitors_for_screen (screen,
---
-cgit v0.8.2
diff --git a/gnome-base/gnome-panel/gnome-panel-2.28.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.28.0.ebuild
deleted file mode 100644
index 045e2a93a039..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.28.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 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.28.0.ebuild,v 1.13 2010/08/18 22:01:49 maekke Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-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 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
-	>=gnome-base/gnome-desktop-2.26.0
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.15.1
-	>=dev-libs/libgweather-2.27.90
-	dev-libs/libxml2
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.27.92
-	>=gnome-base/libbonobo-2.20.4
-	gnome-base/librsvg
-	>=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
-	gnome-base/gnome-common
-	>=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
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# Fix missing cflags for clock applet, bug #287853
-	epatch "${FILESDIR}/${P}-clock-applet-missing-cflags.patch"
-
-	# Fix crashes in various conditions with the new randr code,
-	# import from upstream bug #597101
-	epatch "${FILESDIR}/${P}-crashes-xrandr.patch"
-
-	# Make it libtool-1 compatible, bug #271652
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-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.0.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild
index 0c0cd984451e..262ff707bacf 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.32.0.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.0.2.ebuild,v 1.2 2010/12/03 05:10:23 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild,v 1.1 2010/12/04 17:50:20 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -22,18 +22,19 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	>=x11-libs/gtk+-2.22:2
 	>=dev-libs/libgweather-2.27.90
 	dev-libs/libxml2
-	>=gnome-base/libbonoboui-2.1.1
 	>=gnome-base/gconf-2.6.1
 	>=media-libs/libcanberra-0.23[gtk]
 	>=gnome-base/gnome-menus-2.27.92
-	>=gnome-base/libbonobo-2.20.4
 	gnome-base/librsvg
 	>=dev-libs/dbus-glib-0.80
 	>=sys-apps/dbus-1.1.2
+	dev-libs/eggdbus
 	>=x11-libs/cairo-1
 	x11-libs/libXau
 	>=x11-libs/libXrandr-1.2
 	bonobo? (
+		>=gnome-base/libbonobo-2.20.4
+		>=gnome-base/libbonoboui-2.1.1
 		>=gnome-base/orbit-2.4
 		>=x11-libs/libwnck-2.19.5 )
 	eds? ( >=gnome-extra/evolution-data-server-1.6 )