Fix CPUFreq regression, bug 247614

(Portage version: 2.2_rc26/cvs/Linux i686)

2 files changed, 44 insertions, 34 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 13b211ffd926..42a1960f04d2 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.101 2009/03/11 15:10:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.102 2009/03/22 10:42:22 nirbheek Exp $
+
+*gnome-power-manager-2.24.4-r1 (22 Mar 2009)
+
+  22 Mar 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-power-manager-2.24.4.ebuild, +gnome-power-manager-2.24.4-r1.ebuild:
+  Fix CPUFreq regression, bug 247614
 
 *gnome-power-manager-2.24.4 (11 Mar 2009)
 
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
index d3c2cb1af1e9..6e32d5c01c79 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2009 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.24.4.ebuild,v 1.1 2009/03/11 15:10:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild,v 1.1 2009/03/22 10:42:22 nirbheek Exp $
 
 inherit eutils gnome2 virtualx
 
 DESCRIPTION="Gnome Power Manager"
 HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+SRC_URI="${SRC_URI} mirror://gentoo/${P}-cpufreq-patches.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,39 +17,37 @@ IUSE="doc policykit test"
 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-apps/xrandr-1.2
-
-		   x11-libs/libX11
-		   x11-libs/libXext"
+	>=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-apps/xrandr-1.2
+
+	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
-				)"
-
+	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.
@@ -75,6 +74,11 @@ src_unpack() {
 		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
 	fi
 
+	# Fix cpufreq-regression bug #247614
+	epatch "${WORKDIR}/${P}-cpufreq-libhal-glib.patch"
+	epatch "${WORKDIR}/${P}-cpufreq-support.patch"
+	epatch "${WORKDIR}/${P}-cpufreq-ui.patch"
+
 	# glibc splits this out, whereas other libc's do not tend to
 	use elibc_glibc || sed -i -e 's/-lresolv//' configure
 }