Version bump to cpupower from Linux 3.11 source tree as well as update conf.d/init.d wrt #453794 by "Khayyam"

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 209 insertions, 10 deletions

diff --git a/sys-power/cpupower/ChangeLog b/sys-power/cpupower/ChangeLog
index 14886d8a16e2..5c2d4be5e6e6 100644
--- a/sys-power/cpupower/ChangeLog
+++ b/sys-power/cpupower/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/cpupower
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.7 2013/04/24 09:44:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.8 2013/09/27 11:31:48 ssuominen Exp $
+
+*cpupower-3.11 (27 Sep 2013)
+
+  27 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> +cpupower-3.11.ebuild,
+  +files/conf.d-r2, +files/init.d-r2, +files/init.d-r2.orig:
+  Version bump to cpupower from Linux 3.11 source tree as well as update
+  conf.d/init.d wrt #453794 by "Khayyam"
 
 *cpupower-3.8-r1 (24 Apr 2013)
 
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 9f5e8f4f6765..bd6768e5458f 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -3,21 +3,26 @@ Hash: SHA256
 
 AUX conf.d 224 SHA256 da344b9c7373bfc9a12011caffe2d5a51327a9b0655588d09cc4cae35b5ed2e8 SHA512 552d650fb7dcc5d32a10315639d37eca5bc03318d9d67d1b57def263eff527d5b50d9b4bce039b7851c64f6bc0be82b83edd4da440fca4190a25a37074bbeebe WHIRLPOOL dbb9da5681a07dddb736d25c87efa081517d70fe20904d801f68313fc7d7146369d379ad8f0d7cfcd2d84e4b29351ca6276a3dd1d2d5e313114d4d21ab41ce10
 AUX conf.d-r1 1013 SHA256 44acd2dcd2193a160e0f4e05b571ba51215f60d8efa9ef801661ef2ba23a2e97 SHA512 d499855915b5884f93786258f7abd28aad001102d36d77bc2e7f3312c8e2ae71648b1742fef5bd4a922f27fd0794a4f89755ce829f51805c7261ad75941a4b51 WHIRLPOOL 705a65f70fd52ec8a754ca79bf0a3d32cb58964ce8260e44e580c72cfcfe14b97aba3d60ab4b72c5ce2af0f388ce15af4eb65f485cef5c53602121f4444bd138
+AUX conf.d-r2 1616 SHA256 9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c WHIRLPOOL 6e122d40525b2860b50b3933c6aab8c7fcc602a71faf7f6fb912db538bc58b21c2bee23f60c1801f5fe05dbfe434ce2432483a2e3bf1de4f75e0cce588fbb34c
 AUX init.d 778 SHA256 950c0971d16665fbfbe6427224bd432b720dbcb56fbbed63ba36532043405340 SHA512 0cbbddebbf7132ba9debdad4953dc012bae854031406e9506a394bc3fcc35b056524071c89a0fd394070e23f02abd1ee5dce0a29a61a108ce3d9a8f86ce9cf41 WHIRLPOOL 828b9805e82c47133ecc8635640b98a4097647a9f08194fd358068db0ffa89e5dddf4fa1d2bb6f8a5b697c946801771f79f3d8af9cf181f6fa3b63b4322f9542
 AUX init.d-r1 798 SHA256 dd96e2a69a0f702f7fecf8c2d83c73060822b65387589d370efcd86871d70c74 SHA512 780451853e47dbd742575a488ee41eafc787fd86db4fa68284543e30ecabfda9a00d454200b3ebcf58da2b20c9c6b6d6387d789c6a48d06eb14f7286a4cc1475 WHIRLPOOL 619e39107d40bc46a0b6a355904a4a6e4a28e8d2f23b22eff6bd1d6988455d8df9d5671b2f2d6efb68a74c54b1840f6cc0dac5d933817732fb32134a8fdc260c
