Fix trailing whitespace patching.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 1506 insertions, 27 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index 7509e74769db..8f0540eaf269 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/phc-intel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.12 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.13 2013/09/05 22:38:45 xmw Exp $
+
+  05 Sep 2013; Michael Weber <xmw@gentoo.org>
+  +files/phc-intel-pack-rev11-trailing-space.patch,
+  -files/phc-intel-0.3.2.12.11-trailing-space.patch,
+  phc-intel-0.3.199.11_pre.ebuild, phc-intel-0.3.2.12.11.ebuild:
+  Fix trailing whitespace patching.
 
 *phc-intel-0.3.199.11_pre (05 Sep 2013)
 *phc-intel-0.3.2.12.11 (05 Sep 2013)
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index 01dd2119ec8f..945743cc08aa 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -5,20 +5,20 @@ AUX phc-intel-0.3.2.12.1-r5-2.6.35.patch 16120 SHA256 7072bc44d6fdc3c1e0443f52d0
 AUX phc-intel-0.3.2.12.1-r5-2.6.36.patch 15987 SHA256 3658a7e3e8f7a4a50f44a38c6e146dd5d24a5ded67d70cc93292c43c8cca3fa9 SHA512 4651dc2830e745c6fc4b0f4b6a49fa74eaed45b010b5c502d6c6d39218023b5a3a162a3630ac187b486f667e3f3d5c8d31168c71c7a333785c6738b64ad89167 WHIRLPOOL 325ae6e1b338d275b0ceaef06c61f2b0d1abc0b82ee373217c117dbc35fdc071aa2f822f07f17629e1fea2fed27e4df1871fb78df2ac14027bd4c197b2b9ff00
 AUX phc-intel-0.3.2.12.1-r5-2.6.37.patch 15972 SHA256 2e214b9664b4df4c3453520f8d91a55056e61a71aec493206e948897a6dc6285 SHA512 46e4020614338e802d67544bceea9fef55d06ccbb1759c23c737066622613b7b915a24a4b26b6fea209ca8d8bfc1c44af6765ba55309cc1ff5d340d31941f8f7 WHIRLPOOL c57a3fe8cb6171c2624f9152b44848950134ad6644bb3bfce47c5e3b1f99dc8b63d528fcffd42fd8c860560ea93a8edda94096393935719bf771cd8b3631a899
 AUX phc-intel-0.3.2.12.1-r5-3.7.patch 16200 SHA256 881e096e4dc74832529d32ddb55caf4c4c1c1168fac3f9e8729b4b7b9fea8176 SHA512 9c79b58428a44e073bc61fe2b6429056a27fdf1a3b1f2ba4ab29118b22d4491211f24bb049a5eaec733e77455367bac028e4e1ae4a6bd31ad99329db6f02cd85 WHIRLPOOL 579de36768e5283bd0e7378aa79e5ecd50cc48bc59a0a6b53ab0ea9f8454f44873495849ddf3f8a25adc21a13683f7c29cbd0ced9c5caee4270bc8be599d0e46
-AUX phc-intel-0.3.2.12.11-trailing-space.patch 353 SHA256 f0953eee285a435e9d769bc6de3daed492cb12ef083263e414cde9e3de0f870e SHA512 c4910f043068aef1a7969b48362dfcf2fcb12ed30e21f6339384568cc62f4570023a2bb56a8cae08f90052358f46ebeee2144e77a44609733eb43dfec6da741d WHIRLPOOL 97be12cf4cf4e0d763cbc8c50c42b39b8510948ce74d7cd2cfa93fa63f8f0b5af6f9340f9c402f08e528c5ec0d26ddfff08fb014d477350f29246b237b889da7
+AUX phc-intel-pack-rev11-trailing-space.patch 42487 SHA256 229670841c656001fea7a14304694f6bb310ca4bdcb8e1c7f60f659c279eaf9f SHA512 e319ba777b582eea50d0f126b8f5abcfc4007fba1f596b57a35b4bd34635aa750126213ae7528b074a01d402c63b17326f52ead8908e36cac5a8329624d314f9 WHIRLPOOL fa5c3d99e8f515c14c4e710ce99ac7be1c2dd6bdbe6ed83bd4d48ee3a567c16f135b489434d77ecbad071361b029ce6e4e708bf3f544dd5af05462754f817bf0
 DIST phc-intel-0.3.2.10.tar.bz2 20680 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5
 DIST phc-intel-0.3.2.12.1.tar.bz2 14412 SHA256 4f66989d424d328b205873da1b0363e75f27d7912e0e93c1cad3407c17be8264 SHA512 f9a63300fe1d7b42d1167c3b6d1f5b75cb707d8dac26d2d91f40466a26afedf3dccb76a58bb4764233ade6c309cdd554f869cdaeac04bf521607644afb709427 WHIRLPOOL dd064a2f5a67fc2aed96aa32bce4e040daf8468d2a215dbb08e11b00de039e7ac6179ea756a94035478a885a202f13517ec45a8dd8dfcd072436a0c8509e2fd0
 DIST phc-intel-pack-rev11.tar.bz2 76485 SHA256 38f4bd923228ef61315a0739f32504692d7f1809494bdc369658222f6f873479 SHA512 2bb718cc78219db8698f671ecfcc895cfd5be66d7301c56e91d24a534d308121a8a76cbd1259022e8e524b359eee34b7965da952254b26f9cb6a0bd81ff88981 WHIRLPOOL 8d40a2f4319764f15b413621ff30d39b1667281fe08a570b18e32f53197b421c85c0f0a62b99e52c9ccdac887cbcf41366790aab1b86eb79f12799455185d481
