Version bump. Fixed init script to work on SMP systems, thanks to Sebastien LANGE and Stefano Varesi in bug #132461.

(Portage version: 2.0.54-r2)

6 files changed, 91 insertions, 35 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index 20c8e0e344b9..e2a83f814b8a 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.22 2006/05/24 20:56:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.23 2006/06/01 12:02:01 brix Exp $
+
+*cpufrequtils-002 (01 Jun 2006)
+
+  01 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/cpufrequtils-002-conf.d, +files/cpufrequtils-002-init.d,
+  +cpufrequtils-002.ebuild:
+  Version bump. Fixed init script to work on SMP systems, thanks to Sebastien
+  LANGE and Stefano Varesi in bug #132461.
 
   24 May 2006; Michael Hanselmann <hansmi@gentoo.org>
   cpufrequtils-001.ebuild:
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index 53ace61b0cc0..5293ceb751c9 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -1,40 +1,14 @@
-AUX cpufrequtils-0.4-conf.d 230 RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 SHA1 f6abbf64b28c76ffd6eff94830c993240518aa4a SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818
+MD5 fc13286869e43e9cf96309dcfdd47878 ChangeLog 3688
+MD5 807a7ffb13cf26d5259c3ef3e2e59996 cpufrequtils-0.4.ebuild 987
+MD5 14ab7af6c60913f5d0403bfbddd3f586 cpufrequtils-001.ebuild 1241
+MD5 81980b386adcfef7365db486ba456a6b cpufrequtils-002.ebuild 1011
 MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-0.4-conf.d 230
-RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 files/cpufrequtils-0.4-conf.d 230
-SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818 files/cpufrequtils-0.4-conf.d 230
-AUX cpufrequtils-0.4-init.d 498 RMD160 a319439a655ef75ce88743377f9144a60a3805eb SHA1 e9545fac2389a30d8d612091ff2c37b849409701 SHA256 b24592b4a4d4059e7eb60f3d27c22de8509630b727a94d44a709d4c35a2f7691
 MD5 b8286b5cd3a2b122ace8f1a66c08fd67 files/cpufrequtils-0.4-init.d 498
-RMD160 a319439a655ef75ce88743377f9144a60a3805eb files/cpufrequtils-0.4-init.d 498
-SHA256 b24592b4a4d4059e7eb60f3d27c22de8509630b727a94d44a709d4c35a2f7691 files/cpufrequtils-0.4-init.d 498
-AUX cpufrequtils-001-conf.d 230 RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 SHA1 f6abbf64b28c76ffd6eff94830c993240518aa4a SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818
 MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-001-conf.d 230
-RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 files/cpufrequtils-001-conf.d 230
-SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818 files/cpufrequtils-001-conf.d 230
-AUX cpufrequtils-001-init.d 496 RMD160 96232df687117b34cb1a724e5202173b551bc7b2 SHA1 e774970fc6c9bc34b268bace1791dab6dc9784ce SHA256 9a7d2c980bb9d2d3d9c6956152e32bcd5143cfc2755eb9a078bc147695e2d0e0
 MD5 b68d94133a48be4c8c9d274a4941b3ae files/cpufrequtils-001-init.d 496
-RMD160 96232df687117b34cb1a724e5202173b551bc7b2 files/cpufrequtils-001-init.d 496
-SHA256 9a7d2c980bb9d2d3d9c6956152e32bcd5143cfc2755eb9a078bc147695e2d0e0 files/cpufrequtils-001-init.d 496
-DIST cpufrequtils-0.4.tar.bz2 432533
-DIST cpufrequtils-001.tar.bz2 35339
-EBUILD cpufrequtils-0.4.ebuild 987 RMD160 5d394e742d322a1399384eb0909e9f44421d3ad9 SHA1 bd8d2b1730b6841aa2e90c0010022ccb9ca4a323 SHA256 4f20ff02b468b4aa83a552f8c7d5da08e60e35abce5442ebf2b646bab031b839
-MD5 807a7ffb13cf26d5259c3ef3e2e59996 cpufrequtils-0.4.ebuild 987
-RMD160 5d394e742d322a1399384eb0909e9f44421d3ad9 cpufrequtils-0.4.ebuild 987
-SHA256 4f20ff02b468b4aa83a552f8c7d5da08e60e35abce5442ebf2b646bab031b839 cpufrequtils-0.4.ebuild 987
-EBUILD cpufrequtils-001.ebuild 1241 RMD160 4e76415b6d41d7bc04bd9f94059d0bff47617eb9 SHA1 9bf610aac4baca1e18eb1c35ad59b01e2911fe30 SHA256 d8b4c4bdb05cdceeb27a12804be29e3e1f8177418533e8b83f040923c4224492
-MD5 14ab7af6c60913f5d0403bfbddd3f586 cpufrequtils-001.ebuild 1241
-RMD160 4e76415b6d41d7bc04bd9f94059d0bff47617eb9 cpufrequtils-001.ebuild 1241
-SHA256 d8b4c4bdb05cdceeb27a12804be29e3e1f8177418533e8b83f040923c4224492 cpufrequtils-001.ebuild 1241
-MISC ChangeLog 3385 RMD160 7052b5de2d5dce16c05d44c59988563595c90791 SHA1 2411fbca076eb30a206d8d27f906a7b044c539ce SHA256 a1e6bf6576916234c68bb2a532f91e6ce1cf449c209c2feeff6feb83380d3f3d
-MD5 6222629631d85120e910efb4b0b1820a ChangeLog 3385
-RMD160 7052b5de2d5dce16c05d44c59988563595c90791 ChangeLog 3385
-SHA256 a1e6bf6576916234c68bb2a532f91e6ce1cf449c209c2feeff6feb83380d3f3d ChangeLog 3385
-MISC metadata.xml 255 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 SHA1 1258e0419f1fe7839c4db37602b5999d0e196bca SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 metadata.xml 255
-SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 metadata.xml 255
+MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-002-conf.d 230
+MD5 1066e992cea83c5290896da2cb9e7f60 files/cpufrequtils-002-init.d 506
 MD5 555ad680b73f0cd099e9c2e81d24cf9b files/digest-cpufrequtils-0.4 69
