Revbump for kernel 3.16 support.

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

4 files changed, 177 insertions, 6 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index a01d0b959055..0e9374fcd527 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/phc-intel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.17 2014/07/22 00:13:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.18 2014/08/04 10:21:26 xmw Exp $
+
+*phc-intel-0.3.2.12.15.1-r1 (04 Aug 2014)
+
+  04 Aug 2014; Michael Weber <xmw@gentoo.org>
+  +files/phc-intel-0.3.2-rev15-3.16.patch, +phc-intel-0.3.2.12.15.1-r1.ebuild:
+  Revbump for kernel 3.16 support.
 
 *phc-intel-0.3.2.12.14-r1 (22 Jul 2014)
 *phc-intel-0.3.2.12.15.1 (22 Jul 2014)
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index cd9fba19a054..a293266dff67 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -5,6 +5,7 @@ AUX phc-intel-0.3.2-rev12-trailing-space-3.5.patch 1536 SHA256 a84bab62cb7e44a09
 AUX phc-intel-0.3.2-rev12-trailing-space-misc.patch 33960 SHA256 77191cb8fa415a8f9349de9f2ff0b8f072e8c16ae326c354c214e0be3a1cde8c SHA512 13f0b0da6eafefacfd617edaf5ff3d05dc0b5de3884ddd05459fcbc6ebde7f3c3671f8ce0be426bcc304460447a900e3948e6acc838c515f43f033cf6ffc08d0 WHIRLPOOL 0f46385ccdfe0a06cedf01f3d21e3e042412d757bbf89ae40780bc49252cbcd6839d6523a999231ff7eb4ec8138fed97f4c221e30698d8ed40f6056f98c4d7a7
 AUX phc-intel-0.3.2-rev14-trailing-space-3.13.patch 1557 SHA256 f1449476c332e3c23b0bf4f12be8b9e324ad875eaa4eb4d65b43d746c0650006 SHA512 92a37dca6d703015db43f730d728bc39eaa43378b41a1cef8e2a3adb332c949bec78889099c8af24c4da835fd426b766291dd5d84d8567192853f5839c401036 WHIRLPOOL 0e72b5a4b8f5eb2f20505c2075a9311272178c87e564a85acbb76300a90b19a39d4dea9a9496b246dc507ec08fc557fea2c99a0f1ea7c3c0b2362011812c533a
 AUX phc-intel-0.3.2-rev14-trailing-space-3.14.patch 1557 SHA256 3f35feb053376fb2c223eb7087ccaadfdd92bd328bde0c62aed7719898337b0c SHA512 444864f1c13d0039861e9baafb8d4e8a2c304fadd9af6f18c499f29d371557ddbb9f7194dc952029c818fce81022d0a0c31faec698c213ba4cc69739b62827e0 WHIRLPOOL c79dffab3375c098223718121f87bf8b5a5d2fed2945219bc2082b4aeb344652a552b956dd3c9371fbd39a40a95611d9a9e0386b2e294f8dfe2b2192f90b8abf
+AUX phc-intel-0.3.2-rev15-3.16.patch 2678 SHA256 0f38998b9bd85466a621052225f2d7daf3e6ae0fdfbbf9f75c9d92f96a084f37 SHA512 84bc1925041c47b34aa0d2d786f75541f091204597cc4a4075bc7ca7d97103a43318cc33e5bfa76f5acf6acd50451e4b447fb3473e327ee7e2b6b40d426530d7 WHIRLPOOL f85e0b785ca95b90a358fbc026fe54f8ff200b0624a2f732bdb249f57a4035865572aa9fcde992a1b720850c86d9f7af152d6fb0c84d7b2d9e43e4895be17693
 AUX phc-intel-0.3.2-rev15-trailing-space-3.15.patch 1561 SHA256 a46c52cc8f3ca07a620382c9fc15b25411c55afcfc96f04c91475f2f01448f9e SHA512 1d9c34a5ff3a7853de5d3fc893e21c7ecc4351b29eae4d5e81eccc596f1492556110bb25f68654b32e4af912cf6aa5ca64d988d838ee63f16d3729a8b3782746 WHIRLPOOL b7b0e4cb623627cff6c1732e215f5e530f269c498cf4908eb4ca83538785497363a7bd2372f78fd80c6191edcd0241d4bca2f744debf3687a342b4193622ec3c
 AUX phc-intel-0.3.2-rev15-trailing-space-3.5.patch 1456 SHA256 5cdd09065aeb907833cbfa0dc0e141bc5c77f4f6fa463d698e7c49da31164d4a SHA512 d8da3d7d53ec13cdd3b21e3ebb4aeec3502f2e75571eeaea39a59b4825b3be6043b275fb89bbdae4778e415c22cc80639af04674fd3975f498a6adc926b39ce8 WHIRLPOOL 1c63ba4c805c4dc429859232b0d6488f1502f286f085fb8ae03287123992e8d7805a14f17ebd79a687a9c8f5978e5f57e4f3be2b6a2e7394fb54ffa5346bd7c4
 DIST phc-intel-0.3.2.10.tar.bz2 20680 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5 SHA512 4b6ab643ca313114bd722a9a50d303b16fbf6840be76040481cc309a264c333ce321c8b5c9b9cc203955ea56da401d517c1ff85af1fe99a0ebbad2a0e2f94b06 WHIRLPOOL 2f957448f7ba424491c9bd264124ca248e2501be1327e3cb3de3c8e57d1b201016f75a89d721d02b02dd916906c86a76eb05ae67393d31df12c14b98cde91e6d
