Version bump. Add linux 3 warning (bug 376441).

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 83 insertions, 18 deletions

diff --git a/sys-power/phc-k8/ChangeLog b/sys-power/phc-k8/ChangeLog
index 878125c1cef2..868fa2810dc5 100644
--- a/sys-power/phc-k8/ChangeLog
+++ b/sys-power/phc-k8/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/phc-k8
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/ChangeLog,v 1.3 2010/12/04 19:34:35 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/ChangeLog,v 1.4 2011/11/18 08:45:18 xmw Exp $
+
+*phc-k8-0.4.4 (18 Nov 2011)
+
+  18 Nov 2011; Michael Weber <xmw@gentoo.org> phc-k8-0.4.3.ebuild,
+  +phc-k8-0.4.4.ebuild:
+  Version bump. Add linux 3 warning (bug 376441).
 
 *phc-k8-0.4.3 (04 Dec 2010)
 
diff --git a/sys-power/phc-k8/Manifest b/sys-power/phc-k8/Manifest
index 1ca0414ecc43..05bea9533ec6 100644
--- a/sys-power/phc-k8/Manifest
+++ b/sys-power/phc-k8/Manifest
@@ -3,16 +3,16 @@ Hash: SHA256
 
 DIST phc-k8-0.4.2.tar.gz 20532 RMD160 2774cd409afa14b7c2ced479f31d48c8edeebcef SHA1 3f526f90d0f0a2defa24802787546117fdc3e1e8 SHA256 7881a82c2082ff70e65862cd0b23492d213be52a475f2e35ecbbbf337036a296
 DIST phc-k8-0.4.3.tar.gz 23324 RMD160 0f348b5cb66f421e501637b90c6389aa44c8f41b SHA1 420195733062f7b5b354b1e8559a5414932c5238 SHA256 b72b02f77afb0cc32f04c2abbc88e1a23241eb1e3a2e9ed3159045f18087d859
+DIST phc-k8-0.4.4.tar.gz 24535 RMD160 7510e06afedfdc0b5f47f8f545710647997699b2 SHA1 c4a553b65e01ed5df8a1811f32174b20126d784e SHA256 19744a7ae94f19c1327e3e5542522f9ab5f978e4466f1973b7518e1a83e91edd
 EBUILD phc-k8-0.4.2.ebuild 1002 RMD160 85e2f8cee95fc4efddcd24e572ba5f1b3c703399 SHA1 b7595132b1d44a3013f60f7feec3cea66b70c486 SHA256 12588929a0aff2b5354dde3da5f67f7e636ac75ebcbbfb112a96febc1c7d3b18
-EBUILD phc-k8-0.4.3.ebuild 908 RMD160 c7f9735e88c84bd3d1116e44125103df8c6f9d10 SHA1 fbdd4519df53b5f3a488e5084a5747032762a587 SHA256 752c70d9373e059fa9960d6d1a4e5528114391fd85af1efbbcce91ab377f0ccd
-MISC ChangeLog 550 RMD160 3a43dfadb8e1ca06b31374ae80584137aafb3400 SHA1 530bc5b6c16e9ca758aa45244de20a0fe2b4659f SHA256 d02b76b3cf96003880774db2d3d92c1f1d99e939950f615706b54d8637907312
+EBUILD phc-k8-0.4.3.ebuild 1155 RMD160 c159d792521076026e46f3aa4c160822e1e32889 SHA1 3a7639550f728f201a428bee9f00d86808b41bcd SHA256 aaad039bd2b6d2f9501a767a866d4ecf02b721ba2a27bd77caa5770a555aaa0e
+EBUILD phc-k8-0.4.4.ebuild 1198 RMD160 7cd5a47f778a5186bef820736374062171c79b2f SHA1 dee84b7cf630fdf2a48050b4ed79f462f8404e05 SHA256 8c4e6e9ba21e360e9ed8db8cb52d909705d1798f9e3a7c43af46545b2a42091e
+MISC ChangeLog 721 RMD160 fb363428ddaee8862d53cd42ae16c068954d9187 SHA1 93524b47bd046349787cbb2952905ae495362a64 SHA256 f30f574b6c6d8baa77bdcff069372470e9f2799c0fecb8e7fb870399b48be4e5
 MISC metadata.xml 223 RMD160 ece0d9320b4ad1fdb29d1dec4f85e84ffda0d863 SHA1 325a16f4c96d533e8642c26ab395b06ab42f51b5 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tNAACgkQfXuS5UK5QB0CHAP+JhUK2eLLweXbeU7AVi+FDlAK
