7 files changed, 14 insertions, 313 deletions
diff --git a/sys-power/cpupower/ChangeLog b/sys-power/cpupower/ChangeLog
index cf780c5e1d4a..552224e92269 100644
--- a/sys-power/cpupower/ChangeLog
+++ b/sys-power/cpupower/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/cpupower
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.13 2014/02/12 20:02:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.14 2014/02/12 20:03:18 ssuominen Exp $
+
+  12 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> -cpupower-3.11-r1.ebuild,
+  -cpupower-3.11.ebuild, -cpupower-3.12.ebuild, -files/init.d-r2,
+  -files/init.d-r3:
+  old
 
 *cpupower-3.13 (12 Feb 2014)
 
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index cf6114b5ad17..f8dde0238b79 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -2,26 +2,19 @@
 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
 AUX init.d-r4 915 SHA256 25f2a1665c88dc5227698bdedc2098d6e37d12d8b966f00e2a180c95a33cc8b4 SHA512 ade36fae595eead5e4108661b2ee999040b8498dc345d862a218242b895bcfc1bfcc05a087de984ecd37b80d6554635ae3d24b893b2586e8e7269c75e9c02afc WHIRLPOOL a1fc7ac2c828f57c9363e8e3eac5cdb6c3514a67335a8b1d806b8b222e9afa5c8d765908aa33a4a0cfbee82584f10745ccaa87707bcc74ca3a8efcad5d9b741e
-DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
-DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
-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
-EBUILD cpupower-3.12.ebuild 1832 SHA256 05701c7423b8772538c9a0a5a8dd4ea1597ff40a3928d4d8cc8f48251b0a3b6c SHA512 46b5a28fd6b4fba3d6e5a96b6941502e6978394e15f83dab1c3cf695818073a9e0a27913d5d1e0b00c897b96a510db7f97ebbae9b9ebe1a6abee82ca528e5f01 WHIRLPOOL 206b92c18f38fee0851720493c1534f5499d090c402cff58068e3b74e740b0032f05e87064aa93134c944dccecff5180142a35dad079cf92411ac994fccbe6ff
 EBUILD cpupower-3.13.ebuild 1832 SHA256 46c57316110f86eb1d7aa4340362a1e3bfc9ad954ea5be8d90a4762cbb492836 SHA512 2fff24d0ae4def029e1c9e800f434abd5d29a386be0151bf502c9c962c0be224bd16064eaf2885bb0b6d305e9b1edf28ac4fed84875c42ee69967c7dd40df408 WHIRLPOOL a79fd55e3ab78cabce75b951daa34525db29d6a107128fa43616b7ac562c3dd365db2407011e09d08bc85a5ce3d79a5d994143fa9b9ff2c918332d849e9092fd
-MISC ChangeLog 2416 SHA256 8d86309e1909c34a5aea2eea2d759e631c330257a7fc7120c345d0d1e78cff80 SHA512 8277604257787367e7900cad967640736adf862a6f7d2b7f0e4ded3414a5d2565ace17fcb9db8fc78c9dab5a5856b7ed9777b1bd70704557986012c03b7799dd WHIRLPOOL 923d21668694feed629949b01c8fb22f01f15a23194574d731eabdb8855fb66dd525d298624fb5e738c520f706b854580c20d6d9b4b4cdad0b66119cb595b6b1
+MISC ChangeLog 2589 SHA256 d898b13d3cec84505a95ca8ef3e26782f595b6282f31b8cd8f8ec627a6a92289 SHA512 f2131f3787e74b6e7f19bc966b3b2663fb628c044ae1d106d605219f8a8b2ba6818815fa46e2493f6d3f553b8d35ea15693b1b7da9b2331fbfcc1cbdef7b05ed WHIRLPOOL 2a0a20cefc2c47fc734062feece82637dd24ac6ed8ef55c56d29210d644b6fda27602a42a1146c776d90814baa4b59766282013a4d12934a1624c05e6c8a7bf3
 MISC metadata.xml 357 SHA256 be84e27d1bacf98a571c56fea8cd368b79b5304b2f9928516f690f1902a4b535 SHA512 b143b9edb70a97d4c584f771aeb73b5f6895e007c9e4bffdf358f9646ad9520f2e14ca623ea5dd9e4b7bc1b1c5f50e5735c435e9907b43566a1a5f12354f4a1a WHIRLPOOL 5a6fa0c613489f062710fc6ec2633e56e7e7274d962620f1113425544402012459634e223d1e2bc8920acafff46b800a10b4a5422ec8c1a77363c5ab6d61398d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS+9LpAAoJEEdUh39IaPFNhRcIAKJcDX5QDLJq1prltHceuo/C
-BBn/Iyb4ygxPcwtkL7odZUSRlnc2FOojk/cuehQiW8EkzRavGwQ0PFrC+b86pQLQ
-ZgyoKesSxAX7o3rwlMDu6qptS4BNyZ4TNX10s9/E1Iv2RCga57EnV/fQTBpZ9PFH
-mnrraPVDyW7jMN+x2hye2JiUJ6hcRnQf1uMj1ec1nlGx1xe9rqEoVuzSD2q0hF47
-VUERH4yoH0uKNOsEj9tSUnhBMYq/qe7t+SxI5Z5uzHjvjbRi0mvFWzSvqMWWngcp
-wpvNU0oeWvEx49lOgyFzkyzagXLt7luRpadBX5+uUIKWXnQyEksSqPxhlnPklSY=
-=EISo
+iQEcBAEBCAAGBQJS+9M0AAoJEEdUh39IaPFNwgcH/AgP541NTjUdQIStaSPzS94A
+Nba/5tQoJp9JmTsgYDSoL5OXEElqyAOQLJTON5mKwkuAhXdhejdYnY4xr7qaYHwM
+7KxpRKFlNRH0Y3d5nsJ6JxcENgbqD5b5xc+pgNPb9SsqNdTKsTKMqhQmj9vBXLpy
+hqZJc5xYnmY1cvgsz8++YXFLYDYnulAudGYGJi2vA3b6FG/hWyAntwrDP39QcdQB
+dF2FubYZEda01nwiMd3/coB4ZNNuQAPht6VBPyHGoZP1ni4Ew+HGSIeeBF/eukgq
+zoWR4UZeCF0xmn/XYbqigpA1oquXhlP826VorbsgK1tDk3pmLcmASKZCTvhNz54=
+=2iaS
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpupower/cpupower-3.11-r1.ebuild b/sys-power/cpupower/cpupower-3.11-r1.ebuild
deleted file mode 100644
index 1abebeaad31c..000000000000
--- a/sys-power/cpupower/cpupower-3.11-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/cpupower-3.11.ebuild b/sys-power/cpupower/cpupower-3.11.ebuild
deleted file mode 100644
index 0c46db6a32bd..000000000000
--- a/sys-power/cpupower/cpupower-3.11.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/cpupower-3.12.ebuild b/sys-power/cpupower/cpupower-3.12.ebuild
deleted file mode 100644
index 14224ed7d78c..000000000000
--- a/sys-power/cpupower/cpupower-3.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.12.ebuild,v 1.1 2013/12/25 11:46:32 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-r4 ${PN}
-}
diff --git a/sys-power/cpupower/files/init.d-r2 b/sys-power/cpupower/files/init.d-r2
deleted file mode 100644
index 5f748d7397d7..000000000000
--- a/sys-power/cpupower/files/init.d-r2
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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-r3 b/sys-power/cpupower/files/init.d-r3
deleted file mode 100644
index 7e4621c4baff..000000000000
--- a/sys-power/cpupower/files/init.d-r3
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/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}"
-}