+AUX init.d-r2 847 SHA256 8d8e45f112ea86fb686f66ca16c25f6d1b0e06c62b0fd2ce2ed39b455a1d8a3c SHA512 bdc9b48c0a987d7d86f4126ae614de485792770ae8a2fec3bd739a192d76c494a4634b15b910bfe4fea5eacbc67af9d0231c7dc2916f6693fe60b92be620d068 WHIRLPOOL 60c8e652f4d7ca6470ee400b2362efaf93f6a74966694da4174f0a5b0541c555d651ad1ebb1474770b83e68ab579be34c602aab163fcfbeea830c04f64ad17ec
+AUX init.d-r2.orig 803 SHA256 7bf6f575db0bc7b3c5b6d0f38b0abd3c4344190609a9bc12fdb9f78ec8c8f144 SHA512 edbc90fc0578e0b4642bf2fb0339aee7a37082b1ff7b5a3546be6121989a99d5a8a9e193a5ced58996798092967288321687827f9e049d8cfb0fe4e347866767 WHIRLPOOL f6f19e1544a3dbd52ccf13c1400e174d92b5d88a8af4f7d4c91218be4eb32ce9a9cab989379dc158225a0e929441d7d87da59a768a0e5225039e498ae5c882b4
+DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
 DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
+EBUILD cpupower-3.11.ebuild 1832 SHA256 8198767c4c83d2c25c52091acfa49bac9e37ae0b1daca6d0c9ed923a4d6a5c92 SHA512 a85a4a11c7a2a5c90f8e1d199e9efe032ad2b63d9f0c95ee5cda4e5a59f5b94b7b2f1ecde1fcbe9bed03c473f6c4b2559e3402adf42b7754c999e0c2867785ad WHIRLPOOL 64e5ea6ea7b5e7694bfd384ad2a5d69ea4f33bb403de8f862fcdcb2b1519a2d11c357f0d79aeb838bbb4b19a5e1896d81bfef56af206828dc09c708c48c83810
 EBUILD cpupower-3.8-r1.ebuild 1777 SHA256 fc5e9657099413de8b260c205e1197b2946568eb75eed19ba62ecf7132effa78 SHA512 559dadd0cdaf27f1bdc8ce811cd5c172d9d5f7e085c31c9bc8385f3ec76422b2f368828f0aec5659a53bfc9334888349266f7dfb1f65ab702b52b684ab796983 WHIRLPOOL a5f458f66b6b334e12194e4fd78679b46fd4738a5a9a8b30243eae10dd02dc4b8e8ac250c671e91bd45c678dc4565aa4e11a2f823e0dc7e782d6f49f96aa73aa
 EBUILD cpupower-3.8.ebuild 1766 SHA256 4bf5fe84229c1cc5100bce9a6bf6d6543e52628d120859c640a0bf2bf50cd601 SHA512 66425f0eccfc01f5da795e403097470ad6646b12dc9c12afc580c6bfcfa596ace376d282a06fd9914dd1d187f567151d4877af74b15e39f039e29a748d87ee7f WHIRLPOOL 479363678fd97cbefbc534dcc40b182d0388110f0a3d6c1fa969bd69e5619573b0db02f92e4a8d0fd2e91d8f06b240172e8fa3b88cd553e0a521329353573efc
-MISC ChangeLog 1447 SHA256 d4c7009720d6345e3d94e3bb99ef64212a670c3cacbe69b4b6d4c074d9b4e36d SHA512 21df3b69363994c35c2becea2e482d7d85abc1730f55401af9f482c8753475c1ef39cf89d89915b94d89873c8c35116c4fe88da210ab5c6dd111a1d18fa614f2 WHIRLPOOL c0b637a046d9fd08854aec7a0b63595af70634dee6a3908ee0d99b01cae212e8e2008185803195ff30029bb64836cb7188e4507d7336310dee182b14e48269e6
+MISC ChangeLog 1730 SHA256 a8c8df3144d8cce77ba98f55e3de99381a1f1b2c76c323b4a55cf55e89650946 SHA512 12a3fe29a8d3f8d871f18c6b4fd8050efe684f36acf35f8ae729f740042d3c84b8205f6ddfc7a2b02c94f9cceb09ce43a107614baa5c3781ac4c3d277f5d04e1 WHIRLPOOL c900eb8f3bcab5672de8de9f5c3265f5408c50b2efc68f88b8ff818f4cf9e983aaf265b875e1097ea6094a8edc6c5b3210189df779d5f4353d5610c8cc3a8c4c
 MISC metadata.xml 357 SHA256 be84e27d1bacf98a571c56fea8cd368b79b5304b2f9928516f690f1902a4b535 SHA512 b143b9edb70a97d4c584f771aeb73b5f6895e007c9e4bffdf358f9646ad9520f2e14ca623ea5dd9e4b7bc1b1c5f50e5735c435e9907b43566a1a5f12354f4a1a WHIRLPOOL 5a6fa0c613489f062710fc6ec2633e56e7e7274d962620f1113425544402012459634e223d1e2bc8920acafff46b800a10b4a5422ec8c1a77363c5ab6d61398d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRd6kcAAoJEEdUh39IaPFNLQsH/3OcJqL6qaenOfaFSJmHOxNA
