Version bump (bug 492262).

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

4 files changed, 136 insertions, 6 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index 8f0540eaf269..352ce869c103 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/phc-intel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.13 2013/09/05 22:38:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.14 2013/12/02 10:21:10 xmw Exp $
+
+*phc-intel-0.3.2.12.12 (02 Dec 2013)
+
+  02 Dec 2013; Michael Weber <xmw@gentoo.org>
+  +files/phc-intel-pack-rev12-trailing-space.patch,
+  +phc-intel-0.3.2.12.12.ebuild, phc-intel-0.3.2.12.11.ebuild:
+  Version bump (bug 492262).
 
   05 Sep 2013; Michael Weber <xmw@gentoo.org>
   +files/phc-intel-pack-rev11-trailing-space.patch,
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index 945743cc08aa..1160b27eef24 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -6,19 +6,22 @@ AUX phc-intel-0.3.2.12.1-r5-2.6.36.patch 15987 SHA256 3658a7e3e8f7a4a50f44a38c6e
 AUX phc-intel-0.3.2.12.1-r5-2.6.37.patch 15972 SHA256 2e214b9664b4df4c3453520f8d91a55056e61a71aec493206e948897a6dc6285 SHA512 46e4020614338e802d67544bceea9fef55d06ccbb1759c23c737066622613b7b915a24a4b26b6fea209ca8d8bfc1c44af6765ba55309cc1ff5d340d31941f8f7 WHIRLPOOL c57a3fe8cb6171c2624f9152b44848950134ad6644bb3bfce47c5e3b1f99dc8b63d528fcffd42fd8c860560ea93a8edda94096393935719bf771cd8b3631a899
 AUX phc-intel-0.3.2.12.1-r5-3.7.patch 16200 SHA256 881e096e4dc74832529d32ddb55caf4c4c1c1168fac3f9e8729b4b7b9fea8176 SHA512 9c79b58428a44e073bc61fe2b6429056a27fdf1a3b1f2ba4ab29118b22d4491211f24bb049a5eaec733e77455367bac028e4e1ae4a6bd31ad99329db6f02cd85 WHIRLPOOL 579de36768e5283bd0e7378aa79e5ecd50cc48bc59a0a6b53ab0ea9f8454f44873495849ddf3f8a25adc21a13683f7c29cbd0ced9c5caee4270bc8be599d0e46
 AUX phc-intel-pack-rev11-trailing-space.patch 42487 SHA256 229670841c656001fea7a14304694f6bb310ca4bdcb8e1c7f60f659c279eaf9f SHA512 e319ba777b582eea50d0f126b8f5abcfc4007fba1f596b57a35b4bd34635aa750126213ae7528b074a01d402c63b17326f52ead8908e36cac5a8329624d314f9 WHIRLPOOL fa5c3d99e8f515c14c4e710ce99ac7be1c2dd6bdbe6ed83bd4d48ee3a567c16f135b489434d77ecbad071361b029ce6e4e708bf3f544dd5af05462754f817bf0
+AUX phc-intel-pack-rev12-trailing-space.patch 1648 SHA256 78e3b3c0397fa20664c7110b35e05d507bc41451af4ae43e934694006c221276 SHA512 2b61f6ce243443eb3a50f6d94fd513ba21cb0826d8aca8a054b1361fe3ce7cea04ef9fc1c4f6659dfb660eed8b17875ed62b2b7d5a0a4900b50fc5935af66a76 WHIRLPOOL 036ce99de254e9a7b22f7da97a6d67516876c0d03c57c183d8b0ce784bce8ccfdf232d5c1bef6ea092c8f557466ede0533597755ff69322c9177fef65526daee
 DIST phc-intel-0.3.2.10.tar.bz2 20680 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5
 DIST phc-intel-0.3.2.12.1.tar.bz2 14412 SHA256 4f66989d424d328b205873da1b0363e75f27d7912e0e93c1cad3407c17be8264 SHA512 f9a63300fe1d7b42d1167c3b6d1f5b75cb707d8dac26d2d91f40466a26afedf3dccb76a58bb4764233ade6c309cdd554f869cdaeac04bf521607644afb709427 WHIRLPOOL dd064a2f5a67fc2aed96aa32bce4e040daf8468d2a215dbb08e11b00de039e7ac6179ea756a94035478a885a202f13517ec45a8dd8dfcd072436a0c8509e2fd0
 DIST phc-intel-pack-rev11.tar.bz2 76485 SHA256 38f4bd923228ef61315a0739f32504692d7f1809494bdc369658222f6f873479 SHA512 2bb718cc78219db8698f671ecfcc895cfd5be66d7301c56e91d24a534d308121a8a76cbd1259022e8e524b359eee34b7965da952254b26f9cb6a0bd81ff88981 WHIRLPOOL 8d40a2f4319764f15b413621ff30d39b1667281fe08a570b18e32f53197b421c85c0f0a62b99e52c9ccdac887cbcf41366790aab1b86eb79f12799455185d481
