sys-power/phc-intel: Remove last-rited pkg

Closes: https://bugs.gentoo.org/663180
Signed-off-by: Michał Górny <mgorny@gentoo.org>

27 files changed, 0 insertions, 2462 deletions

diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
deleted file mode 100644
index 90738902a90d..000000000000
--- a/sys-power/phc-intel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST phc-intel-pack-rev17.tar.bz2 100565 BLAKE2B e9209b8530cc7eebd045c874766ae63116b3b112e21100d88b9e676894f0e72a3f63150abd6b5e85e964b7380439e9843ea3273f622e14a2532bdaac5ce99201 SHA512 0db84ae3e366ff95577ee89b2e1cb22778fdba76783aa2606b6b5925e46c6e5daf80a7365eba6f3f806a017daa98d7b20828c644a3967f180c612e7c92a94871
-DIST phc-intel-pack-rev21.tar.bz2 111951 BLAKE2B 77c469b897500bd7c7196b6f6869dba71514bad15a0ff21a3c2cc9a7871a718bedf06a3f93a61dd70ba4269405f8b9a7043bba134c0db003f519dd52c7d6fb6c SHA512 4aaa7beffe107d31bd9006f658b9a280ef0ace3d81ac88ef281b958803ac9e551ed4a33d5f25c0ec28d3d80349cfd4f81bcfcf708767dae133b4389b6d2348a0
-DIST phc-intel-pack-rev24.tar.bz2 117565 BLAKE2B 450518537c6a67b05448aca2a0f495cde5d6db60d981f7d2ffb07e861f842aabe20946edf67551e3062121c3d310ad0a9b052c9743b180c53920d1731607b881 SHA512 88b4c2e837729f62c59c3050c696d90c033a08a50e5594830ffa3b1008cecb7330792693453621758a0b64b239f9d96966c14f171bdb138341d64ff8a923881c
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch
deleted file mode 100644
index d20fb73a4fd6..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch
+++ /dev/null
@@ -1,1179 +0,0 @@
-Remove trailing white spaces from /proc output.
-
-Signed-off-by: Michael Weber <xmw@gentoo.org>
---- phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -757,12 +769,477 @@
-+@@ -757,12 +769,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,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;
-@@ -185,6 +186,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;
-@@ -211,6 +213,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;
-@@ -239,6 +242,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;
-@@ -270,6 +274,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;
---- phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
-@@ -74,7 +74,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,477 @@
-+@@ -758,12 +770,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -157,6 +157,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;
-@@ -186,6 +187,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;
-@@ -212,6 +214,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;
-@@ -240,6 +243,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;
-@@ -271,6 +275,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;
---- phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,477 @@
-+@@ -758,12 +770,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,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;
-@@ -185,6 +186,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;
-@@ -211,6 +213,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;
-@@ -239,6 +242,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;
-@@ -270,6 +274,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;
---- phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -778,12 +790,477 @@
-+@@ -778,12 +790,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,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;
-@@ -185,6 +186,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;
-@@ -211,6 +213,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;
-@@ -239,6 +242,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;
-@@ -270,6 +274,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;
---- phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -790,12 +802,477 @@
-+@@ -790,12 +802,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,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;
-@@ -185,6 +186,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;
-@@ -211,6 +213,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;
-@@ -239,6 +242,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;
-@@ -270,6 +274,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;
---- phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -797,12 +809,474 @@
-+@@ -797,12 +809,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;
---- phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -793,12 +805,474 @@
-+@@ -793,12 +805,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -756,12 +768,474 @@
-+@@ -756,12 +768,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -757,12 +769,474 @@
-+@@ -757,12 +769,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,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;
-@@ -183,6 +184,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;
-@@ -209,6 +211,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;
-@@ -237,6 +240,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;
-@@ -268,6 +272,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;
---- phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,474 @@
-+@@ -758,12 +770,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -759,12 +771,474 @@
-+@@ -759,12 +771,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,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;
-@@ -183,6 +184,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;
-@@ -209,6 +211,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;
-@@ -237,6 +240,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;
-@@ -268,6 +272,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;
---- phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -759,12 +771,474 @@
-+@@ -759,12 +771,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -760,12 +772,474 @@
-+@@ -760,12 +772,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,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;
-@@ -183,6 +184,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;
-@@ -209,6 +211,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;
-@@ -237,6 +240,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;
-@@ -268,6 +272,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;
---- phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -719,12 +731,474 @@
-+@@ -719,12 +731,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -720,12 +732,474 @@
-+@@ -720,12 +732,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,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;
-@@ -183,6 +184,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;
-@@ -209,6 +211,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;
-@@ -237,6 +240,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;
-@@ -268,6 +272,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;
---- phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -716,12 +728,474 @@
-+@@ -716,12 +728,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,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;
-@@ -182,6 +183,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;
-@@ -208,6 +210,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;
-@@ -236,6 +239,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;
-@@ -267,6 +271,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;
---- phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -717,12 +729,474 @@
-+@@ -717,12 +729,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,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;
-@@ -183,6 +184,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;
-@@ -209,6 +211,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;
-@@ -237,6 +240,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;
-@@ -268,6 +272,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;
---- phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
-@@ -71,7 +71,7 @@
-  	}
-  
-  	return 0;
--@@ -717,12 +729,474 @@
-+@@ -717,12 +729,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;
---- phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -963,10 +965,484 @@
-+@@ -963,10 +965,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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;
---- phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
-@@ -122,7 +122,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -986,10 +987,485 @@
-+@@ -986,10 +987,490 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -200,6 +200,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +230,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +257,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -283,6 +286,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -314,6 +318,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -966,10 +968,484 @@
-+@@ -966,10 +968,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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;
---- phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -970,10 +972,484 @@
-+@@ -970,10 +972,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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;
-Remove trailing white spaces from /proc output.
-
-Signed-off-by: Michael Weber <xmw@gentoo.org>
---- phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -982,6 +983,480 @@
-+@@ -982,6 +983,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch
deleted file mode 100644
index 4e1e4dfc8543..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev14/inc/3.13/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev14/inc/3.13/linux-phc-0.3.2.patch
-@@ -197,7 +197,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -956,6 +1050,480 @@
-+@@ -956,6 +1050,485 @@
-  	}
-  }
-  
-@@ -273,6 +273,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -302,6 +303,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -328,6 +330,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -356,6 +359,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -387,6 +391,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch
deleted file mode 100644
index 19c1b546fb7d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev14/inc/3.14/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev14/inc/3.14/linux-phc-0.3.2.patch
-@@ -198,7 +198,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +1022,481 @@
-+@@ -929,6 +1022,486 @@
-  	}
-  }
-  
-@@ -274,6 +274,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -303,6 +304,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -329,6 +331,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -357,6 +360,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -388,6 +392,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch
deleted file mode 100644
index e1db916f7192..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev15.1/inc/3.15/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev15.1/inc/3.15/linux-phc-0.3.2.patch
-@@ -198,7 +198,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +1022,481 @@
-+@@ -929,6 +1022,486 @@
-  	}
-  }
-  
-@@ -274,6 +274,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -303,6 +304,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -329,6 +331,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -357,6 +360,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -388,6 +392,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch
deleted file mode 100644
index 01bf10bba48b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev15.1/inc/3.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev15.1/inc/3.5/linux-phc-0.3.2.patch
-@@ -55,7 +55,7 @@
-  		kfree(data->freq_table);
-  		kfree(data);
-  	}
--@@ -716,8 +728,470 @@
-+@@ -716,8 +728,475 @@
-  	return 0;
-  }
-  
-@@ -134,6 +134,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;
-@@ -163,6 +164,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;
-@@ -189,6 +191,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;
-@@ -217,6 +220,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;
-@@ -248,6 +252,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/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch
deleted file mode 100644
index 1934d9cde11a..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev16/inc/3.16/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev16/inc/3.16/linux-phc-0.3.2.patch
-@@ -195,7 +195,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -928,6 +1019,481 @@
-+@@ -928,6 +1019,486 @@
-  	}
-  }
-  
-@@ -271,6 +271,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -300,6 +301,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -326,6 +328,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -354,6 +357,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -385,6 +389,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch
deleted file mode 100644
index 16fffd1833da..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -963,10 +965,484 @@
-+@@ -963,10 +965,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch
deleted file mode 100644
index 13d9df5eba2b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch
-@@ -122,7 +122,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -986,10 +987,485 @@
-+@@ -986,10 +987,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -200,6 +200,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +230,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +257,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -283,6 +286,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -314,6 +318,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch
deleted file mode 100644
index 4031d34523a2..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -982,6 +983,480 @@
-+@@ -982,6 +983,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch
deleted file mode 100644
index 78db83fb478d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -956,6 +957,480 @@
-+@@ -956,6 +957,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch
deleted file mode 100644
index 3c8e75a6a534..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +929,481 @@
-+@@ -929,6 +929,486 @@
-  	}
-  }
-  
-@@ -174,6 +174,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -203,6 +204,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +231,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -257,6 +260,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch
deleted file mode 100644
index d15916a1fbea..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +929,481 @@
-+@@ -929,6 +929,486 @@
-  	}
-  }
-  
-@@ -174,6 +174,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -203,6 +204,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +231,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -257,6 +260,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch
deleted file mode 100644
index 345fa6c73ab8..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch
-@@ -55,7 +55,7 @@
-  		kfree(data->freq_table);
-  		kfree(data);
-  	}
--@@ -716,8 +728,470 @@
-+@@ -716,8 +728,475 @@
-  	return 0;
-  }
-  
-@@ -134,6 +134,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;
-@@ -163,6 +164,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;
-@@ -189,6 +191,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;
-@@ -217,6 +220,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;
-@@ -248,6 +252,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/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch
deleted file mode 100644
index 003941fd729d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -966,10 +968,484 @@
-+@@ -966,10 +968,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch
deleted file mode 100644
index 2532e37b40bc..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -970,10 +972,484 @@
-+@@ -970,10 +972,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,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;
-@@ -227,6 +228,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;
-@@ -253,6 +255,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;
-@@ -281,6 +284,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;
-@@ -312,6 +316,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/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch
deleted file mode 100644
index ddc65b4d34f1..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch
-@@ -95,7 +95,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -928,6 +925,481 @@
-+@@ -928,6 +925,486 @@
-  	}
-  }
-  
-@@ -171,6 +171,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -226,6 +228,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -254,6 +257,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch
deleted file mode 100644
index 103ad0b38b19..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -941,6 +937,492 @@
-+@@ -941,6 +937,497 @@
-  	}
-  }
-  
-@@ -169,6 +169,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -197,6 +198,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -222,6 +224,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -252,6 +255,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch
deleted file mode 100644
index 928edc616f7b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch
-@@ -96,7 +96,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -935,6 +932,491 @@
-+@@ -935,6 +932,496 @@
-  	}
-  }
-  
-@@ -168,6 +168,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -196,6 +197,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -221,6 +223,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -251,6 +254,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -284,6 +288,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch
deleted file mode 100644
index efb4baf088e7..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -917,6 +914,491 @@
-+@@ -917,6 +914,496 @@
-  	}
-  }
-  
-@@ -169,6 +169,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -197,6 +198,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -222,6 +224,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -252,6 +255,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch
deleted file mode 100644
index e5820b315033..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.10/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static enum cpuhp_state acpi_cpufreq_online;
-  
-  static void __init acpi_cpufreq_boost_init(void)
--@@ -934,6 +930,494 @@
-+@@ -934,6 +930,499 @@
-  		cpuhp_remove_state_nocalls(acpi_cpufreq_online);
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch
deleted file mode 100644
index 256910ba42e4..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.7/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.7/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -958,6 +954,494 @@
-+@@ -958,6 +954,499 @@
-  	}
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch
deleted file mode 100644
index 08e5b7ecb848..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.9/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -955,6 +951,494 @@
-+@@ -955,6 +951,499 @@
-  	}
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		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/metadata.xml b/sys-power/phc-intel/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-power/phc-intel/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild
deleted file mode 100644
index 32dd3dbe46a7..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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=166 -> phc-intel-pack-rev17.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 4 0 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	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-rev15-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 \
-		"${FILESDIR}"/phc-intel-0.3.2-rev15-trailing-space-3.15.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev16-trailing-space-3.16.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
-	elif kernel_is lt 3 17 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/3.16/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild
deleted file mode 100644
index 8c856060bc7b..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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=170 -> phc-intel-pack-rev21.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 3 1 ; 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 4 6 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-3.{4,7,9,10,11,12,13,14,15}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-4.{1,3,5,6}.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 4 7 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/4.6/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
deleted file mode 100644
index 34f2567f2ada..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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=178 -> phc-intel-pack-rev24.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 3 1 ; 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 4 14 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	epatch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-3.{4,7,9,10,11,12,13,14,15}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-4.{1,3,5,6}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev24-trailing-space-4.{7,9,10}.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 4 11 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/4.10/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}