-KXm29LIiWzJgfx4D/hh0GyzrJ+7VhX4bUEP909KHKoTa5AVTXLTFsJcK+7La89wp
-s0N5ZoFK1LDM8aO3T6i+SKrQCeYG2SLYMhujbF/LXaXR/vFsCZgd54cXdZNJDCXm
-NTTA8eVkHRck8q9mMyYofggKfGUcv2p9lmETmQ0PQ92diLev+IsUqGCofnIuLnAG
-0yETZDK+z1TD1VigLvwkyUN84YZ7Y9bg5d/c9ZrCZDBHO8Mx9rZ87ccx5bZg6m6o
-DY5qimq5uNtIYz8mr9+NdU/7yA09WkPIgEleBu7noi/5XChBoFZcMGs5cj7QjJc=
-=C7VF
+iQEcBAEBCAAGBQJSRWxPAAoJEEdUh39IaPFNTOEH/A8M3UBFf21wbcdvLpfvaa5N
+9zBEPu/exG7tTRUDOaDe3YmI2loEsesqjBw+lzzabx5LN52u7d++XjqFtKaccIV/
+PYHEGeNMw3tgVFSGDUNB2Bv65PEuDimkT7af0nVIVImMcyUrHMFU/EvPFvowpCLh
+RMX6qMmYE2c5enHpIZXe4gDUDXwThMAtMS+nBGt6dIaYVLz94Km22MhR+JVLM1ah
+XsNglA8xJcziJRonR1tgThT80q6AAT+aq8qUDzdmeH2W/mqtsyC8dR+m3X/wi6wH
+bDci49T4X+KaZ4vrvPXUpMP6JNkWTQ5ZFSOIBOO2VlWmoGS2IMsQ6TQzg8K5uqM=
+=NB2i
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpupower/cpupower-3.11.ebuild b/sys-power/cpupower/cpupower-3.11.ebuild
new file mode 100644
index 000000000000..0c46db6a32bd
--- /dev/null
+++ b/sys-power/cpupower/cpupower-3.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.11.ebuild,v 1.1 2013/09/27 11:31:48 ssuominen Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="http://www.kernel.org/"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/linux-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpufreq_bench debug nls"
+
+# cpupower should be a USE flag in linux-misc-apps (ditto for usbip!)
+# but only if the maintainer doesn't agree to drop it completely from
+# there in favour of this one which i'll push to users are replacement
+# for the dead cpufreq tools in tree
+# !sys-apps/linux-misc-apps[cpupower]
+
+# header collision with cpufrequtils
+RDEPEND="sys-apps/pciutils
+	!sys-apps/linux-misc-apps
+	!sys-power/cpufrequtils"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/linux-${PV}/tools/power/${PN}
+
+pkg_setup() {
+	myemakeargs=(
+		DEBUG=$(usex debug true false)
+		V=1
+		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
+		NLS=$(usex nls true false)
+		docdir=/usr/share/doc/${PF}/${PN}
+		mandir=/usr/share/man
+		libdir=/usr/$(get_libdir)
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		STRIP=true
+		LDFLAGS="${LDFLAGS}"
+		OPTIMIZATION="${CFLAGS}"
+		)
+}
+
+src_prepare() {
+	# -Wl,--as-needed compat
+	local libs="-lcpupower -lrt $($(tc-getPKG_CONFIG) --libs-only-l libpci)"
+	sed -i \
+		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
+		-e "s:-O1 -g::" \
+		Makefile || die
+}
+
+src_compile() {
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${myemakeargs[@]}" install
+	dodoc README ToDo
+
+	newconfd "${FILESDIR}"/conf.d-r2 ${PN}
+	newinitd "${FILESDIR}"/init.d-r2 ${PN}
+}
diff --git a/sys-power/cpupower/files/conf.d-r2 b/sys-power/cpupower/files/conf.d-r2
new file mode 100644
index 000000000000..1e67ed04e254
--- /dev/null
+++ b/sys-power/cpupower/files/conf.d-r2
@@ -0,0 +1,36 @@
+# /etc/conf.d/cpupower: config file for /etc/init.d/cpupower
+
+# Options when starting cpufreq (given to the `cpupower` program)
+# Possible options are:
+# -g --governor <GOV> (ie: ondemand, performance, or powersave)
+# -d --min <FREQ> (ie: 1000MHz)
+# -u --max <FREQ> (ie: 2000MHz)
+# -f --freq <FREQ> (requires userspace governor, this *can not* be combined with
+#                   with any other parameters).
+# Frequencies can be passed in Hz, kHz (default), MHz, GHz, or THz by postfixing the
+# value with  the  wanted  unit name, without any space.
+# (frequency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).
+
+START_OPTS="--governor ondemand"
+
+# Options when stopping cpufreq (given to the `cpupower` program)
+# This option can be used to change governer on stop. Leaving it empty will ensure
+# the governer remains on the one provided above.
+STOP_OPTS=""
+
+# Extra settings to write to sysfs cpufreq values.
+#
+# up_threshold: threshold for stepping up frequency, where the value represents
+# the percentage of cpu load. 
+#
+# down_threshold: threshold for stepping down frequency, where the value
+# represents the percentage of cpu load.
+#
+# sampling_down_factor: determines how frequently the governor polls the cpu, a
+# value greater than 1 improves performance by reducing the polling when the
+# load is high. This tunable has no effect on behavior at lower CPU frequencies.
+#
+# ignore_nice_load: when set to '1' the processes that are run with a 'nice'
+# value will not count in the usage calculation.
+
+#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=75 ondemand/sampling_down_factor=10"
diff --git a/sys-power/cpupower/files/init.d-r2 b/sys-power/cpupower/files/init.d-r2
new file mode 100644
index 000000000000..5f748d7397d7
--- /dev/null
+++ b/sys-power/cpupower/files/init.d-r2
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d-r2,v 1.1 2013/09/27 11:31:48 ssuominen Exp $
+
+change() {
+	local c ret=0 opts="$1"
+	shift
+	if [ -n "$opts" ] ; then
+		ebegin "Running cpupower -c all frequency-set ${opts}"
+			cpupower -c all frequency-set ${opts} >/dev/null 2>&1
+			: $(( ret += $? ))
+		eend ${ret}
+
+		if [ $# -gt 0 ] ; then
+			c=1
+			einfo "Setting extra options: $*"
+			if cd /sys/devices/system/cpu/cpufreq ; then
+				local o v
+				for o in "$@" ; do
+					v=${o#*=}
+					o=${o%%=*}
+					echo ${v} > ${o} || break
+				done
+				c=0
+			fi
+			eend ${c}
+			: $(( ret += c ))
+		fi
+	fi
+
+	return ${ret}
+}
+
+start() {
+	change "${START_OPTS}" "${SYSFS_EXTRA}"
+}
+
+stop() {
+	change "${STOP_OPTS}"
+}
diff --git a/sys-power/cpupower/files/init.d-r2.orig b/sys-power/cpupower/files/init.d-r2.orig
new file mode 100644
index 000000000000..3780ab679643
--- /dev/null
+++ b/sys-power/cpupower/files/init.d-r2.orig
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d-r2.orig,v 1.1 2013/09/27 11:31:48 ssuominen Exp $
+
+change() {
+	local c ret=0 opts="$1"
+	shift
+	ebegin "Running cpupower -c all frequency-set ${opts}"
+		cpupower -c all frequency-set ${opts} >/dev/null 2>&1
+		: $(( ret += $? ))
+	eend ${ret}
+
+	if [ $# -gt 0 ] ; then
+		c=1
+		einfo "Setting extra options: $*"
+		if cd /sys/devices/system/cpu/cpufreq ; then
+			local o v
+			for o in "$@" ; do
+				v=${o#*=}
+				o=${o%%=*}
+				echo ${v} > ${o} || break
+			done
+			c=0
+		fi
+		eend ${c}
+		: $(( ret += c ))
+	fi
+
+	return ${ret}
+}
+
+start() {
+	change "${START_OPTS}" "${SYSFS_EXTRA}"
+}
+
+stop() {
+	change "${STOP_OPTS}"
+}