sys-power/phc-intel in tree now

svn path=/sunrise/; revision=11222

7 files changed, 0 insertions, 725 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
deleted file mode 100644
index e4257724d..000000000
--- a/sys-power/phc-intel/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-# ChangeLog for sys-power/phc-intel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  16 Aug 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  -phc-intel-0.3.2.12.1.ebuild, +phc-intel-0.3.2.12.1-r1.ebuild,
-  +files/phc-intel-0.3.2.12.1-2.6.35.patch:
-  revision bump for 2.6.35 kernel sources, patch from
-  http://aur.archlinux.org/packages.php?ID=24980
-
-  20 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  phc-intel-0.3.199.3_pre.ebuild:
-  Keywords readded, now PMASK'ed
-
-  15 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  +phc-intel-0.3.199.3_pre.ebuild:
-  Added highly experimental prerelease for future phc-intel-0.4
-
-  15 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  -phc-intel-0.3.2.11.ebuild, +phc-intel-0.3.2.12.1.ebuild:
-  Version bump, make prepare no longer needed, fixed pkg_setup issue with
-  linux-mod
-
-  15 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  phc-intel-0.3.2.10.ebuild:
-  Upstream readded the download location, SRC_URI updated
-
-  31 May 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  +phc-intel-0.3.2.10.ebuild, phc-intel-0.3.2.11.ebuild:
-  Re-added version 0.3.2.10 for kernels before 2.6.33, support was dropped.
-  Kernels from 2.6.33 need version 0.3.2.11 (linux -> generated/utsrelease.h).
-  Added corresponding warnings and alternative download locations.
-
-  19 May 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  -phc-intel-0.3.2.10.ebuild, +phc-intel-0.3.2.11.ebuild:
-  Version bump. Kernel 2.6.33 and above (utsrelease.h) support now in
-  upstream. Thanks to erik for the information.
-
-  11 Apr 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
-  phc-intel-0.3.2.10.ebuild:
-  Typo.
-
-  11 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  phc-intel-0.3.2.10.ebuild:
-  Corrected CONFIG_* check, added dodoc README
-
-  09 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de>
-  +phc-intel-0.3.2.10.ebuild, +metadata.xml:
-  New Ebuild for bug 283472
-
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
deleted file mode 100644
index a2da89bc9..000000000
--- a/sys-power/phc-intel/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX phc-intel-0.3.2.12.1-2.6.35.patch 16089 RMD160 55922770688369b9c7eabb11727efa0832a28954 SHA1 8e645cd5e81ca630b478dc3c71980bb67a6bda25 SHA256 dee0ce62588bf74fe80d12743674064a2d2f2edff39ac7751511817f0e7d41e3
-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 1144 RMD160 0c6a8f5cb20f1088703da4e847f0c41476f7cd4e SHA1 70bbee502c06a28e0a9e04ba9e46ddbc073c6e19 SHA256 5aff0bc606d49f4c515c765de4d90f28ab906a1b2248bab2fa9bb684979066fd
-EBUILD phc-intel-0.3.2.10.ebuild 1015 RMD160 c5d8be4a8c07c5fa847c3a5a7b2f4d78206f9170 SHA1 5d11ec1f4ff1afe8ec94cffe391cf85717ebea0f SHA256 c9362d428ff4d7dbf6cda5693620a3468f3ef488a287b3cec508b62595642de0
-EBUILD phc-intel-0.3.2.12.1-r1.ebuild 1453 RMD160 c4c44e9dcb81c1dfea8c69e28ce04e9abf915d67 SHA1 8177ddb964931a9837edd9ee70fbb3839b6cc2a4 SHA256 0af3518dfceed38132dc9d926e720bab574e3455998530d08debc80ed1fdb130
-MISC ChangeLog 1905 RMD160 1134d90dd690deb887f424615b6b4cae5c5cf9d6 SHA1 1126cf285b901378175635240ca02d1101bffd05 SHA256 612d6ee614935f978b26f8281c300fc4da539c2527654e02f80887990376e784
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
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
deleted file mode 100644
index 41ca3a64e..000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
+++ /dev/null
@@ -1,529 +0,0 @@
---- /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
-@@ -25,6 +25,10 @@
-  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  */
- 
-+/* This file has been patched with Linux PHC: www.linux-phc.org
-+* Patch version: linux-phc-0.3.2
-+*/
-+
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -62,12 +66,17 @@
- };
- 
- #define INTEL_MSR_RANGE		(0xffff)
-+#define INTEL_MSR_VID_MASK	(0x00ff)
-+#define INTEL_MSR_FID_MASK	(0xff00)
-+#define INTEL_MSR_FID_SHIFT	(0x8)
-+#define PHC_VERSION_STRING	"0.3.2:2"
- 
- struct acpi_cpufreq_data {
- 	struct acpi_processor_performance *acpi_data;
- 	struct cpufreq_frequency_table *freq_table;
- 	unsigned int resume;
- 	unsigned int cpu_feature;
-+	acpi_integer *original_controls;
- };
- 
- static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-@@ -103,13 +112,14 @@
- static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
- {
- 	int i;
-+	u32 fid;
- 	struct acpi_processor_performance *perf;
- 
--	msr &= INTEL_MSR_RANGE;
-+	fid = msr & INTEL_MSR_FID_MASK;
- 	perf = data->acpi_data;
- 
- 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
--		if (msr == perf->states[data->freq_table[i].index].status)
-+		if (fid == (perf->states[data->freq_table[i].index].status & INTEL_MSR_FID_MASK))
- 			return data->freq_table[i].frequency;
- 	}
- 	return data->freq_table[0].frequency;
-@@ -704,6 +714,8 @@
- 		per_cpu(acfreq_data, policy->cpu) = NULL;
- 		acpi_processor_unregister_performance(data->acpi_data,
- 						      policy->cpu);
-+		if (data->original_controls)
-+			kfree(data->original_controls);
- 		kfree(data);
- 	}
- 
-@@ -721,8 +733,470 @@
- 	return 0;
- }
- 
-+
-+/* sysfs interface to change operating points voltages */
-+
-+static unsigned int extract_fid_from_control(unsigned int control)
-+{
-+	return ((control & INTEL_MSR_FID_MASK) >> INTEL_MSR_FID_SHIFT);
-+}
-+
-+static unsigned int extract_vid_from_control(unsigned int control)
-+{
-+	return (control & INTEL_MSR_VID_MASK);
-+}
-+
-+
-+static bool check_cpu_control_capability(struct acpi_cpufreq_data *data) {
-+ /* check if the cpu we are running on is capable of setting new control data
-+  * 
-+  */
-+	if (unlikely(data == NULL || 
-+	             data->acpi_data == NULL || 
-+	             data->freq_table == NULL ||
-+	             data->cpu_feature != SYSTEM_INTEL_MSR_CAPABLE)) {
-+		return false;
-+	} else {
-+		return true;
-+	};
-+}
-+
-+
-+static ssize_t check_origial_table (struct acpi_cpufreq_data *data)
-+{
-+
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int state_index;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	if (data->original_controls == NULL) {
-+		// Backup original control values
-+		data->original_controls = kcalloc(acpi_data->state_count,
-+		                                  sizeof(acpi_integer), GFP_KERNEL);
-+		if (data->original_controls == NULL) {
-+			printk("failed to allocate memory for original control values\n");
-+			return -ENOMEM;
-+		}
-+		for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+			data->original_controls[state_index] = acpi_data->states[state_index].control;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static ssize_t show_freq_attr_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_fids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's frequeny id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", fid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(data->original_controls[freq_table[i].index]);
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+
-+static ssize_t store_freq_attr_vids(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the voltage id's for the related frequency
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int freq_index;
-+	unsigned int state_index;
-+	unsigned int new_vid;
-+	unsigned int original_vid;
-+	unsigned int new_control;
-+	unsigned int original_control;
-+	const char *curr_buf = buf;
-+	char *next_buf;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	/* for each value taken from the sysfs interfalce (phc_vids) get entrys and convert them to unsigned long integers*/
-+	for (freq_index = 0; freq_table[freq_index].frequency != CPUFREQ_TABLE_END; freq_index++) {
-+		new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if (next_buf == curr_buf) {
-+			if ((curr_buf - buf == count - 1) && (*curr_buf == '\n')) {   //end of line?
-+				curr_buf++;
-+				break;
-+			}
-+			//if we didn't got end of line but there is nothing more to read something went wrong...
-+			printk("failed to parse vid value at %i (%s)\n", freq_index, curr_buf);
-+			return -EINVAL;
-+		}
-+
-+		state_index = freq_table[freq_index].index;
-+		original_control = data->original_controls[state_index];
-+		original_vid = original_control & INTEL_MSR_VID_MASK;
-+		
-+		/* before we store the values we do some checks to prevent 
-+		 * users to set up values higher than the default one
-+		 */
-+		if (new_vid <= original_vid) {
-+			new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+			dprintk("setting control at %i to %x (default is %x)\n",
-+			        freq_index, new_control, original_control);
-+			acpi_data->states[state_index].control = new_control;
-+
-+		} else {
-+			printk("skipping vid at %i, %u is greater than default %u\n",
-+			       freq_index, new_vid, original_vid);
-+		}
-+
-+		curr_buf = next_buf;
-+		/* jump over value seperators (space or comma).
-+		 * There could be more than one space or comma character
-+		 * to separate two values so we better do it using a loop.
-+		 */
-+		while ((curr_buf - buf < count) && ((*curr_buf == ' ') || (*curr_buf == ','))) {
-+			curr_buf++;
-+		}
-+	}
-+
-+	/* set new voltage for current frequency */
-+	data->resume = 1;
-+	acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+
-+	return curr_buf - buf;
-+}
-+
-+static ssize_t store_freq_attr_controls(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the controls (frequency id's and related voltage id's)
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	const char   *curr_buf;
-+	unsigned int  op_count;
-+	unsigned int  state_index;
-+	int           isok;
-+	char         *next_buf;
-+	ssize_t       retval;
-+	unsigned int  new_vid;
-+	unsigned int  original_vid;
-+	unsigned int  new_fid;
-+	unsigned int  old_fid;
-+	unsigned int  original_control;
-+	unsigned int  old_control;
-+	unsigned int  new_control;
-+	int           found;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV;
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	op_count = 0;
-+	curr_buf = buf;
-+	next_buf = NULL;
-+	isok     = 1;
-+	
-+	while ( (isok) && (curr_buf != NULL) )
-+	{
-+		op_count++;
-+		// Parse fid
-+		new_fid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if ((next_buf != curr_buf) && (next_buf != NULL))
-+		{
-+			// Parse separator between frequency and voltage 
-+			curr_buf = next_buf;
-+			next_buf = NULL;
-+			if (*curr_buf==':')
-+			{
-+				curr_buf++;
-+				// Parse vid
-+				new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+				if ((next_buf != curr_buf) && (next_buf != NULL))
-+				{
-+					found = 0;
-+					for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+						old_control = acpi_data->states[state_index].control;
-+						old_fid = extract_fid_from_control(old_control);
-+						if (new_fid == old_fid)
-+						{
-+							found = 1;
-+							original_control = data->original_controls[state_index];
-+							original_vid = extract_vid_from_control(original_control);
-+							if (new_vid <= original_vid)
-+							{
-+								new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+								dprintk("setting control at %i to %x (default is %x)\n",
-+								        state_index, new_control, original_control);
-+								acpi_data->states[state_index].control = new_control;
-+
-+							} else {
-+								printk("skipping vid at %i, %u is greater than default %u\n",
-+								       state_index, new_vid, original_vid);
-+							}
-+						}
-+					}
-+
-+					if (found == 0)
-+					{
-+						printk("operating point # %u not found (FID = %u)\n", op_count, new_fid);
-+						isok = 0;
-+					}
-+
-+					// Parse seprator before next operating point, if any
-+					curr_buf = next_buf;
-+					next_buf = NULL;
-+					if ((*curr_buf == ',') || (*curr_buf == ' '))
-+						curr_buf++;
-+					else
-+						curr_buf = NULL;
-+				}
-+				else
-+				{
-+					printk("failed to parse VID of operating point # %u (%s)\n", op_count, curr_buf);
-+					isok = 0;
-+				}
-+			}
-+			else
-+			{
-+				printk("failed to parse operating point # %u (%s)\n", op_count, curr_buf);
-+				isok = 0;
-+			}
-+		}
-+		else
-+		{
-+			printk("failed to parse FID of operating point # %u (%s)\n", op_count, curr_buf);
-+			isok = 0;
-+		}
-+	}
-+
-+	if (isok)
-+	{
-+		retval = count;
-+		/* set new voltage at current frequency */
-+		data->resume = 1;
-+		acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+	}
-+	else
-+	{
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static ssize_t show_freq_attr_phc_version(struct cpufreq_policy *policy, char *buf)
-+ /* print out the phc version string set at the beginning of that file
-+  */
-+{
-+	ssize_t count = 0;
-+	count += sprintf(&buf[count], "%s\n", PHC_VERSION_STRING);
-+	return count;
-+}
-+
-+
-+
-+static struct freq_attr cpufreq_freq_attr_phc_version =
-+{
-+	/*display phc's version string*/
-+       .attr = { .name = "phc_version", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_phc_version,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_vids =
-+{
-+	/*display phc's voltage id's for the cpu*/
-+       .attr = { .name = "phc_vids", .mode = 0644, .owner = THIS_MODULE },
-+       .show = show_freq_attr_vids,
-+       .store = store_freq_attr_vids,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_vids =
-+{
-+	/*display acpi's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_default_vids", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_default_vids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_fids =
-+{
-+	/*display phc's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_fids", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_fids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_controls =
-+{
-+	/*display phc's current voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_controls", .mode = 0644, .owner = THIS_MODULE },
-+       .show = show_freq_attr_controls,
-+       .store = store_freq_attr_controls,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_controls =
-+{
-+	/*display acpi's default voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_default_controls", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_default_controls,
-+       .store = NULL,
-+};
-+
- static struct freq_attr *acpi_cpufreq_attr[] = {
--	&cpufreq_freq_attr_scaling_available_freqs,
-+ 	&cpufreq_freq_attr_scaling_available_freqs,
-+	&cpufreq_freq_attr_phc_version,
-+	&cpufreq_freq_attr_vids,
-+	&cpufreq_freq_attr_default_vids,
-+	&cpufreq_freq_attr_fids,
-+	&cpufreq_freq_attr_controls,
-+	&cpufreq_freq_attr_default_controls,
- 	NULL,
- };
- 
diff --git a/sys-power/phc-intel/metadata.xml b/sys-power/phc-intel/metadata.xml
deleted file mode 100644
index e6233b5dc..000000000
--- a/sys-power/phc-intel/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild b/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild
deleted file mode 100644
index 9866d1e38..000000000
--- a/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit linux-info linux-mod versionator
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=86 -> ${P}.tar.bz2
-	http://xmw.de/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/test-release-$(replace_version_separator 3 '-' $(get_version_component_range 1-4))
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module or Not set to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="prepare all"
-
-pkg_setup() {
-	if ! kernel_is eq 2 6 31 ; then
-		elog "This testrelease only supports kernel version 2.6.31."
-		die
-	fi
-	elog "Please read /usr/share/doc/${PVF}/README carefully"
-	elog "before updating your current config"
-}
-
-src_install() {
-	linux-mod_src_install
-	newdoc "READ BEFORE INSTALL" README || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild
deleted file mode 100644
index b62fbdc4f..000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit linux-info linux-mod
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=87 -> ${P}.tar.bz2
-	http://xmw.de/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P%.*}-${P##*.}"
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module or Not set to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\""
-BUILD_TARGETS="prepare all"
-
-pkg_setup() {
-	if kernel_is gt 2 6 32 ; then
-		eerror "Your kernel version is not supported by this version of ${PN}."
-		eerror "Please use a newer version for kernels 2.6.33 and above."
-		die
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r1.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r1.ebuild
deleted file mode 100644
index b37bd9891..000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit linux-info linux-mod versionator
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=94 -> ${P}.tar.bz2
-	http://xmw.de/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-$(replace_version_separator 3 '-' $(replace_version_separator 4 '-'))
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module or Not set to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if kernel_is lt 2 6 33 ; 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
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	if kernel_is eq 2 6 35 ; then
-		cp "${KERNEL_DIR}"/arch/x86/kernel/cpu/cpufreq/mperf.h . || die
-
-		mkdir inc/2.6.35 || die
-		cp "${FILESDIR}"/${P}-2.6.35.patch \
-			inc/2.6.35/linux-phc-$(get_version_component_range 1-3).patch \
-			|| die
-		cp "${KERNEL_DIR}"/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c inc/2.6.35 || die
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README || die
-}