replace patch w/ epatch, fix patchsets (bug 403185)

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

6 files changed, 24 insertions, 20 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index b3c8037f1dbc..7e14960f4294 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.7 2011/06/11 13:51:30 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.8 2012/02/13 19:57:35 xmw Exp $
+
+  13 Feb 2012; Michael Weber <xmw@gentoo.org> phc-intel-0.3.2.12.1-r3.ebuild,
+  files/phc-intel-0.3.2.12.1-2.6.35.patch,
+  files/phc-intel-0.3.2.12.1-2.6.36.patch,
+  files/phc-intel-0.3.2.12.1-2.6.37.patch:
+  replace patch w/ epatch, fix patchsets (bug 403185)
 
 *phc-intel-0.3.2.12.1-r3 (11 Jun 2011)
 
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index f28f2b379033..b41c9a6a9c06 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX phc-intel-0.3.2.12.1-2.6.35.patch 16089 RMD160 55922770688369b9c7eabb11727efa0832a28954 SHA1 8e645cd5e81ca630b478dc3c71980bb67a6bda25 SHA256 dee0ce62588bf74fe80d12743674064a2d2f2edff39ac7751511817f0e7d41e3
-AUX phc-intel-0.3.2.12.1-2.6.36.patch 15957 RMD160 5ec9633d3447df20b4b1838ebc83d558b0a5d18d SHA1 86ff3e3afff68f76e2c96948fb54bda86dd09404 SHA256 93ca6bb4c63ed5ac88f33b94d543091ce3b17a425967682d9431ea3b85bff632
-AUX phc-intel-0.3.2.12.1-2.6.37.patch 15933 RMD160 3a5c29b6b55c9760805768f55bc2973bdf9cce32 SHA1 cb524db3db8a7da0d24096a53d00bf042b3b1f7a SHA256 627d4486f56f14e426cfc26dc8299188a5f672f99025e5dc5314cc026ca71102
+AUX phc-intel-0.3.2.12.1-2.6.35.patch 16066 RMD160 9258ab48af55b30e69ac484331b3e1799a04ec06 SHA1 f768fa0ab033ad715f0a2830e9b0a5eecf6b79fa SHA256 02bfdb717629025e505c4575afe89c465ef47755223a5577842d6db3fef8e427
+AUX phc-intel-0.3.2.12.1-2.6.36.patch 15934 RMD160 4a67d9be09f8471525aa4c619fb4b215337dfdd5 SHA1 85f7230f714e8f21b61a5ca96367fcfe340bf070 SHA256 9310783980d12ababb1a5aaddd7ad2cf0c1f2f5a749a89cc32b33cfef9e49c28
+AUX phc-intel-0.3.2.12.1-2.6.37.patch 15919 RMD160 641e5bb542123c54a08297344f265692e5554eb0 SHA1 72147d7586470b9ad15655b06c5d16f3787fe1fa SHA256 3a58b6e56707a0b136507607818b8b58e106b1e5872c0b5b833fbddcb7c1d873
 DIST phc-intel-0.3.199.3_pre.tar.bz2 15508 RMD160 0348c0776f11beda14befbdfaf2f246516e68558 SHA1 b51c7d6123c1a45dcf7cd54273ce642ef8f7895a SHA256 4441af7a0a1335a920b0d18a46483a64fbae8e57d98a6bdbf31dbacac2bbdf82
 DIST phc-intel-0.3.2.10.tar.bz2 20680 RMD160 c9af322d7234c83aef348eb1b01cccf1f5cb1b18 SHA1 3e8b3e2f5732ace6e76146bd820448fd17369c31 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5
 DIST phc-intel-0.3.2.12.1.tar.bz2 14412 RMD160 d8a8ca003f0af2d1f8e7a59ab8739a51afceafd3 SHA1 d5c991376f7ce7f3b7afa6fc7618b4ba602bf457 SHA256 4f66989d424d328b205873da1b0363e75f27d7912e0e93c1cad3407c17be8264
 EBUILD phc-intel-0.3.199.3_pre.ebuild 1201 RMD160 bcace92a9dac5f7fcb9a18a3d9d2a196cc3c00da SHA1 787d5420553c6c6c979a9e0b8eb39a229679150a SHA256 cf022fadc97cd3b56ed3888b9f645d8943447a741627b2d80e19cb315147a1c0
 EBUILD phc-intel-0.3.2.10.ebuild 1079 RMD160 aff8b2924d4878da10ec374d9c8c179a3c1d6d23 SHA1 5c445495287110484664ce0312d539e8f170ec21 SHA256 19ed93eab1feeb9cd3aa214ba76ff5834cff06cb821676842574e6075f8a92c4
-EBUILD phc-intel-0.3.2.12.1-r3.ebuild 1708 RMD160 b5e50f1941676fd4c3baf01bf53c439f7a052b0b SHA1 8906fed0cd9adabd48ab7afcb5282dbde3d7be3f SHA256 e980501927540d21c9362f0c5795a60b4fa5b9b7011fb7631b97d9616ef3bd99
-MISC ChangeLog 1519 RMD160 d88af6f1a94a37306628a16171e3ffe7081da485 SHA1 e2e6aa548feb806e49eba5a1c4119013214234aa SHA256 43c614a5c8e8b82a2376cb73083ea24cd992c8f64f144ce2e79a5d7ca73fa3d7
+EBUILD phc-intel-0.3.2.12.1-r3.ebuild 1686 RMD160 3feb49f2aa7852fc39ceda9709b2f9c987b5f4c4 SHA1 066ed8e36f9757d03ad914cb22bb0129c07fecdd SHA256 81e157719d971b24c0f7410ebf500b06cec11a392ec257a62a860867a3d4cfd7
+MISC ChangeLog 1781 RMD160 b520b375b2dae9d5e2490c732f3df8d6e1823fe6 SHA1 4401e25ebb14c6414665dc3690ad9857129cf5d5 SHA256 71117cb1a17e99e9f4bec1ca06293518faf7b79217740e015f0416452ae2c3ac
 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)
 
-iJwEAQEIAAYFAk59tNIACgkQfXuS5UK5QB0d4wP/Zy9pZrcETmZZxfUUhQ3ZUpBz
-ajM6Oq5uaT0cb1YKvNQLkHgoHdx34AS+cSL9Wk7ZMo/FN0nqkuXxP7zk/sFbJZaY
-rOxi7TnSLSoxY2l47VZGfisWACtLizgo72K53Scr0vhXSGbhbwLKTsQt3KXA4wVM
-k9z15x8CcmAvGRxsrjY=
-=oqhQ
+iF4EAREIAAYFAk85azMACgkQknrdDGLu8JAaJQEAhVKd6RoCIuWhwtS0VgbpOMKi
+OeLx37tbqTQtJd1OZaYA/2GVTR3cetz0vSKClSrT+0LYmkWDTza3fxNu70ecqhxt
+=O1JD
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
index 41ca3a64e3b8..c456887a541c 100644
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
@@ -1,5 +1,5 @@
 --- /tmp/acpi-cpufreq.c.orig	2010-08-07 09:25:45.510440771 +0200
-+++ /tmp/acpi-cpufreq.c	2010-08-07 09:25:56.090496225 +0200
++++ phc-intel-0.3.2-12-1/phc-intel.c
 @@ -25,6 +25,10 @@
   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   */
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch
index f99738d0bb71..80d3b239d04a 100644
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch
@@ -1,5 +1,5 @@
 --- /tmp/acpi-cpufreq.c.orig	2010-08-07 09:25:45.510440771 +0200
-+++ /tmp/acpi-cpufreq.c	2010-08-07 09:25:56.090496225 +0200
++++ phc-intel-0.3.2-12-1/phc-intel.c
 @@ -25,6 +25,10 @@
   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   */
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch
index cbe4d276972f..4789d84939b6 100644
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch
@@ -1,5 +1,5 @@
 --- linux-2.6.37-gentoo/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-+++ phc-intel-0.3.2-12-1/inc/2.6.37/acpi-cpufreq.c
++++ phc-intel-0.3.2-12-1/phc-intel.c
 @@ -25,6 +25,10 @@
   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   */
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild
index 8f710459d0f8..8e717f20dc4b 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.1-r3.ebuild,v 1.1 2011/06/11 13:51:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild,v 1.2 2012/02/13 19:57:35 xmw Exp $
 
 EAPI=2
 
@@ -46,9 +46,9 @@ src_prepare() {
 	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
 
 	if kernel_is eq 2 6 35 || kernel_is eq 2 6 36 ; then
-		patch phc-intel.c "${FILESDIR}"/${P}-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.patch
+		epatch "${FILESDIR}"/${P}-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.patch
 	else
-		patch phc-intel.c "${FILESDIR}"/${P}-2.6.37.patch
+		epatch "${FILESDIR}"/${P}-2.6.37.patch
 	fi
 }