Added gui patch for 2.6.28 and newer kernels

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

5 files changed, 63 insertions, 33 deletions

diff --git a/sys-power/phctool/ChangeLog b/sys-power/phctool/ChangeLog
index b290976e3e40..2be68278eca9 100644
--- a/sys-power/phctool/ChangeLog
+++ b/sys-power/phctool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/phctool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phctool/ChangeLog,v 1.6 2011/11/02 21:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phctool/ChangeLog,v 1.7 2011/11/10 09:55:40 xmw Exp $
+
+*phctool-0.5.2.2-r2 (10 Nov 2011)
+
+  10 Nov 2011; Michael Weber <xmw@gentoo.org> -phctool-0.5.2.2.ebuild,
+  +phctool-0.5.2.2-r2.ebuild, +files/phctool-0.5.2.2_gui_kernel_2.6.38.patch,
+  files/phctool-0.5.2.2_kernel_2.6.36.patch:
+  Added gui patch for 2.6.28 and newer kernels (thanks to Fabio Veronese for
+  the patch, bug 360009)
 
   02 Nov 2011; Mike Frysinger <vapier@gentoo.org> phctool-0.5.2.2.ebuild,
   phctool-0.5.2.2-r1.ebuild:
diff --git a/sys-power/phctool/Manifest b/sys-power/phctool/Manifest
index 3196676ffa83..cc2ecb3fd3fa 100644
--- a/sys-power/phctool/Manifest
+++ b/sys-power/phctool/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 AUX phctool-0.5.2.2_all_paths_tool_no_sudo.patch 530 RMD160 8474572b7b0392bfff4e2ce16d5a2400ed8e3866 SHA1 b5d68d9e8ec03686f8e34171976dada2ad02a4eb SHA256 9776704c00d5733b94a73c57a9755ba747958fc0551fecc6d5fb79627a93eb77
 AUX phctool-0.5.2.2_all_paths_tool_sudo.patch 543 RMD160 00050722ee5bf3642f5291d05c1d994cdc9dde47 SHA1 36297990d40abbfff73b512f54d687c562d31fbf SHA256 15bf6e039b12414058be70569cd6a6d9519b55e569805bd1ad7c6d2ee3d0b7b5
 AUX phctool-0.5.2.2_all_paths_tray.patch 1031 RMD160 c785823cc3eed3dad3c8b762e2a8b21bed9c4099 SHA1 d4da8505a73733a03286eeeeceac6ef475306ba4 SHA256 abddf36fd0cdd6e9b00392a4dadfb1853528edeb39afdeaba6b00d568e2598ac
-AUX phctool-0.5.2.2_kernel_2.6.36.patch 3598 RMD160 043441f4173046621fe0d5919c9823fc80cb2b39 SHA1 16734e1ab27dc920722772ecdfbf4750b3e8284f SHA256 aefc6e2f236942a9c49e505ca50c0a94cabc117143694de0549524be711aa158
+AUX phctool-0.5.2.2_gui_kernel_2.6.38.patch 879 RMD160 e72477ad1cb0a436e476408f51c15ead702a2e37 SHA1 0c2953f0016a8642b4938305dc38264ec77eb511 SHA256 069ea00f62aab1d1c61652d6d095412f72e9506971998ce103d454d7d91cde57
+AUX phctool-0.5.2.2_kernel_2.6.36.patch 3559 RMD160 ffa53c9127f102c3b1be4fffbffe2dfb607d3290 SHA1 f5815557f3cdb2ea0dbf43f28c5df69905fe609e SHA256 e13c7b2323a5ec0d34f1a0906accc83c1cb271df84b2fbe2029d754dc496c90e
 DIST phctool-0.5.2.2.tar.gz 941587 RMD160 3b4b496428fcb1951f5510ee7b4435f7725dc24a SHA1 8f0f2b6dd8023746a308cc2a7cab8a22a8e1ebab SHA256 ef60b13a74e7a123008a93d02759e99537a58c40091774a7e70e3e1d5960fa4a
 EBUILD phctool-0.5.2.2-r1.ebuild 1984 RMD160 164bde2a50931bee579b00027dad77d52e8905b9 SHA1 5bdfe217ccd87ecb69cc6340098b329d3e0d5dea SHA256 69668ea132ed66b6de06569e231f2904db54f259846acc3f2555759baaf611ca
