New version for GNOME 2.28.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 53 insertions, 18 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 1b3a29243fe4..8f913b9ed623 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.295 2009/10/24 17:01:25 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.296 2009/10/29 23:48:33 eva Exp $
+
+*gnome-applets-2.28.0 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-applets-2.26.2.ebuild, +gnome-applets-2.28.0.ebuild,
+  +files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch:
+  New version for GNOME 2.28.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> gnome-applets-2.26.3.ebuild:
   ppc stable #281427
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch b/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch
new file mode 100644
index 000000000000..92073395e778
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.28.0-stickynotes-duplicate-labels-ui.patch
@@ -0,0 +1,31 @@
+From 26488f7c397fd3e41c7c64eaf2b14b577605e97e Mon Sep 17 00:00:00 2001
+From: Callum McKenzie <callum@spooky-possum.org>
+Date: Wed, 07 Oct 2009 18:38:05 +0000
+Subject: stickynotes: More fixes for duplicate labels in the .ui file.
+
+Patch from Michael Pryc in bug 594797.
+---
+diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui
+index 7035355..16c3a29 100644
+--- a/stickynotes/stickynotes.ui
++++ b/stickynotes/stickynotes.ui
+@@ -474,7 +474,7 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox1">
++              <object class="GtkVBox" id="vbox3">
+                 <property name="visible">True</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+@@ -494,7 +494,7 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkLabel" id="label1">
++                  <object class="GtkLabel" id="label2">
+                     <property name="visible">True</property>
+                     <property name="xalign">0</property>
+                     <property name="label" translatable="yes">This cannot be undone.</property>
+--
+cgit v0.8.2
diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild
index eb7deadb0a0c..b90d13077bfb 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild,v 1.1 2009/06/17 22:56:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.28.0.ebuild,v 1.1 2009/10/29 23:48:33 eva Exp $
 
-inherit autotools eutils gnome2 python
+inherit eutils gnome2 python
 
 DESCRIPTION="Applets for the GNOME Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="acpi apm doc gnome gstreamer hal ipv6 networkmanager policykit"
 
 # TODO: configure says python stuff is optional
@@ -19,19 +19,19 @@ RDEPEND=">=x11-libs/gtk+-2.13
 	>=dev-libs/glib-2.18.0
 	>=gnome-base/gconf-2.8
 	>=gnome-base/gnome-panel-2.13.4
-	>=x11-libs/libxklavier-2.91
+	>=x11-libs/libxklavier-4.0
 	>=x11-libs/libwnck-2.9.3
 	>=gnome-base/gnome-desktop-2.11.1
 	>=x11-libs/libnotify-0.3.2
-	hal? ( >=sys-apps/hal-0.5.3 )
 	>=sys-apps/dbus-1.1.2
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/libxml2-2.5.0
 	>=x11-themes/gnome-icon-theme-2.15.91
 	>=dev-libs/libgweather-2.22.1
 	>=virtual/python-2.4
-	apm? ( sys-apps/apmd )
 	x11-libs/libX11
+
+	apm? ( sys-apps/apmd )
 	gnome?	(
 		>=gnome-base/libgnomekbd-2.21.4.1
 		gnome-base/gnome-settings-daemon
@@ -50,10 +50,9 @@ RDEPEND=">=x11-libs/gtk+-2.13
 		|| (
 			>=media-plugins/gst-plugins-alsa-0.10.14
 			>=media-plugins/gst-plugins-oss-0.10.14 ) )
+	hal? ( >=sys-apps/hal-0.5.3 )
 	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? (
-		>=sys-auth/policykit-0.7
-		>=gnome-extra/policykit-gnome-0.7 )"
+	policykit? ( >=sys-auth/polkit-0.91 )"
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
@@ -73,14 +72,12 @@ src_unpack() {
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
 
-	# Networmanager is automagic, bug #266056
-	epatch "${FILESDIR}/${PN}-2.26.1-automagic-networkmanager.patch"
-
-	# Make it libtool-1 compatible, bug #266248
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+	# Invest applet tests need gconf/proxy/...
+	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
+		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	# Fixes a crash when creating new sticky note, bug #207877, upstream #594797
+	epatch "${FILESDIR}/${P}-stickynotes-duplicate-labels-ui.patch"
 }
 
 pkg_setup() {
@@ -131,7 +128,7 @@ pkg_postinst() {
 
 	if use acpi && ! use hal ; then
 		elog "It is highly recommended that you install acpid if you use the"
-		elog "battstat applet to prevent any issues with other applications "
+		elog "battstat applet to prevent any issues with other applications"
 		elog "trying to read acpi information."
 	fi