-EBUILD phc-intel-0.3.199.11_pre.ebuild 1760 SHA256 0ea5e7c21d86914947a2da78c44bc1c06b6cf363b1fd4bee346ae9a19342e162 SHA512 ae13812ebc280a8e058c272ad31d7198ff27fbd4f24c069adf9395cc971775acbc95d66a23fa2f952daaff49236ff22e858598aea784aa4ec6cf5dd4e8b7528e WHIRLPOOL d082128975a36dfe94c0fb0b6d73a8bf7e495ca6e7e3f30c5a9d813ab62602b2c89e61cc6ff42c59db6ca1e516f30408d538bdedca33ebb9dfd062528ac5cf7e
+EBUILD phc-intel-0.3.199.11_pre.ebuild 1824 SHA256 5101722f7e01ecf7b8b9931c2fc4934fe1262116dbd101205203e8743a2263d7 SHA512 c8d37f5cbd9b2684a4fd55940675caf6833d07dbc34c1e567d3fbee8879d50759f4c49304af464174af0e65580f34c5ed35f866ef4027bbdf4b8149460e7c0c8 WHIRLPOOL 0665ffd2b9a6562e5c6f8129aa8e5603977912b70c5144e9f0ec8f3e8286fe7647542b98594d3221092ee008b92477b319734b4c8daa7aa0b57875d259ebc4b4
 EBUILD phc-intel-0.3.2.10.ebuild 1079 SHA256 19ed93eab1feeb9cd3aa214ba76ff5834cff06cb821676842574e6075f8a92c4 SHA512 038fa33588b9c2c57184f6978b36315841697d2b8fc91d4307336408623813d04bbef9fe17a940ef627b84bbcfb008111b823a11243af83b90c6928756b98551 WHIRLPOOL 670fd1c97f6dab85e7814b36c4b1d4b0f90ac6db0bba01d943f2d9d7b680f8e38aef84e5b6aa9d037f71d29b7cac955fd2d953815e7fdda4fe7ce96fd4488166
 EBUILD phc-intel-0.3.2.12.1-r5.ebuild 1943 SHA256 10f761f6fc644b782f6249accfb06c2c48ceac0fe4ff2ab51c882ce16cb756aa SHA512 f2219d28b581042078689e4a5f853087f5deadf7215bd82eced4b631950a139b3eb0ab0cd09419e27c5bc3ecd8e7b4bea2598fa860852bca1d59962ec55b8363 WHIRLPOOL 321eb7e007171991c8df80a2fabc8f0480de646d9fa1266eb7900a122400d9816558b565bb002ffe88836e4ef8e9f74b6cf83d0c3611431c7ae6631087ab639b