-EBUILD phctool-0.5.2.2.ebuild 1937 RMD160 e5aa42a6a1b8bf3616e27c499fe63b5c6bead9ee SHA1 e45d98b9922a3937ecd97756f3088d489cf690eb SHA256 92a4b6c470aaeb39c107a38814d086db83aa16612ccb6ef39ad6386224b2bd3f
-MISC ChangeLog 1063 RMD160 2da9beeb224994e01d13c161afdcdfe4aad4d536 SHA1 87cc60f7e6c47caf4b1bebd894602202850fab08 SHA256 e9c7c634a0da7ac0fdec55a8999ab4b1ba93ef36ffdb4d2d469cf82093f74985
+EBUILD phctool-0.5.2.2-r2.ebuild 2005 RMD160 44ba57eb0d76436679e860e9b6e8d3ad41a20288 SHA1 e87c16780f0a8c9fe360277f68a84f921d60be28 SHA256 c5d372c74048a0046dc51adbb2205975b36bc8dfca9afec0f1573622d31c5646
+MISC ChangeLog 1392 RMD160 13b9b7434f5c2077f2fcfec0359729735499a50f SHA1 3ac2a4380fe6a84a9f982e277a95f345cadbccf2 SHA256 b57e3ec81aeff0dd078f521fbcdcffe1d6c2bdc5f09cf8794f634250cccba35d
 MISC metadata.xml 317 RMD160 63e79be3d3f2f58e2257b07db544449c8133a260 SHA1 8ae38e68505814c235d9583a50f12431d2da1ba0 SHA256 37f300b61dd7563987e355dca26298f48584e3b46663e40a1d0f5b65fadace1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6xuV4ACgkQaC/OocHi7JYewgD/bv5V+vz4+uCtW5KNcQe6O6Y1
-rIqF+92LVhvQ3PmFLowA/AoaQYIFJAD5x7ajZ+Ihuk7g75UL6db+OP5YPFj9ONbr
-=bLI8
+iF4EAREIAAYFAk67n6QACgkQknrdDGLu8JBl4AD/UhZExDJ6roibAELLgKQ3w0ao
+5/l8KJFwdhlaJQoIrTYA/iTSU2C27AYCTS2CdFik7qKiI5/cs5YGR7D1S5b0f9Cz
+=xE6e
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch b/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch
new file mode 100644
index 000000000000..db33396e3d17
--- /dev/null
+++ b/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch
@@ -0,0 +1,21 @@
+--- phctool/inc/libs/cpuinfo.py
++++ phctool/inc/libs/cpuinfo.py
+@@ -1,6 +1,7 @@ 
+ #cpuinfo.py
+ #This is a function library to get 
+ #informations about CPUs and its PHC data
++#Modified by Fabio Veronese fveronese85*at*gmail.com 22 Mar 2011
+ 
+ 
+ import os, string
+@@ -30,6 +31,10 @@ 
+ 						if os.path.exists('/proc/acpi/processor/CPU'+cpunr):
+ 							##remember ACPI Pathname
+ 							self.data[cpunr]['acpi']['acpiname']='/proc/acpi/processor/CPU'+cpunr
++						elif os.path.exists('/sys/devices/system/cpu/cpu'+cpunr+'/thermal_throttle'):
++							##here some throttling infos for 2.6.38 and maybe laters
++							#self.data[cpunr]['acpi']['acpiname']='/sys/devices/system/cpu/cpu'+cpunr+'/thermal_throttle'
++							self.data[cpunr]['acpi']['acpiname']=''
+ 						else:
+ 							self.data[cpunr]['acpi']['exist']=False
+ 		# For some reason we have to fallback on the old function...
diff --git a/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch b/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch
index b8ce5baeddc3..beb9efa7e5c5 100644
--- a/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch
+++ b/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch
@@ -1,5 +1,5 @@
---- ./phctool/inc/libs/cpuinfo.py	2007-10-17 18:08:27.000000000 +0200
-+++ attachment.cgi?id=260511	2011-02-06 18:40:56.746419981 +0100
+--- phctool-0.5.2-2/phctool/inc/libs/cpuinfo.py
++++ phctool-0.5.2-2/phctool/inc/libs/cpuinfo.py
 @@ -14,33 +14,49 @@
  
  