@@ -12,15 +13,16 @@ DIST phc-intel-pack-rev14.tar.bz2 84789 SHA256 c41d901198901c5937052c8e603a9e6d2
 DIST phc-intel-pack-rev15.1.tar.bz2 97762 SHA256 5154295f2cfc0e263510d71041a2d1d9a0d2e7a0c67730c9f80ba1011bbde8a4 SHA512 e0163f315343bb34dde57cb806d99b6ea6586b54827142a49532d862cbe02689d581e221ebd6466d1992107e4d98456989402ba4172e85b9e9f24405f27d28f1 WHIRLPOOL 5c02326541d0773cff668919d0d4809f3b79fd3bff6149c62d136760d440e5338b2a9e00a236f25bcb6dead4a65f74e4f1d3763a38bb996ddef315664758b621
 EBUILD phc-intel-0.3.2.10.ebuild 1079 SHA256 19ed93eab1feeb9cd3aa214ba76ff5834cff06cb821676842574e6075f8a92c4 SHA512 038fa33588b9c2c57184f6978b36315841697d2b8fc91d4307336408623813d04bbef9fe17a940ef627b84bbcfb008111b823a11243af83b90c6928756b98551 WHIRLPOOL 670fd1c97f6dab85e7814b36c4b1d4b0f90ac6db0bba01d943f2d9d7b680f8e38aef84e5b6aa9d037f71d29b7cac955fd2d953815e7fdda4fe7ce96fd4488166
 EBUILD phc-intel-0.3.2.12.14-r1.ebuild 2124 SHA256 5578fc8b4877dd0ad4713a924c7c9f2033edf5b963abb09fd17c510da06f7677 SHA512 c1f795d07a2bde8d52b7f4bef758c353a9a3d9ad489e363e36105cf471123d44bc294717612934badcf473b131c199bde9957c05d31026d11948728cfcf1f566 WHIRLPOOL 9b7c901fa066663ebb9039bf62e42aceeb39e4ee86c74eee150d57cdcfa6f97f57a812a9143818480df92488b18d241a99c3840968da4ffc1936aa2aabf93d5c
+EBUILD phc-intel-0.3.2.12.15.1-r1.ebuild 2283 SHA256 32f7d3cea5a3353a93fe987a4f20349fdf64a967f019b9407cbd0632a03b54e4 SHA512 fafe1f6272233a38835c742f848eb0662106bdc8de57f63f30a88f5df01347ade3691608426fd82c4f7d12cb3f1b901a3828652f2d74cfff9774cd9178f6dfb9 WHIRLPOOL f9d6557a1572de8e5d6976c9c27240aaa3204ca01daeccbc8556f9c2960b7edbd8e462fc0c209d7f0e5d8c5f4bef39eba7096d9818dc8302fc55f2abae4ce64f
 EBUILD phc-intel-0.3.2.12.15.1.ebuild 2191 SHA256 db2405ea1e6393e070e505385114e9e90e3cac75a141546924f37d01cbdbf00a SHA512 1d7b10ecbbdd617ab6e4466cfe4af95838ae8d31639529768c529b981396b1a1b09e571e177d0e4907f27202e69ae8be1207f64a3657a23f1bef9d5beb45da45 WHIRLPOOL 7e0888269f05b05697352d7bbdf8c3f0c4a1da4d058d7ce18e997d02818ebb1ff55f1a4f777be347b71500ec20044bd3a965b2299ab22c31f58b0d5563468adc
