Drop the modprobe patch since the kernel handles this for us automatically.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 12 insertions, 59 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index fd1b1023a2c7..a478b226f546 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.47 2010/01/15 07:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.48 2010/01/15 19:50:27 vapier Exp $
+
+  15 Jan 2010; Mike Frysinger <vapier@gentoo.org> cpufrequtils-006.ebuild,
+  -files/cpufrequtils-006-modprobe-gov.patch:
+  Drop the modprobe patch since the kernel handles this for us
+  automatically.
 
 *cpufrequtils-006 (15 Jan 2010)
 
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index 5febc9d2f626..4ee1f7d88faf 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -3,7 +3,6 @@ Hash: SHA256
 
 AUX cpufrequtils-005-build.patch 844 RMD160 494f3e1c6681ac01e922bf4a527a8b89f878ea4b SHA1 1266a39a756ee9a2972a47d7b5b5833168146428 SHA256 5b33a052abab8cf33913ffbf649707a238ec4c13320985933552c1a8b0761f9a
 AUX cpufrequtils-005-nls.patch 1581 RMD160 614aee44a46cb01033c7c577711e9f07b70f824b SHA1 1072c513b41e5f43ef895f7d1c99eca3634ded3f SHA256 5ab12e4b5061b72e33c79ee15862db2127c0284532f6016064976c71772daf6e
-AUX cpufrequtils-006-modprobe-gov.patch 1403 RMD160 bac53b2bb395e48abbcf6bddc731060dbf20d0d1 SHA1 213f56cdacae8d8b95b6e2f0e0afa171b71ee20a SHA256 47df8ccf9ff283fe8c0c4318dc43ba0545656f78def4ae4a767d54de34af56cb
 AUX cpufrequtils-006-nls.patch 1684 RMD160 b676983d37e7e07fd330bd81788d3d49d861b81c SHA1 dc2754021fb3ff410cae4ea1149688d3a878724d SHA256 4848b3c75b11d58d63625471d93b840d8a4ca798e7b82558dcd860a0fe2b9826
 AUX cpufrequtils-conf.d-005 277 RMD160 09bdd1c1b218f9aa9ce448b01eb0c9f0dc0613c2 SHA1 2befd01f2d527916eee5429920a083ea9543daa1 SHA256 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727
 AUX cpufrequtils-conf.d-006 398 RMD160 e3e5f52e5a7c51961506b2220c53d9fbd53c061f SHA1 90547acd2466d383b81540cdb253408bbcd160a9 SHA256 f93fed316a161977360a3764f503680316f88e9f8e40f264fccdfbb7d6a6e8d5
@@ -12,13 +11,13 @@ AUX cpufrequtils-init.d-006 861 RMD160 7131a3482242d83750c018d1a4f6f6ac31e2f74d
 DIST cpufrequtils-005.tar.bz2 39013 RMD160 284b28792635f37a909cc4aaeb626e01936fe95a SHA1 4033b8bb54fbcf13a59d4444e0883160c5499ad1 SHA256 a2c5898cbea032decc6143e82577c2bd948d6d9e97cd09d458e67c92e248bebe
 DIST cpufrequtils-006.tar.bz2 52315 RMD160 b60c1c897ca932c6251b1445a170c79da1e259ce SHA1 f6c824e446fd72d69c16867c6c1808d1baf5415e SHA256 b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1
 EBUILD cpufrequtils-005-r1.ebuild 1261 RMD160 c05e2849758aa5cd0a5a1560b1bde4c0efdba27d SHA1 7b421ada7beb267804814db9d0dd5b37d88b64f3 SHA256 bc2b10bbc66eb745ebc02e61c8d7e946905d02381cee30f6b063a4e631d2ee80
