Fix init and confd scripts, bug #200018

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

5 files changed, 23 insertions, 11 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index 1f854c17c9d3..d8a3b2c9a4e4 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/cpufrequtils
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.38 2007/10/06 09:08:28 tgall Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.39 2008/08/11 17:46:53 armin76 Exp $
+
+*cpufrequtils-002-r4 (11 Aug 2008)
+
+  11 Aug 2008; Raúl Porcel <armin76@gentoo.org> files/cpufrequtils-conf.d,
+  files/cpufrequtils-init.d, -cpufrequtils-002-r3.ebuild,
+  +cpufrequtils-002-r4.ebuild:
+  Fix init and confd scripts, bug #200018
 
   06 Oct 2007; Tom Gall <tgall@gentoo.com> pufrequtils-002-r3.ebuild:
   added ~ppc64
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index f1b50b59b2df..86a72760043c 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -1,7 +1,7 @@
 AUX cpufrequtils-002-parallel-make.patch 580 RMD160 c521c04cf137bd72800f37922b548bfd3464a56e SHA1 c778e3e28ea16f3bd339f5fc2e1e3587936b4618 SHA256 13dea5e075f883bdbf81fb16054c68f2e99e5df89e4d1191e19cd5094a4909dc
-AUX cpufrequtils-conf.d 230 RMD160 999fc00d4a23749616da7ea4384661f7d55bb6e8 SHA1 2074439ec46d327b1d76e7f2cdc0ed7650fcf6da SHA256 943c4eaf5f25fb4f70cd9b8174729266110ca729fb5be8fc0f89e992dd73feff
-AUX cpufrequtils-init.d 927 RMD160 b52216be57c977e49c08417797fc7bdb8df2d28b SHA1 a981532f7c795b346ccfed29f6e0f6a878e25c3d SHA256 b098b04d76776884fcc8953ee2df54b9ac2b69b35cfe53d8f19d0b5a03a83b83
+AUX cpufrequtils-conf.d 315 RMD160 0336b772aa28b6d83a7b16cf2dc115ae70449a75 SHA1 8cc8598f92d246c02b33842f7b2981854293cd1e SHA256 b64f5ffe55dfcb64475d3af679c3979e8f5e6e7f549d62021a486e2ef5274999
+AUX cpufrequtils-init.d 986 RMD160 d11a01d868df0baf0f2fea58de1f70d6bf23ab90 SHA1 46174efaa14e0e2c0bc2fd503790a9fe5a56ce14 SHA256 5e18a0d9de4892355cb19f5443a63ecf10ac90eede7318ca594d2c76889e486a
 DIST cpufrequtils-002.tar.bz2 35313 RMD160 da4477af89116d78cbe92e55247cee3f1d1b9f73 SHA1 843e75c28210dbdf58c7d9ae519047227a556899 SHA256 98be6a75f06c535d0acc6948bb1b923c7c400c038c433acfa074c14c89edc39b
-EBUILD cpufrequtils-002-r3.ebuild 1231 RMD160 ee15d168678336b42e107c3c1ec74dc062064319 SHA1 a3ec08844d51290a8e1d569a4390721cc06af8b5 SHA256 ee6f66e5663cd08ecaab387265f02ee16a9a02388323222cb35638e044dd3dff
-MISC ChangeLog 6521 RMD160 9b99ef30ecd45c06cf633c0e4461b5ccd82d0d54 SHA1 2bb299b5a1f7be38f9229b24596575c207634950 SHA256 4f03134677d13485f2ce27bc53367782417046fefc405a55d6feb62602ffadfa
+EBUILD cpufrequtils-002-r4.ebuild 1233 RMD160 f4426ceb21ea138ca6c2325c9dbd0ebc2c86583e SHA1 021f6a82796c7bb0a8c1b4acc829d7b1debe8bfc SHA256 424a3892769eda616297614ec0739798a636665799adce911b282a9e55afcde8
+MISC ChangeLog 6767 RMD160 6de940e186ebbbff9c698e78e9a88868c8bfdfc3 SHA1 c7485c49b2c25c0ad0aa2c94337708e71ceba12e SHA256 bdeb91d25b82f9de07f301b2c0aba2ee1355ca1aa59c01bc3c9f715dc0eab319
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
diff --git a/sys-power/cpufrequtils/cpufrequtils-002-r3.ebuild b/sys-power/cpufrequtils/cpufrequtils-002-r4.ebuild
index a326dc6952d4..df48c7d1f43c 100644
--- a/sys-power/cpufrequtils/cpufrequtils-002-r3.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-002-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002-r3.ebuild,v 1.3 2007/10/06 09:08:28 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002-r4.ebuild,v 1.1 2008/08/11 17:46:53 armin76 Exp $
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-conf.d b/sys-power/cpufrequtils/files/cpufrequtils-conf.d
index eb24f8de2364..5d80a1f50ba1 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-conf.d
+++ b/sys-power/cpufrequtils/files/cpufrequtils-conf.d
@@ -4,3 +4,7 @@
 #   cat /sys/devices/system/cpu/cpu?/cpufreq/scaling_available_governors
 #
 GOVERNOR="ondemand"
+
+# This Governor is used when cpufrequtils is stopped
+RESTORED_GOVERNOR=performance
+
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-init.d b/sys-power/cpufrequtils/files/cpufrequtils-init.d
index 7330e85d52cd..9dee536f66c8 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-init.d
+++ b/sys-power/cpufrequtils/files/cpufrequtils-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d,v 1.2 2007/05/17 09:07:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d,v 1.3 2008/08/11 17:46:54 armin76 Exp $
 
 checkconfig() {
 	if [ -z "${GOVERNOR}" ]; then
@@ -9,7 +9,8 @@ checkconfig() {
 		return 1
 	fi
 	if [ -z "${RESTORED_GOVERNOR}" ]; then
-		RESTORED_GOVERNOR=performance
+		eerror "Set the RESTORED_GOVERNOR value in /etc/conf.d/cpufrequtils"
+		return 1
 	fi
 }
 
@@ -38,5 +39,5 @@ start() {
 
 stop() {
 	checkconfig || return 1
-	affect_change "Disabling" "${GOVERNOR}"
+	affect_change "Enabling" "${RESTORED_GOVERNOR}"
 }