Skip non-existing sysfs entries wrt #453794#c21 by Holger Hoffstätte

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

4 files changed, 132 insertions, 10 deletions

diff --git a/sys-power/cpupower/ChangeLog b/sys-power/cpupower/ChangeLog
index 0c4f97270cad..f6f6484052f2 100644
--- a/sys-power/cpupower/ChangeLog
+++ b/sys-power/cpupower/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2013/09/27 11:33:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.10 2013/10/20 14:17:59 ssuominen Exp $
+
+*cpupower-3.11-r1 (20 Oct 2013)
+
+  20 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> +cpupower-3.11-r1.ebuild,
+  +files/init.d-r3:
+  Skip non-existing sysfs entries wrt #453794#c21 by Holger Hoffstätte
 
   27 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> -cpupower-3.8.ebuild,
   -cpupower-3.8-r1.ebuild, -files/conf.d, -files/conf.d-r1, -files/init.d,
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 831084bcc85f..d124b2ae5e7c 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 AUX conf.d-r2 1616 SHA256 9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c WHIRLPOOL 6e122d40525b2860b50b3933c6aab8c7fcc602a71faf7f6fb912db538bc58b21c2bee23f60c1801f5fe05dbfe434ce2432483a2e3bf1de4f75e0cce588fbb34c
 AUX init.d-r2 847 SHA256 8d8e45f112ea86fb686f66ca16c25f6d1b0e06c62b0fd2ce2ed39b455a1d8a3c SHA512 bdc9b48c0a987d7d86f4126ae614de485792770ae8a2fec3bd739a192d76c494a4634b15b910bfe4fea5eacbc67af9d0231c7dc2916f6693fe60b92be620d068 WHIRLPOOL 60c8e652f4d7ca6470ee400b2362efaf93f6a74966694da4174f0a5b0541c555d651ad1ebb1474770b83e68ab579be34c602aab163fcfbeea830c04f64ad17ec
+AUX init.d-r3 906 SHA256 aa16c3190d26aca6c0a3f69cc929e3571df3da0b3ec7b45fe19a216fe912fa6f SHA512 b0a0449f618f045c62145802a6cee63f0738945fa3f472c0da6637f78ca23e21794cbd7b3fafbba07e008d8fd28a4ca1db097503e11f41ccda09a938a55af81b WHIRLPOOL 4a070f8d01799f12403574be8702d1abc801b3493029bd6c090115aa0fa8359899d720df9e559c9ea6951ca5c23afa9b39335b579037e430238682b47e5cf788
 DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
+EBUILD cpupower-3.11-r1.ebuild 1835 SHA256 7d1a3437c44d5f31fc2551416e4c29003c72a09fa029c2bce144eaa6cac68b09 SHA512 f211b72491b4f96d509b3aff8fbc6a4542b7638d88ee9f83f90055486c722b1b01a2ff08e05f7768f84256770a4735640e7d3147d3a79709de58e177c455f5c6 WHIRLPOOL bfca6c6ad0d8cf1442b281a662786f838ecaff3b5d754f20535e0507011c7011b7e1cfee5a0be89673eb7ca066e99000f7bff152cf92d387ef66f66878af932f
 EBUILD cpupower-3.11.ebuild 1832 SHA256 8198767c4c83d2c25c52091acfa49bac9e37ae0b1daca6d0c9ed923a4d6a5c92 SHA512 a85a4a11c7a2a5c90f8e1d199e9efe032ad2b63d9f0c95ee5cda4e5a59f5b94b7b2f1ecde1fcbe9bed03c473f6c4b2559e3402adf42b7754c999e0c2867785ad WHIRLPOOL 64e5ea6ea7b5e7694bfd384ad2a5d69ea4f33bb403de8f862fcdcb2b1519a2d11c357f0d79aeb838bbb4b19a5e1896d81bfef56af206828dc09c708c48c83810
