gnome-extra/gnome-power-manager add patch for xextproto compilation issue, bug #312021

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 130 insertions, 1 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index d2e6f4b7585b..213f6946f2e4 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.114 2010/03/08 14:42:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.115 2010/04/01 14:51:57 chithanh Exp $
+
+*gnome-power-manager-2.22.1-r1 (01 Apr 2010)
+
+  01 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnome-power-manager-2.22.1-r1.ebuild,
+  +files/gnome-power-manager-2.22.1-xextproto-7.1.patch:
+  patch to fix bug #312021
 
   08 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -files/gnome-power-manager-2.16.3-doc.patch,
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.22.1-xextproto-7.1.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.22.1-xextproto-7.1.patch
new file mode 100644
index 000000000000..ec83b2828f2f
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.22.1-xextproto-7.1.patch
@@ -0,0 +1,21 @@
+From db880ca68d8ce9e3dd0036d94bc05705c81d9639 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 28 Jul 2009 07:42:46 +0000
+Subject: Remove an unused include to fix compile
+
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/gpm-dpms.c b/src/gpm-dpms.c
+index a58ed7d..d939b80 100644
+--- a/src/gpm-dpms.c
++++ b/src/gpm-dpms.c
+@@ -40,7 +40,6 @@
+ #ifdef HAVE_DPMS_EXTENSION
+ #include <X11/Xproto.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
+ #endif
+ 
+ #include "egg-debug.h"
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1-r1.ebuild
new file mode 100644
index 000000000000..e9e0c7dd8253
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 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.22.1-r1.ebuild,v 1.1 2010/04/01 14:51:57 chithanh Exp $
+
+inherit gnome2 eutils virtualx
+
+DESCRIPTION="Gnome Power Manager"
+HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
+
+# See bug #196490
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/glib-2.6.0
+		 >=x11-libs/gtk+-2.11.0
+		 >=gnome-base/gnome-keyring-0.6.0
+		 >=gnome-base/libgnome-2.14.0
+		 >=gnome-base/libgnomeui-2.14.0
+		 >=sys-apps/hal-0.5.9
+		 >=dev-libs/dbus-glib-0.71
+		 >=gnome-base/libglade-2.5.0
+		 >=x11-libs/libnotify-0.4.3
+		 >=x11-libs/libwnck-2.10.0
+		 >=x11-libs/cairo-1.0.0
+		 >=gnome-base/gnome-panel-2
+		 >=gnome-base/gconf-2
+		  =media-libs/gstreamer-0.10*
+		   x11-libs/libX11
+		   x11-libs/libXext"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		 ~app-text/docbook-xml-dtd-4.3
+		>=dev-util/pkgconfig-0.9
+		>=dev-util/intltool-0.35
+		  app-text/scrollkeeper
+		>=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.
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable test tests)
+		$(use_enable doc docbook-docs)
+		--with-dpms-ext
+		--disable-policykit
+		--enable-xevents
+		--enable-applets"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if use doc; then
+		# Actually install all html files, not just the index
+		sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \
+			"${S}/docs/Makefile.in"
+	else
+		# Remove the docbook2man rules here since it's not handled by a proper
+		# parameter in configure.in.
+		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
+	fi
+
+	# glibc splits this out, whereas other libc's do not tend to
+	use elibc_glibc || sed -i -e 's/-lresolv//' configure
+
+	# fix building against xextproto-7.1, bug #312021, patch from upstream git
+	# http://git.gnome.org/browse/gnome-power-manager/commit/?id=db880ca68d8ce9e3dd0036d94bc05705c81d9639
+	epatch "${FILESDIR}"/${P}-xextproto-7.1.patch
+}
+
+src_test() {
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog
+	elog "To enable frequency scaling interface, use the following command:"
+	elog "	gconftool-2 /apps/gnome-power-manager/ui/cpufreq_show -t bool -s true"
+	elog "Note that this will conflict with other power managment utility"
+	elog "like app-laptop/laptop-mode-tools."
+	elog
+	elog "Suspend/hibernate-on-idle will only work if gnome-extra/gnome-screensaver"
+	elog "is installed."
+	elog
+}