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

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

4 files changed, 133 insertions, 2 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/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 55e62f4a4ff9..f861ce5c53fa 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,4 @@
+AUX gnome-power-manager-2.22.1-xextproto-7.1.patch 568 RMD160 0bcda2ec5c220b792cbc453e5928b878431c4d67 SHA1 e36dc75c3479eb12e57528fe30342a3325c4e9e0 SHA256 8db84ae310d282d1b70a9001be599bd6e1b11100be22c30765f215577eef7e67
 AUX gnome-power-manager-2.26.0-gcc44-options.patch 1118 RMD160 e9e26f67cdfd949d65bf9970b3ed5ace13918746 SHA1 3f371ae4bedf054904a8e3ae00a1fa94dbe82129 SHA256 c55251fb471782356188e1686d1bd8385ea08f0a5904d1ffee048c7e4f8b2614
 AUX gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch 2879 RMD160 9b81913cc9c48f04f79e64873f7c3bc674fb2cee SHA1 0cb1c94c71c4e0838e0a277669c46238d7cefaa7 SHA256 badffa783434dadd71e818f5757e0a817e73878dada561019f9e1fae12f2138c
 AUX gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch 648 RMD160 e8f1918049d6f0152936a438cb5b9133b8d07bdc SHA1 850725d01612c55a58dcf9325ac0f12087e9eb6f SHA256 06e72ef3787a8fa620a28c5c61e2599f8461d5b55335a5b36045a66959e64df0
@@ -10,9 +11,10 @@ DIST gnome-power-manager-2.26.4-cpufreq-patches.tar.bz2 56366 RMD160 9ce9f124a7a
 DIST gnome-power-manager-2.26.4.tar.bz2 3755746 RMD160 6e5cc57d8776dc1a89a877b3cfb2f8675b49474e SHA1 c11683625db79567be816ecaa906941e2ec5164b SHA256 13d14b84755295b90409b6dcbc16d9bb823d3d474ba86ff3c139b0bd2b3b2168
 DIST gnome-power-manager-2.28.1-cpufreq-patches.tar.lzma 10325 RMD160 52f9bef731c7736b94fc8f27a421c1bca6473fc8 SHA1 b0c5d33be5cf80e8a14c2b892b9ee47db5d79a3b SHA256 92559060521acdf635c49fe5bd7cb6075893eea96dac1c33bf7cf485ffdc4ea3
 DIST gnome-power-manager-2.28.3.tar.bz2 3833159 RMD160 29dab394bdbce09377803f35bcabc1a327a562f0 SHA1 3ec7062d882fb9f85bd2d6acbd85475cee56c010 SHA256 e918f0a7a35f78a7c4c07894951fed6683b3de4266d81ca2f201078729e0efe9
+EBUILD gnome-power-manager-2.22.1-r1.ebuild 2966 RMD160 f01facb26ecf41dbf44141e8110844160468f8f5 SHA1 83e5d063d2181b3c9360ec37d7e6e1b04c4394f2 SHA256 9a5bc4f2ffd6c179aea4b7e6c4f14a970817b1740cec745be4af1bfb9dff8d2f
 EBUILD gnome-power-manager-2.22.1.ebuild 2724 RMD160 73910dc413e0d57165f9f774a75ef2c46e4d9e7c SHA1 40b736c409c332b8980866a8132f0a0a3b2560f9 SHA256 33cf1a5bf4623b6c3c7e5f264c724152aef1a3e4946f107501d51b9ad5d836ed
 EBUILD gnome-power-manager-2.24.4-r2.ebuild 3100 RMD160 ded89ae55bd7c405c660c3f091dd4bce6178e583 SHA1 b454854337bda831d92d7cd9da20aebb0f8c6176 SHA256 514720f03f99bb9134f923ff126ee44a0b2e36bb5323e93804ec630247d6efbd
 EBUILD gnome-power-manager-2.26.4-r1.ebuild 4046 RMD160 fbe20d5b4d1b297a9563cfabe38cf1086aa2c9a9 SHA1 f92c6cc280165893690d7d7cde544ea4213e9e51 SHA256 0558ebc84c0347e6efd5793027752918fd926e1897f694b1edf461bd9fdf84b7
 EBUILD gnome-power-manager-2.28.3.ebuild 4314 RMD160 24da6484177c17fc331ec88d4546b264529d43eb SHA1 cb6f8bafb898c79ddafe2b6a5ea32f18f61d91c7 SHA256 0d078ff3d5fb083ecb3ee6baa1cfa63585d5065f2c6641e94050000cb97a4ba6
-MISC ChangeLog 19094 RMD160 57e3297c0ccbdb6f999e5dc8563d00f69e01ecb6 SHA1 a13af236483706149c6a319f51e59163ef8160f4 SHA256 4d6fed098eeff7f16dcce55071626ba1ed1109e45ab413b86570546b7db8605b
+MISC ChangeLog 19340 RMD160 0ff3a19cb2edf91e3f962531210e5590e365d6ae SHA1 626793932514c29f3bff9158ff42e4545d9c9c87 SHA256 2d741185fd2b8329fd610f5c3803ba31e9b8cc8eb804cce051421ff1862295a2
 MISC metadata.xml 438 RMD160 919237398a61022183868a6ad78259f5ba1ddb29 SHA1 22296b3f6619e92d83b5fa85e2ad1d3f15a1ba2a SHA256 b56e882af9618f6dc68e4c6d28bf85eb1cd0e12c2da53218551547760e63a489
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
+}