sys-power/phc-intel: Re-added version 0.3.2.10 for kernels before 2.6.33, support was dropped. Kernels from 2.6.33 need version 0.3.2.11 (linux -> generated/utsrelease.h). Added corresponding warnings and alternative download locations.

svn path=/sunrise/; revision=10626

4 files changed, 58 insertions, 3 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index 8f546edf7..77983cd64 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 May 2010; Michael Weber (xmw) <gentoo@xmw.de>
+  +phc-intel-0.3.2.10.ebuild, phc-intel-0.3.2.11.ebuild:
+  Re-added version 0.3.2.10 for kernels before 2.6.33, support was dropped.
+  Kernels from 2.6.33 need version 0.3.2.11 (linux -> generated/utsrelease.h).
+  Added corresponding warnings and alternative download locations.
+
   19 May 2010; Michael Weber (xmw) <gentoo@xmw.de>
   -phc-intel-0.3.2.10.ebuild, +phc-intel-0.3.2.11.ebuild:
   Version bump. Kernel 2.6.33 and above (utsrelease.h) support now in
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index a2d872c1b..412799601 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -1,4 +1,6 @@
+DIST phc-intel-0.3.2.10.tar.bz2 20680 RMD160 c9af322d7234c83aef348eb1b01cccf1f5cb1b18 SHA1 3e8b3e2f5732ace6e76146bd820448fd17369c31 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5
 DIST phc-intel-0.3.2.11.tar.bz2 13308 RMD160 0bf78b3995ec08a647408688d25324e9cf1e17dd SHA1 cfd4be379e79b563b033af3c07e0883b60f03fb0 SHA256 579698722808452ebc1004cca4cf96ebe19ef109009000252a6753a059630787
-EBUILD phc-intel-0.3.2.11.ebuild 778 RMD160 2683fc94680eb2d1ea5c0af450f256abf940ea60 SHA1 a5505322165935eab0afcdae1f9cbf0471b0fa07 SHA256 25e4bd9d5defebdc616a300bcc02aa3ba9f308026c63a3a6a85f3dd18dc6287a
-MISC ChangeLog 703 RMD160 dfdb9456062cfb86e08cf0bbcb392f785b063e4a SHA1 ef14684ef8ee710aeb2e2f4bf8c5f45c8baacbc7 SHA256 202a04af16afe64e19702023b672c5f720a4368eeb53c6d02ead34a13e77f0f6
+EBUILD phc-intel-0.3.2.10.ebuild 943 RMD160 09f3619f7cbffd84eb6acdeceec9afc7f5763bab SHA1 042aff0017983045f82c77121a177ed47c8e5587 SHA256 91beabdba09f8ec3831c4714724527b7291b628065563eb4c092ac8287cfe341
+EBUILD phc-intel-0.3.2.11.ebuild 1026 RMD160 1b59ccfe63fcd3e184a9b63f01410196d050d739 SHA1 4bba288bfb7aa078bf09edbc987739db606a23e6 SHA256 f9a1ff039d80920b7e7d4f98fe6ae630afc439a1ff14d8ca4eea3261f293e472
+MISC ChangeLog 1034 RMD160 00863d3985a6275c3b68119f470678204fadd52d SHA1 cfd7505d9e8a68f84f4bae9f09621b1abcb5ac28 SHA256 e50679a7024126c6ed5c043aeb5d9c16b49d27cb5b328770529f382536e4da63
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild
new file mode 100644
index 000000000..4d2c5b507
--- /dev/null
+++ b/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Processor Hardware Control for Intel CPUs"
+HOMEPAGE="http://www.linux-phc.org/"
+SRC_URI="http://xmw.de/mirror/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P%.*}-${P##*.}"
+
+CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
+ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module or Not set to enable the replacement of acpi-cpufreq with phc-intel."
+
+MODULE_NAMES="phc-intel(misc:)"
+BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\""
+BUILD_TARGETS="prepare all"
+
+pkg_setup() {
+	if kernel_is gt 2 6 32 ; then
+		eerror "Your kernel version is not supported by this version of ${PN}."
+		eerror "Please use a newer version for kernels 2.6.33 and above."
+		die
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README || die
+}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.11.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.11.ebuild
index 6401e38de..c453b64fc 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.11.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.11.ebuild
@@ -8,7 +8,8 @@ inherit linux-info linux-mod
 
 DESCRIPTION="Processor Hardware Control for Intel CPUs"
 HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=92 -> ${P}.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=92 -> ${P}.tar.bz2
+	http://xmw.de/mirror/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,6 +25,14 @@ MODULE_NAMES="phc-intel(misc:)"
 BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
 BUILD_TARGETS="prepare all"
 
+pkg_setup() {
+	if kernel_is lt 2 6 33 ; 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
+}
+
 src_install() {
 	linux-mod_src_install
 	dodoc README || die