Various ebuild cleanups. Clean up old revisions.

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

9 files changed, 27 insertions, 465 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 84c0ea14b434..9acaa3ca7c1f 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,19 @@
 # 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.140 2010/10/17 19:00:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.141 2010/10/21 21:15:46 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-power-manager-2.22.1-r1.ebuild,
+  -files/gnome-power-manager-2.22.1-xextproto-7.1.patch,
+  -files/gnome-power-manager-2.26.0-gcc44-options.patch,
+  -files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-ve
+  rsion-instea.patch,
+  -files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.
+  patch,
+  -files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mi
+  tigate-an-XS.patch, -gnome-power-manager-2.28.3.ebuild,
+  gnome-power-manager-2.32.0.ebuild:
+  Various ebuild cleanups. Clean up old revisions.
 
 *gnome-power-manager-2.32.0 (17 Oct 2010)
 
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
deleted file mode 100644
index ec83b2828f2f..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.22.1-xextproto-7.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/gnome-power-manager-2.26.0-gcc44-options.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.0-gcc44-options.patch
deleted file mode 100644
index 7a2905f6480b..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.0-gcc44-options.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- Author: Gilles Dartiguelongue <eva@gentoo.org>
-
- Make warning and deprecation cflags optional, this is especially important for downstream.
-
- https://bugs.gentoo.org/show_bug.cgi?id=263078
-
- configure.ac |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,6 +21,9 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genma
- dnl ---------------------------------------------------------------------------
- dnl - Extra verbose warning switches
- dnl ---------------------------------------------------------------------------
-+
-+case "$enable_compile_warnings" in
-+	yes|maximum|error)
- #CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
- #CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-@@ -59,6 +62,12 @@ else
- 	WARNINGFLAGS=""
- 	WARNINGFLAGS=""
- fi
-+	;;
-+	*)
-+	WARNINGFLAGS=""
-+	WARNINGFLAGS=""
-+	;;
-+esac
- AC_SUBST(WARNINGFLAGS)
- AC_SUBST(WARNINGFLAGS)
- 
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch
deleted file mode 100644
index 71dd94d8671f..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 558a5634d60221e5485083193155d1ee062c8e0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Fri, 11 Sep 2009 21:33:58 +0200
-Subject: [PATCH] Check for XRR* functions using library version instead of proto version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-randrproto 1.3 can be installed with libXrandr 1.2, which causes linking
-errors with g-p-m. This patch checks that libXrandr (and not randrproto)
-1.3 is available.
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- configure.ac                |    4 ++++
- src/gpm-brightness-xrandr.c |   13 ++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4cbe47c..4baa0cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,6 +171,10 @@ PKG_CHECK_MODULES(XRANDR, [
- AC_SUBST(XRANDR_CFLAGS)
- AC_SUBST(XRANDR_LIBS)
- 
-+PKG_CHECK_EXISTS(
-+ [xrandr >= 1.3],
-+ [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])])
-+
- PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
-diff --git a/src/gpm-brightness-xrandr.c b/src/gpm-brightness-xrandr.c
-index cce4df2..3332be3 100644
---- a/src/gpm-brightness-xrandr.c
-+++ b/src/gpm-brightness-xrandr.c
-@@ -60,7 +60,7 @@ struct GpmBrightnessXRandRPrivate
- 	Display			*dpy;
- 	guint			 shared_value;
- 	gboolean		 has_extension;
--#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-+#ifdef HAVE_XRANDR_13
- 	gboolean		 has_randr13;
- #endif
- 	gboolean		 hw_changed;
-@@ -173,7 +173,7 @@ gpm_brightness_xrandr_setup_display (GpmBrightnessXRandR *brightness)
- 	return TRUE;
- }
- 
--#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-+#ifdef HAVE_XRANDR_13
- /**
-  * gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.
-  **/
-@@ -650,14 +650,13 @@ gpm_brightness_xrandr_update_cache (GpmBrightnessXRandR *brightness)
- 		   in RandR 1.3 or higher and of course xserver needs
- 		   to support it.
- 		*/
--#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-+#ifdef HAVE_XRANDR_13
- 		if (brightness->priv->has_randr13)
- 			resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
- 		else
--			resource = XRRGetScreenResources (brightness->priv->dpy, root);
--#else
--		resource = XRRGetScreenResources (brightness->priv->dpy, root);
- #endif
-+			resource = XRRGetScreenResources (brightness->priv->dpy, root);
-+
- 		if (resource != NULL) {
- 			egg_debug ("adding resource %p", resource);
- 			g_ptr_array_add (brightness->priv->resources, resource);
-@@ -724,7 +723,7 @@ gpm_brightness_xrandr_init (GpmBrightnessXRandR *brightness)
- 		egg_debug ("no XRANDR extension, so aborting init");
- 		return;
- 	}
--#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-+#ifdef HAVE_XRANDR_13
- 	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);
- #endif
- 
--- 
-1.6.5.1
-
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch
deleted file mode 100644
index 10fd0001865d..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 83ab201c9c4637f2b81dc640f297178f850450b8 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 28 Jul 2009 08:42:46 +0100
-Subject: [PATCH] Remove an unused include to fix compile
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- src/gpm-dpms.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-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"
--- 
-1.6.5.1
-
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch
deleted file mode 100644
index f1e4b5384df2..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bebf24f41c43f0b2338aefea87f39ba7423d02be Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 14 Aug 2009 11:17:45 +0100
-Subject: [PATCH] Use a larger DPMS idletime timeout to mitigate an XSync bug
-
----
- src/gpm-idle.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/gpm-idle.c b/src/gpm-idle.c
-index 852f0f3..abe6075 100644
---- a/src/gpm-idle.c
-+++ b/src/gpm-idle.c
-@@ -51,6 +51,11 @@
- #define GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE	1.0f /* seconds */
- #define	GPM_IDLE_IDLETIME_ID			1
- 
-+/* XSync seems to be unreliable when setting small values of time.
-+ * Ideally we want this to be 1ms (or smaller!) to reduce the chance of a race,
-+ * but this fails to trigger on some systems. */
-+#define GPM_IDLE_SMALLEST_RESET_VALUE		500 /* ms */
-+
- struct GpmIdlePrivate
- {
- 	EggIdletime	*idletime;
-@@ -366,8 +371,8 @@ gpm_idle_idletime_reset_cb (EggIdletime *idletime, GpmIdle *idle)
- 	if (idle->priv->mode == GPM_IDLE_MODE_BLANK &&
- 	    elapsed < GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE) {
- 		egg_debug ("ignoring reset, as we've just done a state change");
--		/* make sure we trigger a short 1ms timeout so we can get the expired signal */
--		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, 1);
-+		/* make sure we trigger a short timeout so we can get the expired signal */
-+		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, GPM_IDLE_SMALLEST_RESET_VALUE);
- 		return;
- 	}
- 
--- 
-1.6.5.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
deleted file mode 100644
index da5e55a43649..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.9 2010/08/02 18:41:32 armin76 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 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
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.28.3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.28.3.ebuild
deleted file mode 100644
index 5bcb1c1f97dd..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.28.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.28.3.ebuild,v 1.7 2010/08/14 18:43:57 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-# FIXME: Finish the patchset including translations updates for feature forward port
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~mrpouet/pub/patches/${PN}-2.28.1-cpufreq-patches.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
-IUSE="doc +hal policykit test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-# HAL is used purely as a fallback for setting brightness if xrandr fail
-COMMON_DEPEND=">=dev-libs/glib-2.6.0
-	>=x11-libs/gtk+-2.17.7
-	>=gnome-base/gconf-2.10.0
-	>=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
-	>=x11-libs/cairo-1.0.0
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/gconf-2.10
-	>=media-libs/libcanberra-0.10[gtk]
-	>=sys-apps/devicekit-power-008
-	>=dev-libs/libunique-1
-	>=x11-apps/xrandr-1.2
-	x11-libs/libX11
-	x11-libs/libXext
-
-	hal? ( >=sys-apps/hal-0.5.9 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/consolekit-0.4[policykit?]
-	policykit? ( gnome-extra/polkit-gnome )
-"
-DEPEND="${COMMON_DEPEND}
-	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.
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable hal)
-		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
-		$(use_enable policykit gconf-defaults)
-		--enable-compile-warnings=minimum
-		--with-dpms-ext
-		--enable-applets"
-
-	if ! use hal; then
-		ewarn "hal support disabled, cpufreq applet will not be built"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-
-	# Drop debugger CFLAGS
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' -i configure.ac \
-		|| die "sed 2 failed"
-
-	# Drop test that needs a running daemon
-	sed 's:^\(.*gpm_inhibit_test (test);\)://\1:' -i src/gpm-self-test.c \
-		|| die "sed 3 failed"
-
-	# Skip crazy compilation warnings, bug #263078
-	epatch "${FILESDIR}/${PN}-2.26.0-gcc44-options.patch"
-
-	# Resurrect cpufreq in capplet, bug #263891
-	epatch "${WORKDIR}/${PN}-2.28.1-cpufreq-libhal-glib.patch"
-	epatch "${WORKDIR}/${PN}-2.28.1-cpufreq-support.patch"
-	epatch "${WORKDIR}/${PN}-2.28.1-cpufreq-ui.patch"
-#	epatch "${WORKDIR}/${PN}-2.26.3-cpufreq-po.patch"
-
-	# Fix uninstalled cpufreq schemas, bug #266995
-	epatch "${WORKDIR}/${PN}-2.28.1-cpufreq-schemas.patch"
-
-	# Make it libtool-1 compatible
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	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 "${S}/man/Makefile.in" || die "sed 4 failed"
-	fi
-
-	# glibc splits this out, whereas other libc's do not tend to
-	use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 5 failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "cpufreq capplet is a feature maintained by Gentoo GNOME team."
-	elog "Please DO NOT REPORT bugs on upstream bugzilla if you have a problem with it"
-	elog "Please report on http://bugs.gentoo.org instead."
-
-	if use hal; then
-		elog
-		elog "To enable frequency scaling interface, use the following command:"
-		elog "	gconftool-2 /apps/gnome-power-manager/ui/cpufreq_show"
-		elog "Note that this will conflict with other power managment utility"
-		elog "like app-laptop/laptop-mode-tools."
-	fi
-}
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
index 3878d99a589d..66fa48ba335a 100644
--- 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
@@ -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-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.1 2010/10/17 19:00:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.2 2010/10/21 21:15:46 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -20,17 +20,16 @@ RESTRICT="test"
 
 COMMON_DEPEND=">=dev-libs/glib-2.13.0
 	>=x11-libs/gtk+-2.17.7:2
