Apply ubuntu patch to fix duplicated batteries (bug #385529 by Charles G Waldman and Jacek) as I neither suffer any regression with kernel 3.0.x. Drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 59 insertions, 114 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index bb28f12a277b..c4397e762d7b 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.167 2012/01/02 00:51:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.168 2012/01/31 08:36:14 pacho Exp $
+
+*gnome-power-manager-2.32.0-r3 (31 Jan 2012)
+
+  31 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-power-manager-2.32.0-duplicated-battery.patch,
+  +gnome-power-manager-2.32.0-r3.ebuild, -gnome-power-manager-2.32.0-r1.ebuild,
+  -gnome-power-manager-2.32.0.ebuild:
+  Apply ubuntu patch to fix duplicated batteries (bug #385529 by Charles G
+  Waldman and Jacek) as I neither suffer any regression with kernel 3.0.x. Drop
+  old.
 
   02 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-power-manager-2.32.0-r2.ebuild:
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch
new file mode 100644
index 000000000000..4134b9e76286
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch
@@ -0,0 +1,20 @@
+Description: Don't add hot-added battery to device list, because libupower-glib
+ already does that (LP: #616443)
+Author: Maxim Levitsky <maximlevitsky@gmail.com>
+Bug-Ubuntu: https://launchpad.net/bugs/616443
+Forwarded: no
+Last-Update: <2011-06-13>
+
+--- gnome-power-manager-2.32.0.orig/src/gpm-engine.c
++++ gnome-power-manager-2.32.0/src/gpm-engine.c
+@@ -886,10 +886,7 @@ out:
+ static void
+ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
+-	/* add to list */
+-	g_ptr_array_add (engine->priv->array, g_object_ref (device));
+ 	gpm_engine_check_recall (engine, device);
+-
+ 	gpm_engine_recalculate_state (engine);
+ }
+ 
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild
index c5fc5eade59f..ae7e8d35366b 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild,v 1.5 2011/10/05 17:44:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild,v 1.1 2012/01/31 08:36:14 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2 virtualx
 
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+DESCRIPTION="A session daemon for GNOME that makes it easy to manage your laptop or desktop system"
+HOMEPAGE="http://projects.gnome.org/gnome-power-manager/"
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${PN}-2.32.0-keyboard-backlight.patch.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+applet doc policykit test"
 
 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
@@ -73,8 +75,6 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
-	gnome2_src_prepare
-
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "sed libtoolize failed"
@@ -89,10 +89,30 @@ src_prepare() {
 			-i configure.ac configure || die "resolv sed failed"
 	fi
 
+	# Fixed bgo#644143, how to convert from percentage to discrete and vice-versa.
+	epatch "${FILESDIR}/${P}-convert-percentage.patch"
+
+	# Don't try to close a non-opened fd
+	epatch "${FILESDIR}/${P}-close-fd.patch"
+
+	# Do not use g-p-m in XFCE
+	epatch "${FILESDIR}/${PN}-2.32.0-no-xfce.patch"
+
+	# Don't crash on systems which don't have XBACKLIGHT
+	epatch "${FILESDIR}/${PN}-2.32.0-xbacklight-crash.patch"
+
+	# Add keyboard backlight support including dimming on idle and keyboard control
+	epatch "${WORKDIR}/${PN}-2.32.0-keyboard-backlight.patch"
+
+	# Fix duplicated battery, upstream bug #636915
+	epatch "${FILESDIR}/${PN}-2.32.0-duplicated-battery.patch"
+
 	# FIXME: This is required to prevent maintainer mode after "debugger sed"
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 
+	gnome2_src_prepare
+
 	# This needs to be after eautoreconf to prevent problems like bug #356277
 	if ! use doc; then
 		# Remove the docbook2man rules here since it's not handled by a proper
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild
deleted file mode 100644
index 111c5bea7c9d..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.14 2011/03/22 19:26:20 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc policykit test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.13.0:2
-	>=x11-libs/gtk+-2.17.7:2
-	>=gnome-base/gnome-keyring-0.6.0
-	>=dev-libs/dbus-glib-0.71
-	>=x11-libs/libnotify-0.4.3
-	>=x11-libs/libwnck-2.10.0:1
-	>=x11-libs/cairo-1
-	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-	>=gnome-base/gconf-2.10:2
-	>=media-libs/libcanberra-0.10[gtk]
-	>=sys-power/upower-0.9.1
-	>=dev-libs/libunique-1.1:1
-	>=x11-apps/xrandr-1.3
-	>=x11-proto/xproto-7.0.15
-	x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/consolekit-0.4[policykit?]
-	policykit? ( gnome-extra/polkit-gnome )"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/randrproto
-
-	sys-devel/gettext
-	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
-		$(use_enable policykit gconf-defaults)
-		--enable-compile-warnings=minimum
-		--enable-applets"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed libtoolize failed"
-
-	# Drop debugger CFLAGS from configure
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure.ac configure || die "debugger sed failed"
-
-	# glibc splits this out, whereas other libc's do not tend to
-	if use elibc_glibc; then
-		sed -e 's/-lresolv//' \
-			-i configure.ac configure || die "resolv sed failed"
-	fi
-
-	# FIXME: This is required to prevent maintainer mode after "debugger sed"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	if ! use doc; then
-		# Remove the docbook2man rules here since it's not handled by a proper
-		# parameter in configure.in.
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch Xemake check || die "Test phase failed"
-}