-RMD160 f26071ceedd3f0cbdd0a6e3080e5fbdb613f87ee files/digest-cpufrequtils-0.4 69
-SHA256 1d213f73de14199c89b3f7959a622adb5292bdef5bdc091d8f9928b489997d57 files/digest-cpufrequtils-0.4 69
 MD5 706022fe8ddcdddc2bf9a140c6a48d23 files/digest-cpufrequtils-001 68
-RMD160 d15b9dddb68a79a1411ba09db99e82a512c28817 files/digest-cpufrequtils-001 68
-SHA256 9e1b181f9f2e0dd66842aa6ce738348ceae69f721b4b308843e6ce9b0eec1e7f files/digest-cpufrequtils-001 68
+MD5 0073e9b2090ae842a6fd4c4396f1fd4e files/digest-cpufrequtils-002 68
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/sys-power/cpufrequtils/cpufrequtils-002.ebuild b/sys-power/cpufrequtils/cpufrequtils-002.ebuild
new file mode 100644
index 000000000000..4866704aeda5
--- /dev/null
+++ b/sys-power/cpufrequtils/cpufrequtils-002.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002.ebuild,v 1.1 2006/06/01 12:02:01 brix Exp $
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="Userspace utilities for the Linux kernel cpufreq subsystem"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/cpufreq/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug nls"
+DEPEND="sys-fs/sysfsutils"
+
+src_compile() {
+	local debug=false nls=false
+
+	use debug && debug=true
+	use nls && nls=true
+
+	emake V=true DEBUG=${debug} NLS=${nls} \
+		CC=$(tc-getCC) LD=$(tc-getCC) AR=$(tc-getAR) STRIP=echo RANLIB=$(tc-getRANLIB) \
+		|| die "emake failed"
+}
+
+src_install() {
+	local nls=false
+
+	use nls && nls=true
+
+	make DESTDIR="${D}" NLS=${nls} mandir=/usr/share/man libdir=/usr/$(get_libdir) \
+		install || die "make install failed"
+
+	newconfd ${FILESDIR}/${P}-conf.d ${PN}
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+
+	dodoc AUTHORS README
+}
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d b/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d
new file mode 100644
index 000000000000..5f2d91fedc54
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d
@@ -0,0 +1,6 @@
+# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
+
+# Which governor to use. Must be one of the governors listed in:
+#   cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
+#
+GOVERNOR="ondemand"
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-002-init.d b/sys-power/cpufrequtils/files/cpufrequtils-002-init.d
new file mode 100644
index 000000000000..c9eb034f876a
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-002-init.d
@@ -0,0 +1,26 @@
+#!/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-002-init.d,v 1.1 2006/06/01 12:02:01 brix Exp $
+
+checkconfig() {
+	if [ -z "${GOVERNOR}" ]; then
+		eerror "No governor set in /etc/conf.d/cpufrequtils"
+		return 1
+	fi
+}
+
+start() {
+	local cpu n
+
+	checkconfig || return 1
+
+	for cpu in /sys/devices/system/cpu/*; do
+		n=$(basename ${cpu})
+		n=${n/cpu/}
+
+		ebegin "Enabling ${GOVERNOR} cpufreq governor on CPU${n}"
+		cpufreq-set -c ${n} -g ${GOVERNOR}
+		eend ${?}
+	done
+}
diff --git a/sys-power/cpufrequtils/files/digest-cpufrequtils-002 b/sys-power/cpufrequtils/files/digest-cpufrequtils-002
new file mode 100644
index 000000000000..42fa9081a01d
--- /dev/null
+++ b/sys-power/cpufrequtils/files/digest-cpufrequtils-002
@@ -0,0 +1 @@
+MD5 93291a0d705ee2e19a6d7491b223c9f2 cpufrequtils-002.tar.bz2 35313