summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2014-08-05 07:13:28 +0000
committerMichael Weber <xmw@gentoo.org>2014-08-05 07:13:28 +0000
commit59592ee9997feb13d7f082638a28fe9ba328b2d5 (patch)
treedff49acef7cf222f2733906b0dc1a71f8d69e41c /sys-power
parentVersion bump, drop intermediate fix revision. (diff)
downloadgentoo-2-59592ee9997feb13d7f082638a28fe9ba328b2d5.tar.gz
gentoo-2-59592ee9997feb13d7f082638a28fe9ba328b2d5.tar.bz2
gentoo-2-59592ee9997feb13d7f082638a28fe9ba328b2d5.zip
Drop old version
(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'sys-power')
-rw-r--r--sys-power/phc-intel/ChangeLog7
-rw-r--r--sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-3.5.patch54
-rw-r--r--sys-power/phc-intel/phc-intel-0.3.2.12.14-r1.ebuild69
3 files changed, 6 insertions, 124 deletions
diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index 4d9b25e0f567..d98638a1e6d8 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-power/phc-intel
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.19 2014/08/05 07:10:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.20 2014/08/05 07:13:28 xmw Exp $
+
+ 05 Aug 2014; Michael Weber <xmw@gentoo.org>
+ -files/phc-intel-0.3.2-rev12-trailing-space-3.5.patch,
+ -phc-intel-0.3.2.12.14-r1.ebuild:
+ Drop old version
*phc-intel-0.3.2.12.16 (05 Aug 2014)
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-3.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-3.5.patch
deleted file mode 100644
index d9aafbd1cdfe..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-3.5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Remove trailing white spaces from /proc output.
-
-Signed-off-by: Michael Weber <xmw@gentoo.org>
---- phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
-@@ -71,7 +71,7 @@
- }
-
- return 0;
--@@ -714,12 +726,474 @@
-+@@ -714,12 +726,479 @@
- data->resume = 1;
-
- return 0;
-@@ -152,6 +152,7 @@
- + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- + count += sprintf(&buf[count], "%u ", vid);
- + }
-++ if (count) count--;
- + count += sprintf(&buf[count], "\n");
- +
- + return count;
-@@ -181,6 +182,7 @@
- + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- + count += sprintf(&buf[count], "%u ", vid);
- + }
-++ if (count) count--;
- + count += sprintf(&buf[count], "\n");
- +
- + return count;
-@@ -207,6 +209,7 @@
- + fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- + count += sprintf(&buf[count], "%u ", fid);
- + }
-++ if (count) count--;
- + count += sprintf(&buf[count], "\n");
- +
- + return count;
-@@ -235,6 +238,7 @@
- + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- + count += sprintf(&buf[count], "%u:%u ", fid, vid);
- + }
-++ if (count) count--;
- + count += sprintf(&buf[count], "\n");
- +
- + return count;
-@@ -266,6 +270,7 @@
- + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- + count += sprintf(&buf[count], "%u:%u ", fid, vid);
- + }
-++ if (count) count--;
- + count += sprintf(&buf[count], "\n");
- +
- + return count;
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.14-r1.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.14-r1.ebuild
deleted file mode 100644
index e1e9b64d4047..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.14-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 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.14-r1.ebuild,v 1.1 2014/07/22 00:13:05 xmw Exp $
-
-EAPI=5
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/
- http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
-#no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=159 -> phc-intel-pack-rev14.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-S=${WORKDIR}/${A/.tar.bz2}
-
-pkg_setup() {
- if kernel_is lt 2 6 27 ; 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
- if kernel_is gt 3 14 ; then
- eerror "Your kernel version is not yet supported by this version of ${PN}."
- eerror "Please use a newer version of ${PN} or an older kernel."
- die
- fi
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/phc-intel-0.3.2-rev12-trailing-space-misc.patch \
- "${FILESDIR}"/phc-intel-0.3.2-rev12-trailing-space-3.5.patch \
- "${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.13.patch \
- "${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.14.patch
-
- sed -e '/^all:/s:prepare::' \
- -i Makefile || die
-
- local my_sub=arch/x86/kernel/cpu
- if kernel_is gt 2 6 39 ; then
- my_sub=drivers
- fi
- cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die
- if kernel_is lt 3 12 ; then
- cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
- fi
-
- if kernel_is lt 3 0 ; then
- epatch inc/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/linux-phc-0.3.2.patch
- else
- epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
- fi
-
- mv acpi-cpufreq.c phc-intel.c || die
-}