gentoo resync : 28.04.2019

27 files changed, 0 insertions, 2488 deletions

diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
deleted file mode 100644
index cbf0b49f314c..000000000000
--- a/sys-power/phc-intel/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-AUX phc-intel-0.3.2-rev12-trailing-space-misc.patch 33960 BLAKE2B 6f6969dbc4889e2fb43966c052ccb1654e1d873962ebf2110507b0d19f1965f200b8a7321d3b197b564c10122976add44cc5319f852603c5e15e5813073b4e41 SHA512 13f0b0da6eafefacfd617edaf5ff3d05dc0b5de3884ddd05459fcbc6ebde7f3c3671f8ce0be426bcc304460447a900e3948e6acc838c515f43f033cf6ffc08d0
-AUX phc-intel-0.3.2-rev14-trailing-space-3.13.patch 1557 BLAKE2B 6626f09ced14fcb1cd86d5b5ad4d7a78f2fd865b46873e1e0a180ceaaa175e42a21be9f2ae7c9b0c417a8b91cbca5e26162c953e33933278430de82f93ec34c5 SHA512 92a37dca6d703015db43f730d728bc39eaa43378b41a1cef8e2a3adb332c949bec78889099c8af24c4da835fd426b766291dd5d84d8567192853f5839c401036
-AUX phc-intel-0.3.2-rev14-trailing-space-3.14.patch 1557 BLAKE2B 8edf438ce66ec5c72bebba61feb1fe2ea4310bbda6e155b3d1484b3d3be9d3eb171f6937255744b9e1b6c1421f21a65e227ca1db44bca8ffcd4a7f09e16b328d SHA512 444864f1c13d0039861e9baafb8d4e8a2c304fadd9af6f18c499f29d371557ddbb9f7194dc952029c818fce81022d0a0c31faec698c213ba4cc69739b62827e0
-AUX phc-intel-0.3.2-rev15-trailing-space-3.15.patch 1561 BLAKE2B 747341a84ea00b1f965c4e5a4384ab4798fc866b6c19e62358ad2a2d8dc264dce453df76fffd6d0db2e9f56f47f375d20831abd6f0c37f8867506d4228119ba4 SHA512 1d9c34a5ff3a7853de5d3fc893e21c7ecc4351b29eae4d5e81eccc596f1492556110bb25f68654b32e4af912cf6aa5ca64d988d838ee63f16d3729a8b3782746
-AUX phc-intel-0.3.2-rev15-trailing-space-3.5.patch 1456 BLAKE2B c8b2522a6329b3593aa76fe8f6d134b4468c519b4fc42682891d726d9b7d42a458768a05906aeca8d74581adad9fcd24b28096178f838c3183057825c76a7c75 SHA512 d8da3d7d53ec13cdd3b21e3ebb4aeec3502f2e75571eeaea39a59b4825b3be6043b275fb89bbdae4778e415c22cc80639af04674fd3975f498a6adc926b39ce8
-AUX phc-intel-0.3.2-rev16-trailing-space-3.16.patch 1557 BLAKE2B 1d8dbcfe453d5398b040047034db3239e4d90311a79b680079e21c631d1bc51e0a41c3ffa5ab97fd190743e70e0fb04b68ed5dd302106f5c2e3287839b909e02 SHA512 4c044603bc1617f9fa8a33d4270ec6f9c9a32422599513d9d60033d572e14280d383e223e57367db59d46b91e22de0ebcf24955b663b119dc7388fe2a3c708c0
-AUX phc-intel-0.3.2-rev21-trailing-space-3.10.patch 1531 BLAKE2B 02ac49de4f94d848581cee718af749f9ba7c0cef25291edcf8971ed3f926b749182ea105ffe6fff22136841a3ef7b898435dfeb0cf334a145f5009857a3252e4 SHA512 145a6a2eee51afd273e8e22112a16840f98daa8bd6a725e8b42cdb2ed28a9ddcff820fe81a198f261646c762908e5874d44d65e0878bfccfc60911e786f50d38
-AUX phc-intel-0.3.2-rev21-trailing-space-3.11.patch 1561 BLAKE2B 9cc0e13aaa85298397079ab5001176573b1c67f152e3919c10fc8680a50e3e2adbe9bd032e42dc694ae90fc456d5bc57104abd70c775bee79b9ae7cc94936572 SHA512 b02815bf365f3c49f367f934a79e0097536aeda1827639da5d159368214dadee7f97786a98e65448d6e971ec1f32bc359704ccb5e4cef60753c861758edd14e7
-AUX phc-intel-0.3.2-rev21-trailing-space-3.12.patch 1553 BLAKE2B 501b393861508fa5cc29ac0d299734d4132a290e28d9b15e3777f8892ac33aceffaa8552cf707d24a01f5156d8a72079f81feab4ab4f0197effa207ea57b09ab SHA512 1cd0241e5b6a0020e27467534d6430aca11ec86c88160c0fae1367cbc9f40998887fead04c7993487721172795e0aaad40da21a44a34e68d31dbaaa2f6930a47
-AUX phc-intel-0.3.2-rev21-trailing-space-3.13.patch 1553 BLAKE2B 31df55c96a22ef5984bd71f2eb380597fa942aa2b9261fa15391a841dc2067476bc2a4b3c43fdd46c9e8a1fb63fd1810748545236a3643197a8a4b275efd3a6c SHA512 d00b71b4f4a7447b65de1eefee944230543280411b53c15ba5d8531144fb1014f76c87dc6c8a52c63ac6cf0272bbde8c11a3f76508e9e52310431026960c392c
-AUX phc-intel-0.3.2-rev21-trailing-space-3.14.patch 1553 BLAKE2B 16ac29beb93560d36e23e509172f7a4661430ffeb0032ea56b928c5024da3c37108bf90452d11aa3a374fb85878f2bfa363b6daa7af38b415117f44cc82d877a SHA512 eaa575d4e674c1719430f190ccb2c3e3a6f245da93b8f55b9c4055c8dec0cbfd38bf300dc1df2a815e151b88feebb87824275822c173c5a7f938a5d4f998aa5b
-AUX phc-intel-0.3.2-rev21-trailing-space-3.15.patch 1553 BLAKE2B 988eb7638d015aeff1c163f374d47ab22925dcfa4d97005c2b2f4a3152cad8e81ed3f99136447c5222bd5be0f076e09d10c6fa9efadf6a0aaeb6b393578e7fe2 SHA512 636be9bc0382bd0e6019da100c169a81c57fe9b0cde80d3eee2e23fc591a2c943c84a68d398fae979769a52349071528185f2fdb7278c607de5d6bdffa210bd9
-AUX phc-intel-0.3.2-rev21-trailing-space-3.4.patch 1452 BLAKE2B 9bf4abce447bd78a642d9a20d8c1119525fc28740b1983e25a66cc05979f44f36910a0e767723ee46762be68dbf760f6d53ea877d3bc6137d0e04fa2b077db90 SHA512 5abc31866fb8600eb8e5a05009e9929921fffab92a37c56de5498fdba66480c627dbcca4e6d660efef167829befa66e352cd853738755cc92276f07f66503572
-AUX phc-intel-0.3.2-rev21-trailing-space-3.7.patch 1533 BLAKE2B d675d8c1311f707a69984b56a85bfe4ca6943fcfb36305b635185acc795b5b7b3cdc8a5f44f1432394dcb252ad570d5012d1fbbaed8e74aa8733fe9ec6b96796 SHA512 5d1a94a666de155a18f18b10017aedbf6ef9b11177835ec7e3c0debd3b833e843f1714c5c36545679140093a0a202cfedeee2539ab7e9d936e5410ac69a1c696
-AUX phc-intel-0.3.2-rev21-trailing-space-3.9.patch 1533 BLAKE2B e7061c7a71e373fa05af6ae9e4c9711fb85f09e52dae3a66b45cdc6c0c3e811098a6429b3eacae97ef0762897628e2d014937d4f6df230db7761ac9a8c583efb SHA512 99bf0b47d7b0f0484041bda605a38b4cff6faf6369e1627ce640ce8ac4fe29e7390ff5825f5c5fedc90803bb39cfaf75ce8a38942aee4c8e3ed6c3eddd4a72ae
-AUX phc-intel-0.3.2-rev21-trailing-space-4.1.patch 1551 BLAKE2B beac24454d87eded1191894e777c40377ed911ede00d4836d45849f5a3aaf85805ccddaa2ff44ffbfbd9f1ad1c8f6421fc4ff7068f21ae0ee4c3c3feded68574 SHA512 20282756a1c95fd61a26a7f6fb21f666479811a5d7667f1b9f4bcd1cd77e24d649e65363ccdd7fa15196bd70eb29ffc395b6bace0e4ac6d6803c9eea786296a1
-AUX phc-intel-0.3.2-rev21-trailing-space-4.3.patch 1536 BLAKE2B 328c7edc018295e6c6f624ae53628db9537fed6eceba1952f17abfaa54cd1f619f11a2d4ffb7bfe639451b28e7c419ffe658f90ce07a16dcefc2b4e51d12883b SHA512 18efe8c2bbc2a21c4d6ebab26ef0f2247500b00e43460b23b4fa0dbe7a23ae074a1cea99f979e2a3edfdf79a50367dff002b108243c56252720a04dfe08e91d5
-AUX phc-intel-0.3.2-rev21-trailing-space-4.5.patch 1536 BLAKE2B a25e6379f383d66e52f0e18903f59eb667e17249214be69d9731729911c7526e93e112b8b0dfe194655042284000cc7b3e817af7b8b7d8bad5acd020fcc1bb76 SHA512 2762691445574f0c676b558b34cb71ac377d31c2cb82ac63dab77a094dc70d86331dc5090eb33a0a6863754f484ce291bc82a5d0ad6ac6090181cf05b852b3e6
-AUX phc-intel-0.3.2-rev21-trailing-space-4.6.patch 1536 BLAKE2B 7d85dcc2f4c5a96a75da07ad33877c8bba49cd3a52affd1a6fec40d2ca13d8f7906339b62434c49f344f320c4f462d50b2fe98d76630a4b17e596ebc600cc401 SHA512 99eb956a8643339baaf9432800e6bbb0fe2f2652db1311f640de8b6c9bf0146f4864a674dba9d2ab66cb4ae8c2e2b04f8bf53f3ed6a9958d8556ea8bd5ff0884
-AUX phc-intel-0.3.2-rev24-trailing-space-4.10.patch 1559 BLAKE2B 52ab9772fd01cbb20dc65282b507d4405c599d018ebb588c2c9f29bb47c707fea1f2086d1b420848809eb4461cf7bd9fdab1f469c6db6f94cf67404c757d74ea SHA512 f37e006fc91c34614d8524b5b1abab1884cf85e93253113d044f38273018025b0edf7a73d9fd87c8b86496b6ccfa9da8e255d53cb570992aafa68be87fcc1f56
-AUX phc-intel-0.3.2-rev24-trailing-space-4.7.patch 1536 BLAKE2B 876aadaa6f1e0a6f981a9d4675c32453823f26b4f66bcc84c81ab8535ef00c3870d8db2d4ce1ae4f307a62e49284b57bed87ecd99a10cb75917d6e594f01cb6e SHA512 7d57342011c1eab1ee449a8da5695be78ceb4a6981281b28b1fa0e4c1486dd4ca6f2e21246a53cce4ca0aab6f69bb37b0fc0276e10dbf7ca86873eee57a863c6
-AUX phc-intel-0.3.2-rev24-trailing-space-4.9.patch 1536 BLAKE2B c1dc84425afdd5c2585556f9347472eb4d51e49441c706fa8fb75eda0331675fbcb4f7523c694b1aad8ebb66cd2463ca0605f43bf8ef8e3b2809f409d2eab6ac SHA512 3ce8fa59c909b44e80c75444c6db7aaeb9eced64c80a6b65981a1d06bf86c59508ca37c411af05bbd5286f2cb2f7abc7f0e1c68ffc4a3d8b7ecb0f683e1ffda6
-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
-EBUILD phc-intel-0.3.2.12.17.ebuild 2187 BLAKE2B a5d1300f4deddd6bc39c2af77c54c5e7340e1ab88ab94d6dac4ccef94f95176ee8f6316c5e514f5c5ef698cc4ddac7ef6958fb697fa60b98227719942d99452c SHA512 6d756387a159a905cbd73d4705e2e64cb8ae7f6ca94f78b1f46e744668b7dc4fc7e2d49fd207ed7acfe1989c3f907478b537b3b34f574c847159055a9be525be
-EBUILD phc-intel-0.3.2.12.21.ebuild 1848 BLAKE2B cc2b1690a8cc34275a940e5e70b8a9034124a9431b56e5fa29fd77a87ecec646c7359b941df37a77919bcd6e658de5eb37731e2fe0ed992e6107cf6f2b6229d7 SHA512 60af2a13ee4f98c12031a19052665c5991f0c4d107255c453c9031e11b7a2777a92d414667ec71b2f0cd8d6406b1c0708cc85d4bc35bb7e1d766900f750482ea
-EBUILD phc-intel-0.3.2.12.24.ebuild 1933 BLAKE2B 4e1f039fe24b038bf31e53b5c3e76bff364c5e2fa52565e96eb0cf61b2257289ff0ba9285c5e4096ccade5aaa8cde6e498ec9107b366c6c7fad60121f7e17259 SHA512 f014ffbd5d372b2f7d2a33c883dc6ddcbb31bb04411e69b33b52a8dd73c8792378130111393102afdfa954339dfacae8dd45b7198a5b118c44bd3faa7d00e81e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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
-}