-	>=gnome-base/gconf-2.10.0
 	>=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
-	>=x11-libs/cairo-1.0.0
+	>=x11-libs/cairo-1
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/gconf-2.10
 	>=media-libs/libcanberra-0.10[gtk]
 	>=sys-power/upower-0.9.1
-	>=dev-libs/libunique-1.1.0:0
+	>=dev-libs/libunique-1.1:0
 	>=x11-apps/xrandr-1.3
 	>=x11-proto/xproto-7.0.15
 	x11-libs/libX11
@@ -39,6 +38,8 @@ 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
@@ -56,8 +57,6 @@ DEPEND="${COMMON_DEPEND}
 # (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)
@@ -76,19 +75,22 @@ src_prepare() {
 		|| die "sed libtoolize failed"
 
 	# Drop debugger CFLAGS from configure
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' -i configure.ac -i configure \
-		|| die "debugger sed failed"
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure.ac configure || die "debugger sed failed"
 
 	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 "${S}/man/Makefile.in" || die "docbook sed failed"
+			-i man/Makefile.am man/Makefile.in \
+			|| die "docbook sed failed"
 	fi
 
 	# glibc splits this out, whereas other libc's do not tend to
-	use elibc_glibc || { sed -e 's/-lresolv//' -i configure \
-		|| die "resolv sed failed"; }
+	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"