diff --git a/sys-power/phctool/phctool-0.5.2.2.ebuild b/sys-power/phctool/phctool-0.5.2.2-r2.ebuild
index 77e8b8103c3c..88eaefdd4ed2 100644
--- a/sys-power/phctool/phctool-0.5.2.2.ebuild
+++ b/sys-power/phctool/phctool-0.5.2.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phctool/phctool-0.5.2.2.ebuild,v 1.2 2011/11/02 21:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phctool/phctool-0.5.2.2-r2.ebuild,v 1.1 2011/11/10 09:55:40 xmw Exp $
 
-EAPI=2
+EAPI=4
 
 PYTHON_DEPEND="2"
 inherit eutils python
@@ -28,35 +28,42 @@ pkg_setup() {
 		MY_GROUPNAME="phcusers"
 		enewgroup ${MY_GROUPNAME}
 	fi
+	python_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PF}_all_paths_tray.patch"
-	if use sudo; then
-		epatch "${FILESDIR}/${PF}_all_paths_tool_sudo.patch"
+	epatch "${FILESDIR}"/${P}_all_paths_tray.patch
+	if use sudo ; then
+		epatch "${FILESDIR}"/${P}_all_paths_tool_sudo.patch
 	else
-		epatch "${FILESDIR}/${PF}_all_paths_tool_no_sudo.patch"
+		epatch "${FILESDIR}"/${P}_all_paths_tool_no_sudo.patch
 	fi
-	find . -name "*.pyc" -exec rm {} +
+	epatch "${FILESDIR}"/${P}_kernel_2.6.36.patch
+	epatch "${FILESDIR}"/${P}_gui_kernel_2.6.38.patch
+	find . -name "*.pyc" -delete || die
 }
 
 src_install() {
-	newbin phctool.sh phctool || die
-	newbin phctray.sh phctray || die
+	newbin phctool.sh phctool
+	newbin phctray.sh phctray
 
 	exeinto ${MY_PROGDIR}
-	doexe phc{tool,tray}.py subphctool.sh || die
+	doexe phc{tool,tray}.py subphctool.sh
 	insinto ${MY_PROGDIR}
-	doins -r inc || die
+	doins -r inc
 
 	if use sudo ; then
-		fowners -R :${MY_GROUPNAME} "${MY_PROGDIR}" || die
-		fperms g+rX "${MY_PROGDIR}" || die
+		fowners -R ":${MY_GROUPNAME}" "${MY_PROGDIR}"
+		fperms g+rX "${MY_PROGDIR}"
+		dodir /etc/sudoers.d
+		echo "#%${MY_GROUPNAME} ALL=(root) NOPASSWD:${MY_PROGDIR}/subphctool.sh" \
+			> "${ED}"/etc/sudoers.d/${PN} || die
+		fperms a-w,o-r /etc/sudoers.d/${PN}
 	fi
 
-	dodoc CHANGELOG || die
+	dodoc CHANGELOG
 	if use doc; then
-		dohtml -r doc/docfiles doc/index.htm || die
+		dohtml -r doc/docfiles doc/index.htm
 	fi
 }
 
@@ -64,15 +71,8 @@ pkg_postinst() {
 	if use sudo; then
 		einfo "You have to add a line to /etc/sudoers to get access to"
 		einfo "/sys/devices/system/cpu/cpu1/cpufreq/phc_controls from the phctool/phctray"
-		einfo "Please check following line and add it to /etc/sudoser using visudo:"
-		einfo "  %${MY_GROUPNAME} ALL=(root) NOPASSWD:${MY_PROGDIR}/subphctool.sh"
+		einfo "Please check and uncomment the content of /etc/sudoers.d/${PN}"
 	else
 		einfo "Group not automatically added. Please run phctool as root."
 	fi
-
-	python_mod_optimize ${MY_PROGDIR}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PROGDIR}
 }