-EBUILD phc-intel-0.3.2.12.11.ebuild 1830 SHA256 aa9b54dde61b2f0b08ed97c217c5f191f4e52cd0de1967c6a2bf9eaa5fb8760f SHA512 f8e8d93b206e94af135b91b5f5bf8118fae87d4c2e5216c139ac9163683aafeb57e1aacc86baa0fdda5ef6b696507ad9a1bb8e700e4ffdf3560a8f32bfadda9e WHIRLPOOL df9723c9431326f533bc1b877decc9ace1a0a7c2816496a4c3fca57cddde67bb687e89f14b07b04a0992d235c2a9d1cb70748dc3c7a11fc00dd4528140c69a81
-MISC ChangeLog 3194 SHA256 1eda3272dc782ac57b7f0b3e2128e3a963600b939319195a5a4c1882091c133d SHA512 fdba78c77f1fede39588f1787a5c64ee6e2ac7c467daed3b513db3fe949480956c2be048e64b7a5140a6d36f5f227f6a452640e8dcac1143cfe80229e6362076 WHIRLPOOL 7d47df75741456b748aeddf98e32b6cd038b6e841e2ff41e7d7ffbee496814512a09e483b6da10cc6f5215b716adb63e5c70c3734a41460a2d5de1aca39f7b9c
+EBUILD phc-intel-0.3.2.12.11.ebuild 1832 SHA256 bd7bf512d202d57fa4ce7f90fad039f9a9793bbe773f618bfa13eeb01383f7a7 SHA512 9a7f6fcbf4e08e3ba349264a8e19400b1ebaa139d8ca6e668a0a0ac60118fba7ae3ac0260b4429788793aaa7a225ee582034027f09917cd3d07a6946961e8d7f WHIRLPOOL 2ebb5c6a3331da59b5c0403fe41133eac4d27b066e33209a7ef699f6d48c6a76abd0aae0db0bab90b3bd1c40d00652f7ee195ab3eacd8a3827fb2fb5e3c6166c
+MISC ChangeLog 3447 SHA256 fa318b24ba91959e4713d07fd2b69e8c0c6396677ea55b0d6c65a032b404c983 SHA512 8df073df1b7cfff223a0c1b3c150115d164d87a1effa711924f551cc8414314b0cc6c52081350153268a41463a17e75c4a1f3ec1716394c10647327c6627e3e3 WHIRLPOOL f3f00173766c3daabad0be25b4a92bc4d552850481102c12cf5f53472eb797958dc0881fd691f7463b17a9367ec96036ad45f46e22b1a638ae405a64fe826d59
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIogmYACgkQknrdDGLu8JBgvQD9F+LjHxcJ+E+s+c7ty8VfMiQ7
-6eFNA//FoUhLQF5XLkcA/iR4a7SYKBWt751QLpDta0rzqOJBbiDU05z31ZLTYk79
-=cYy9
+iF4EAREIAAYFAlIpB/sACgkQknrdDGLu8JCujgD/XBW/clVREWEUwq3OCVXFoGIP
+lqg7TsuEf6P8YAiYhdoA/iOf4laBXDowBmn6UgAt188yRoy0aVMSC8LCH+dhRNyb
+=jG4W
 -----END PGP SIGNATURE-----
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch
deleted file mode 100644
index 576c9211786d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- phc-intel-pack-rev11/acpi-cpufreq.c
-+++ phc-intel-pack-rev11/acpi-cpufreq.c
-@@ -1175,6 +1175,8 @@
- 		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- 		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- 	}
-+	if (count)
-+		count--; //remove trailing space
- 	count += sprintf(&buf[count], "\n");
- 
- 	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
new file mode 100644
index 000000000000..303e8f1cd723
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
@@ -0,0 +1,1482 @@
+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.0/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.0/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- 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.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.2/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.7/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.7/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.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;
diff --git a/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
index 55864efcb985..3dfd094d689c 100644
--- a/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild,v 1.1 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ 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=147 ->  phc-intel-pack-rev11.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,6 +41,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
 	sed -e '/^all:/s:prepare::' \
 		-i Makefile || die
 
@@ -48,7 +50,6 @@ src_prepare() {
 	if kernel_is gt 2 6 39 ; then
 		my_sub=drivers
 	fi
-
 	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/{acpi-cpufreq.c,mperf.h} . || die
 
 	if kernel_is lt 3 0 ; then
@@ -56,5 +57,6 @@ src_prepare() {
 	else
 		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.4.0.patch
 	fi
+
 	mv acpi-cpufreq.c phc-intel.c || die
 }
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
index 1bf7397d81aa..7197f522195f 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild,v 1.1 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
 
 EAPI=5
 
-inherit linux-info linux-mod eutils vcs-snapshot
+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=147 ->  phc-intel-pack-rev11.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,6 +41,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
 	sed -e '/^all:/s:prepare::' \
 		-i Makefile || die
 
@@ -56,7 +58,5 @@ src_prepare() {
 		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
 	fi
 
-	epatch "${FILESDIR}"/${P}-trailing-space.patch
-
 	mv acpi-cpufreq.c phc-intel.c || die
 }