-MISC ChangeLog 1885 SHA256 906d872aca8ef03e2172390352861cb2db4d6c63cf4bb110c56041fdb064b78e SHA512 a78593085da5058dbb680047b6689fc9f9450ee54901870133d2c53528a97b6ecaa86f9792f0026dfa28d94324b976750c29f1df787215303095f3c3949d1d96 WHIRLPOOL 6c7388b21ec447e18e0b2716cc963994f6690a1ff8406f684d7dbb54c7f166b3364dc71ad98b92bc2e23a8274ccce5655a391ef21a3e989b3d5665ede9b0a06b
+MISC ChangeLog 2092 SHA256 ae7d578f13ae761145dc1ba32a0beb38c72e87b01356f21153589862e5bbd932 SHA512 a1a0505711b6ee483034b0ad24447053e78ab15f8cacff68dc4ceee02ee5439438900321958771bf0992ad0939726046d2bcefadbb96236029957f53418293f3 WHIRLPOOL 83b7a5639195009a74c639a3762229e29646cfdecb7475585dbeda60787ce78887374d71ab366a9c84697aecb0aced6106ac2bad1be662fe9a36442b4953505b
 MISC metadata.xml 357 SHA256 be84e27d1bacf98a571c56fea8cd368b79b5304b2f9928516f690f1902a4b535 SHA512 b143b9edb70a97d4c584f771aeb73b5f6895e007c9e4bffdf358f9646ad9520f2e14ca623ea5dd9e4b7bc1b1c5f50e5735c435e9907b43566a1a5f12354f4a1a WHIRLPOOL 5a6fa0c613489f062710fc6ec2633e56e7e7274d962620f1113425544402012459634e223d1e2bc8920acafff46b800a10b4a5422ec8c1a77363c5ab6d61398d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSRWzQAAoJEEdUh39IaPFNvu4H/RG58nEJ+v8ITyv2RVyQwYFD
-DnP28FY3/Bc/ZubLP7sMF75bi4osB8OJ0CNijSOx3RucVhC/UCJW6t9lYKXIbbTW
-k3vY8RSl5ay6Hm5fP1Uu7TdIPcWnBe+aLwSA3bE0r2j1o3YJ6yPIp2NoMbH0XcpK
-w+45gcsvQfLgcO8NAqRF5iUbgDdxSLMnKykzT/Bdo7tyntnE80QnbM6sTCtn++Qy
-9+Y1jn3aQuZOXeVdYfqc1vQFtAnTaFIhScnkiCxpayGSN4SfBxyryAMyVmyT9qSw
-rNBCNz8koNM46EMJKHmChPPAwMHwkbdkU3Udjef3YDepeW3YUOooQa8kdrsKimE=
-=kHg+
+iQEcBAEBCAAGBQJSY+WeAAoJEEdUh39IaPFN1OQH+gKIM7Foc808P8RSiIRIpD1J
+0zt8gxu/mgQ6ARHQaY+2fj1uzVhmu2r1c98LEYzhB4Pk0PcwGj1Mx2nYcAy86Wdj
+FwsV3O+Gwdc61EVgdTtxuPx90xYnEXD7boYJ3QmpRJLWJbqwR51mVzAaJcJ+GUa7
++eOzfKa15oMf24Hlmv1/RtfvAzgdnUT85zKnDVXX5cBRb+3wHhVB3FjO7lgq/37o
+QbjioiFAnfKu3SpxFlxmV7X3ZUKqzllTNxgmbG5xSCNq0DCCaGncHHxichE2kt/i
+R0Hd+aDa23gZRIurVGMX0xJAPyZmIsp3VVa1YOvwydpQ/eUydQWrO1egV9oBBb8=
+=NCSE
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpupower/cpupower-3.11-r1.ebuild b/sys-power/cpupower/cpupower-3.11-r1.ebuild
new file mode 100644
index 000000000000..1abebeaad31c
--- /dev/null
+++ b/sys-power/cpupower/cpupower-3.11-r1.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-r1.ebuild,v 1.1 2013/10/20 14:17:59 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-r3 ${PN}
+}
diff --git a/sys-power/cpupower/files/init.d-r3 b/sys-power/cpupower/files/init.d-r3
new file mode 100644
index 000000000000..7e4621c4baff
--- /dev/null
+++ b/sys-power/cpupower/files/init.d-r3
@@ -0,0 +1,43 @@
+#!/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-r3,v 1.1 2013/10/20 14:17:59 ssuominen Exp $
+
+CPUFREQ_SYSFS=/sys/devices/system/cpu/cpufreq
+
+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 [ -d ${CPUFREQ_SYSFS} ] && [ $# -gt 0 ] ; then
+			c=1
+			einfo "Setting extra options: $*"
+			if cd ${CPUFREQ_SYSFS} ; 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}"
+}