+DIST phc-intel-pack-rev12.tar.bz2 77624 SHA256 96dd605e8c2062e87435afc7f2199419e3d3b1596e180462dcf2f704534ba710 SHA512 b3ce4ee3940d05e4e58ffa766e9d33518e6bee3bd0ea19bda36bc114bb0f23a0f284f22b43acb88801610cd639e2c4ec6594b4f160bc7cafd0c2242fc268bdea WHIRLPOOL a5a2cc4943003c1ebada10c7a89a67642bf9dbf42698b889af6d875016390952e70ff9bc23ea0d93c45d487df424f45836cb4e5c7c4b584756d85fcb951ef6fa
 EBUILD phc-intel-0.3.199.11_pre.ebuild 1824 SHA256 5101722f7e01ecf7b8b9931c2fc4934fe1262116dbd101205203e8743a2263d7 SHA512 c8d37f5cbd9b2684a4fd55940675caf6833d07dbc34c1e567d3fbee8879d50759f4c49304af464174af0e65580f34c5ed35f866ef4027bbdf4b8149460e7c0c8 WHIRLPOOL 0665ffd2b9a6562e5c6f8129aa8e5603977912b70c5144e9f0ec8f3e8286fe7647542b98594d3221092ee008b92477b319734b4c8daa7aa0b57875d259ebc4b4
 EBUILD phc-intel-0.3.2.10.ebuild 1079 SHA256 19ed93eab1feeb9cd3aa214ba76ff5834cff06cb821676842574e6075f8a92c4 SHA512 038fa33588b9c2c57184f6978b36315841697d2b8fc91d4307336408623813d04bbef9fe17a940ef627b84bbcfb008111b823a11243af83b90c6928756b98551 WHIRLPOOL 670fd1c97f6dab85e7814b36c4b1d4b0f90ac6db0bba01d943f2d9d7b680f8e38aef84e5b6aa9d037f71d29b7cac955fd2d953815e7fdda4fe7ce96fd4488166
 EBUILD phc-intel-0.3.2.12.1-r5.ebuild 1943 SHA256 10f761f6fc644b782f6249accfb06c2c48ceac0fe4ff2ab51c882ce16cb756aa SHA512 f2219d28b581042078689e4a5f853087f5deadf7215bd82eced4b631950a139b3eb0ab0cd09419e27c5bc3ecd8e7b4bea2598fa860852bca1d59962ec55b8363 WHIRLPOOL 321eb7e007171991c8df80a2fabc8f0480de646d9fa1266eb7900a122400d9816558b565bb002ffe88836e4ef8e9f74b6cf83d0c3611431c7ae6631087ab639b
 EBUILD phc-intel-0.3.2.12.11.ebuild 1832 SHA256 bd7bf512d202d57fa4ce7f90fad039f9a9793bbe773f618bfa13eeb01383f7a7 SHA512 9a7f6fcbf4e08e3ba349264a8e19400b1ebaa139d8ca6e668a0a0ac60118fba7ae3ac0260b4429788793aaa7a225ee582034027f09917cd3d07a6946961e8d7f WHIRLPOOL 2ebb5c6a3331da59b5c0403fe41133eac4d27b066e33209a7ef699f6d48c6a76abd0aae0db0bab90b3bd1c40d00652f7ee195ab3eacd8a3827fb2fb5e3c6166c