-EBUILD cpufrequtils-006.ebuild 1339 RMD160 962ccce5fe0913b3c46ead90beae0e88a19ca9da SHA1 007e98c9c1087de68131a765b217b5240c3dd51c SHA256 3ab761e5a97097388bf636115b34b89b576321090517754c1ee42f2a11e30027
-MISC ChangeLog 8383 RMD160 08505a149abafea0caf77c3edfd1f94e72ba0b89 SHA1 7c729b37276ac280ed1b8b716a9456e32852e6c9 SHA256 a27460a63e9908f175e6bca69ea2e355fc5bdfd1a41c516d17b08f527d5d997a
+EBUILD cpufrequtils-006.ebuild 1280 RMD160 c741f472fe0fc89165daaba6f1002dd925ca3720 SHA1 2cc76ea086b2f678c12923d3acf7d15286dd59fa SHA256 250044959843cc5844da0ea08fc5c09991cbe74d4e41888313562b9f20969176
+MISC ChangeLog 8585 RMD160 3e24dc369a0ecbdd6383db3bf760f0259003f8b2 SHA1 c2e7464664ea3979ed513e5ec3b355d09b996359 SHA256 860f0cbd6a295be6c891fad8ace1932998c05831db4d54e420f7c496099432a0
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktQHGAACgkQTwhj9JtAlp7Q3QD9H2e+NwsnnEQHzem5wFa540p9
-UE7iAGTgJlCprb5d5m8A/3Xff74gTugCSwn0RA3cpD6K0aaY5m4SU/KM+bgz7+Cw
-=eBOy
+iF4EAREIAAYFAktQxxEACgkQTwhj9JtAlp4ktQD/YyllIGCZyExe5w8WzEiT8rFb
+Me8HEWP9Ci2DF1vGKdkA/R4ZBPAiYYuS00ZDkMmtA61+fF8vkkRXYq+miSvDOZtc
+=QvM7
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-006.ebuild b/sys-power/cpufrequtils/cpufrequtils-006.ebuild
index 73ee25521872..a2f6d1562d72 100644
--- a/sys-power/cpufrequtils/cpufrequtils-006.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-006.ebuild,v 1.1 2010/01/15 07:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-006.ebuild,v 1.2 2010/01/15 19:50:27 vapier Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -20,7 +20,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-005-build.patch
 	epatch "${FILESDIR}"/${PN}-006-nls.patch #205576 #292246
-	epatch "${FILESDIR}"/${PN}-006-modprobe-gov.patch #204069
 }
 
 ft() { use $1 && echo true || echo false ; }
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-006-modprobe-gov.patch b/sys-power/cpufrequtils/files/cpufrequtils-006-modprobe-gov.patch
deleted file mode 100644
index 4011f77bf236..000000000000
--- a/sys-power/cpufrequtils/files/cpufrequtils-006-modprobe-gov.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-if a gov isnt loaded, try to modprobe it first
-
-http://bugs.gentoo.org/204069
-
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -12,6 +12,7 @@
- #include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/wait.h>
- #include <fcntl.h>
- #include <unistd.h>
- 
-@@ -539,8 +540,23 @@ static int verify_gov(char *new_gov, char *passed_gov)
- 	return 0;
- }
- 
-+static int modprobe(const char *module)
-+{
-+	char new_module[strlen(module) + 10];
-+	int status;
-+	pid_t child;
-+
-+	sprintf(new_module, "cpufreq_%s", module);
-+	child = vfork();
-+	if (child == 0)
-+		_exit(execlp("modprobe", "modprobe", "-q", new_module, NULL));
-+	waitpid(child, &status, 0);
-+	return (WIFEXITED(status) && WEXITSTATUS(status) == 0 ? 0 : 1);
-+}
-+
- int sysfs_modify_policy_governor(unsigned int cpu, char *governor)
- {
-+	int ret;
- 	char new_gov[SYSFS_PATH_MAX];
- 
- 	if (!governor)
-@@ -549,7 +565,10 @@ int sysfs_modify_policy_governor(unsigned int cpu, char *governor)
- 	if (verify_gov(new_gov, governor))
- 		return -EINVAL;
- 
--	return sysfs_write_one_value(cpu, WRITE_SCALING_GOVERNOR, new_gov, strlen(new_gov));
-+	ret = sysfs_write_one_value(cpu, WRITE_SCALING_GOVERNOR, new_gov, strlen(new_gov));
-+	if (ret == -ENODEV && modprobe(new_gov) == 0)
-+		return sysfs_write_one_value(cpu, WRITE_SCALING_GOVERNOR, new_gov, strlen(new_gov));
-+	return ret;
- };
- 
- int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq)