diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-02-13 19:57:35 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-02-13 19:57:35 +0000 |
| commit | ed54a13518de8968328a952df15af5d9f2ae5fe0 (patch) | |
| tree | c8b2673ee318f964f10da355a8b4bf2fd2a9423d /sys-power | |
| parent | x86 stable per bug 403269 (diff) | |
| download | gentoo-2-ed54a13518de8968328a952df15af5d9f2ae5fe0.tar.gz gentoo-2-ed54a13518de8968328a952df15af5d9f2ae5fe0.tar.bz2 gentoo-2-ed54a13518de8968328a952df15af5d9f2ae5fe0.zip | |
replace patch w/ epatch, fix patchsets (bug 403185)
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
5 files changed, 15 insertions, 9 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/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 } |