-MISC ChangeLog 3447 SHA256 fa318b24ba91959e4713d07fd2b69e8c0c6396677ea55b0d6c65a032b404c983 SHA512 8df073df1b7cfff223a0c1b3c150115d164d87a1effa711924f551cc8414314b0cc6c52081350153268a41463a17e75c4a1f3ec1716394c10647327c6627e3e3 WHIRLPOOL f3f00173766c3daabad0be25b4a92bc4d552850481102c12cf5f53472eb797958dc0881fd691f7463b17a9367ec96036ad45f46e22b1a638ae405a64fe826d59
+EBUILD phc-intel-0.3.2.12.12.ebuild 1978 SHA256 1ee482df9d8fa211bfe76ff99c9d9496541071b1c22a405aefeedd52b251c66d SHA512 0a5653b680dfcced894a5d75ed4693757377187c84fb57f6cbdd67ce1b2d961832e6b29510fbfec8be3d4c5e245eeea6893877249f3b256c0e5b289d8a8b246c WHIRLPOOL bb61362e811bd912058dcbda2c00ac29b56b856387a5ebc67d6081666b6c35013a5f66653996e908f124a7402c764b0283c79926ecbad29b80dbaf956e99f754
+MISC ChangeLog 3676 SHA256 7347ccdd7ec0b073d65bf697123a74f71834db4a26b20c3c35060d8ef9e5b79c SHA512 7ae70b3940b2c12ab5562fe1da88a4021b0d3dcd56996ba6b1f292c0fcdc87a50848ae69008934ed87f2c5659cdf8aed7127f94fe2f6544cb6f4dca235da7f2d WHIRLPOOL d1da40615bc0c573ca44b6136b5c354e4ed0645fa0999dbda944b8c83525914f3ee6d71275e4807cc790ab2d804fe385cb01d0142ad06d440a4a7f96e0941300
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIpB/sACgkQknrdDGLu8JCujgD/XBW/clVREWEUwq3OCVXFoGIP
-lqg7TsuEf6P8YAiYhdoA/iOf4laBXDowBmn6UgAt188yRoy0aVMSC8LCH+dhRNyb
-=jG4W
+iF4EAREIAAYFAlKcXxkACgkQknrdDGLu8JC6kAD/S+t8udzTxQF5/ZtzUuwvKwQ/
+phoNvRuoQm2OPVD1uTkBAJi3V6So5mSSD3w/qZKZSk37xxNIwBFIDeFy0PCpA1OT
+=Sk6v
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space.patch
new file mode 100644
index 000000000000..79d60a19e9fa
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space.patch
@@ -0,0 +1,54 @@
+Remove trailing white spaces from /proc output.
+
+Signed-off-by: Michael Weber <xmw@gentoo.org>
+--- phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
+@@ -97,7 +97,7 @@
+  static void __init acpi_cpufreq_boost_init(void)
+  {
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+-@@ -982,6 +983,480 @@
++@@ -982,6 +983,485 @@
+  	}
+  }
+  
+@@ -173,6 +173,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -202,6 +203,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -228,6 +230,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -256,6 +259,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -287,6 +291,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.12.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.12.ebuild
new file mode 100644
index 000000000000..1ae9cf9c8496
--- /dev/null
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.12.ebuild,v 1.1 2013/12/02 10:21:10 xmw Exp $
+
+EAPI=5
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="Processor Hardware Control for Intel CPUs"
+HOMEPAGE="http://www.linux-phc.org/
+	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
+#no automatic filenames here, sorry
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=149 -> phc-intel-pack-rev12.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
+ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
+
+MODULE_NAMES="phc-intel(misc:)"
+BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+BUILD_TARGETS="all"
+
+S=${WORKDIR}/${A/.tar.bz2}
+
+pkg_setup() {
+	if kernel_is lt 2 6 27 ; then
+		eerror "Your kernel version is no longer supported by this version of ${PN}."
+		eerror "Please use a previous version of ${PN} or a newer kernel."
+		die
+	fi
+	if kernel_is gt 3 12 ; then
+		eerror "Your kernel version is not yet supported by this version of ${PN}."
+		eerror "Please use a newer version of ${PN} or an older kernel."
+		die
+	fi
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+	epatch "${FILESDIR}"/phc-intel-pack-rev12-trailing-space.patch
+
+	sed -e '/^all:/s:prepare::' \
+		-i Makefile || die
+
+	local my_sub=arch/x86/kernel/cpu
+	if kernel_is gt 2 6 39 ; then
+		my_sub=drivers
+	fi
+	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die
+	if kernel_is lt 3 12 ; then
+		cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
+	fi
+
+	if kernel_is lt 3 0 ; then
+		epatch inc/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/linux-phc-0.3.2.patch
+	else
+		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
+	fi
+
+	mv acpi-cpufreq.c phc-intel.c || die
+}