-RNJ/V719fQ4ibaJz6RPgseRlYpWVVqYmoVq19nNIY+GBhsUsnYozIJ3bRuy9RhCw
-LtR/8niOZGbDNR06k/CzXCumS5+cagGrgzgmPET0RLzAf9vuFS9dFlUFqjDEWORl
-ZU06AWZSTwJEzdt1gG0=
-=a7Ux
+iF4EAREIAAYFAk7GGyQACgkQknrdDGLu8JCelgD7BH0osHm4PbZ5f+bxMaqa/HrR
+IGa7PNwnzacjUdNURgAA/1hphrTvlasFvC8YIXtL7oUY7IBRFu27HgAok+38P4Kj
+=5e7B
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phc-k8/phc-k8-0.4.3.ebuild b/sys-power/phc-k8/phc-k8-0.4.3.ebuild
index 5c1eff8647ae..d505be41d104 100644
--- a/sys-power/phc-k8/phc-k8-0.4.3.ebuild
+++ b/sys-power/phc-k8/phc-k8-0.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/phc-k8-0.4.3.ebuild,v 1.1 2010/12/04 19:34:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/phc-k8-0.4.3.ebuild,v 1.2 2011/11/18 08:45:18 xmw Exp $
 
-EAPI=2
+EAPI=4
 
 inherit linux-info linux-mod
 
@@ -17,14 +17,25 @@ IUSE=""
 
 S=${WORKDIR}/${PN}_v${PV}
 
-CONFIG_CHECK="~!X86_POWERNOW_K8"
-ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
+pkg_pretend() {
+	if kernel_is gt 3 0 0 ; then
+		eerror "This version is not compartible with linux 3.x (bug 376441)"
+		eerror "Please use >=sys-power/phc-k8-0.4.4 !"
+		einfo ; einfo ; einfo
+		die "wrong kernel version"
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~!X86_POWERNOW_K8"
+	ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
 a) include needed symbol cpufreq_get_measured_perf and
 b) enable the replacemant of powernow-k8 with phc-k8."
 
-MODULE_NAMES="phc-k8(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
+	MODULE_NAMES="phc-k8(misc:)"
+	BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+	BUILD_TARGETS="all"
+}
 
 src_install() {
 	linux-mod_src_install
diff --git a/sys-power/phc-k8/phc-k8-0.4.4.ebuild b/sys-power/phc-k8/phc-k8-0.4.4.ebuild
new file mode 100644
index 000000000000..afe86a668280
--- /dev/null
+++ b/sys-power/phc-k8/phc-k8-0.4.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/phc-k8-0.4.4.ebuild,v 1.1 2011/11/18 08:45:18 xmw Exp $
+
+EAPI=4
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Processor Hardware Control for AMD K8 CPUs"
+HOMEPAGE="http://www.linux-phc.org/"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=124 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}_v${PV}
+
+pkg_setup() {
+	CONFIG_CHECK="~!X86_POWERNOW_K8"
+	ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
+a) include needed symbol cpufreq_get_measured_perf and
+b) enable the replacemant of powernow-k8 with phc-k8."
+
+	MODULE_NAMES="phc-k8(misc:)"
+	BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+	BUILD_TARGETS="all"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -e '/error Only support for 2.6 series kernels/d' \
+		-i Makefile || die
+
+	if kernel_is gt 2 6 32 ; then
+		#use mperf.{c,h,ko) from kerel
+		sed -e '/^MODULES/s:mperf.ko::' \
+			-e '/^obj-m/s:mperf.o::' \
+			-i Makefile || die
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc Changelog README
+}