-MISC ChangeLog 5334 SHA256 a0fc0d2b9b995e76a8d7ee3dd9f4b056de09b00c6ec97efc2e581eeb682f6d31 SHA512 a936ad41f26b704f0e74ca07afe87b14678748e2b6cfb8df306692af3b9f667c01cf6dd4c86a8de9717d49d7c685ddd810b448cae3fc8161f53b851a4b5105dc WHIRLPOOL e6f729f10da6d741c4f8868e14e668095e9446e368fbf8e752c1e6e715188cc5a5a99eef086848d780a1cc5cc1d59d43f8388001e21c9da0fa054650bbc45b8a
+MISC ChangeLog 5538 SHA256 9b906aa1643173fbee03bdd6375c84ef93fddf60faa26ef246c30b94e0c43019 SHA512 2042c3fe0637335796eed793f0398888ba9d19f297180c603c48de8f4a8bece8cba64b517f9e083428c6442eb6530d5eba2b4ea96f479a3495229eb2da1c0c4d WHIRLPOOL 06aa08b6f3fec90119e1f0c6682c8f33050ee761c1b03829e43d3b6ef2943b97b2b54e68b2aea28e6e00f921534b96cf29df80222c48f39cdc5a21024a4c1ecb
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlPNrJZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlPfXqpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDtIwD/cBFExcd0U3EjZ1b6egQz6I25
-UiWiitcli6EVPNis3xMA/0GmYAx+A55vB87qImGpzP34HGrdCgCWE//KvxXSWWNM
-=sIq8
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCGHAD9Et8k826hWuyCYC/hILdpQ26H
+a1GY9SgrvBMNhI9nJ4gA/37Y9TQL/xKFjJUxPZ4N6u5K+hP7ILF32aYaGI1BKp6d
+=SrTL
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-3.16.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-3.16.patch
new file mode 100644
index 000000000000..8bf952d7f3f4
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-3.16.patch
@@ -0,0 +1,90 @@
+Upstream changes
+
+--- phc-intel-pack-rev15.1/inc/3.16/acpi-cpufreq.c
++++ phc-intel-pack-rev15.1/inc/3.16/acpi-cpufreq.c
+@@ -213,7 +213,7 @@
+ 
+ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
+ {
+-	int i;
++	struct cpufreq_frequency_table *pos;
+ 	struct acpi_processor_performance *perf;
+ 
+ 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+@@ -223,10 +223,9 @@
+ 
+ 	perf = data->acpi_data;
+ 
+-	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+-		if (msr == perf->states[data->freq_table[i].driver_data].status)
+-			return data->freq_table[i].frequency;
+-	}
++	cpufreq_for_each_entry(pos, data->freq_table)
++		if (msr == perf->states[pos->driver_data].status)
++			return pos->frequency;
+ 	return data->freq_table[0].frequency;
+ }
+ 
+Use of cpufreq_for_each_entry macro
+
+--- phc-intel-pack-rev15.1/inc/3.16/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev15.1/inc/3.16/linux-phc-0.3.2.patch
+@@ -31,39 +31,37 @@
+  
+  static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
+ @@ -216,16 +225,25 @@
+- 	int i;
++ 	struct cpufreq_frequency_table *pos;
+  	struct acpi_processor_performance *perf;
+  
+ -	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+ +	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
+  		msr &= AMD_MSR_RANGE;
+ -	else
+--		msr &= INTEL_MSR_RANGE;
+--
+--	perf = data->acpi_data;
+ +		perf = data->acpi_data;
+- 
+--	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+--		if (msr == perf->states[data->freq_table[i].driver_data].status)
+--			return data->freq_table[i].frequency;
+-+		for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+-+			if (msr == perf->states[data->freq_table[i].driver_data].status)
+-+				return data->freq_table[i].frequency;
+++
+++		cpufreq_for_each_entry(pos, data->freq_table)
+++			if (msr == perf->states[pos->driver_data].status)
+++				return pos->frequency;
+-+		}
+-+	}
+-+	else {
+-+		msr &= INTEL_MSR_RANGE;
+++
+++	} else {
+ +		u32 fid;
++ 		msr &= INTEL_MSR_RANGE;
+ +		fid = msr & INTEL_MSR_FID_MASK;
+ +		perf = data->acpi_data;
+-+
+-+		for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+-+			if (fid == (perf->states[data->freq_table[i].driver_data].status & INTEL_MSR_FID_MASK))
+-+				return data->freq_table[i].frequency;
+-+		}
+- 	}
++ 
++-	perf = data->acpi_data;
+++		cpufreq_for_each_entry(pos, data->freq_table)
+++			if (fid == (perf->states[pos->driver_data].status & INTEL_MSR_FID_MASK))
+++				return pos->frequency;
+++	}
++ 
++-	cpufreq_for_each_entry(pos, data->freq_table)
++-		if (msr == perf->states[pos->driver_data].status)
++-			return pos->frequency;
+  	return data->freq_table[0].frequency;
+  }
++ 
+ @@ -406,6 +424,99 @@
+  	return 0;
+  }
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.15.1-r1.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.15.1-r1.ebuild
new file mode 100644
index 000000000000..82d067d6118a
--- /dev/null
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.15.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 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.15.1-r1.ebuild,v 1.1 2014/08/04 10:21:26 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=161 -> phc-intel-pack-rev15.1.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 16 ; 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-0.3.2-rev12-trailing-space-misc.patch \
+		"${FILESDIR}"/phc-intel-0.3.2-rev15-trailing-space-3.5.patch \
+		"${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.13.patch \
+		"${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.14.patch \
+		"${FILESDIR}"/phc-intel-0.3.2-rev15-trailing-space-3.15.patch
+
+	cp -rv inc/3.15 inc/3.16 || die
+	epatch "${FILESDIR}"/phc-intel-0.3.2-rev15-3.16.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
+}