Fix grammar (bug 334495), remove -pipe from Makefile's CFLAGS (bug 362523), and don't depend on sysfsutils (bug 348620).

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 26 insertions, 12 deletions

diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index fb49afce2574..3ac16bc691e7 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -5,22 +5,23 @@ AUX cpufrequtils-005-build.patch 844 RMD160 494f3e1c6681ac01e922bf4a527a8b89f878
 AUX cpufrequtils-005-nls.patch 1581 RMD160 614aee44a46cb01033c7c577711e9f07b70f824b SHA1 1072c513b41e5f43ef895f7d1c99eca3634ded3f SHA256 5ab12e4b5061b72e33c79ee15862db2127c0284532f6016064976c71772daf6e
 AUX cpufrequtils-007-build.patch 369 RMD160 317ebc43c5cb8ea40a3dc20deab8b03ba22d958c SHA1 30f2702c94aac2e644a5aae87e2395ab7ba905eb SHA256 2cfafb56502441c06485b38e3e900e354310f252ae47e23134fc63488aeb8ec0
 AUX cpufrequtils-007-nls.patch 1684 RMD160 fe28612cb1e69d75aba33803be6b6e9c9a7a450f SHA1 cdc9f110b12f6574fd06dec80461da6caa9a0bdf SHA256 e4a6a2cdd47da2bd54cf0cb18e5b601c2630af64d747b2e14e524bfd9761a397
+AUX cpufrequtils-008-remove-pipe-from-CFLAGS.patch 276 RMD160 c1545bcc3bc369dd4d358974319ad4175dd04342 SHA1 dc8be39dff3da044c3cbee69240f517604a61ecb SHA256 3b5ca8ecfb128644d31bbcbb988667d0662dbb95a32f104c572499f1cc5f7b0e
 AUX cpufrequtils-conf.d-005 277 RMD160 09bdd1c1b218f9aa9ce448b01eb0c9f0dc0613c2 SHA1 2befd01f2d527916eee5429920a083ea9543daa1 SHA256 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727
 AUX cpufrequtils-conf.d-006 398 RMD160 e3e5f52e5a7c51961506b2220c53d9fbd53c061f SHA1 90547acd2466d383b81540cdb253408bbcd160a9 SHA256 f93fed316a161977360a3764f503680316f88e9f8e40f264fccdfbb7d6a6e8d5
 AUX cpufrequtils-init.d-005 531 RMD160 4bca2bc3868c3ef73bf53f3bbd83bd4c4a7164f4 SHA1 67d0fc02e59060358f5a82ea314830df19625524 SHA256 af83b2354bd8876efecd85762a61a40a4b498633e186cb85db7a22389936a2e6
-AUX cpufrequtils-init.d-006 861 RMD160 7131a3482242d83750c018d1a4f6f6ac31e2f74d SHA1 7c855d01b6d90fe4681c6403f829af823ea5954b SHA256 0fc8e824933d8af8fe19151b1603eba1141f6e5a1d32ad91df3fd810c4518ca5
+AUX cpufrequtils-init.d-006 842 RMD160 d4be25b86aef27bfd1a6b2fcbe151fc0e0c47dbf SHA1 47cdbdd98157cffba20a4cf814e2ca93785fb498 SHA256 f3f1978366eff38c419c0fecd531c0ba7a4e2573a1e95d8c02ad27487c925f96
 DIST cpufrequtils-005.tar.bz2 39013 RMD160 284b28792635f37a909cc4aaeb626e01936fe95a SHA1 4033b8bb54fbcf13a59d4444e0883160c5499ad1 SHA256 a2c5898cbea032decc6143e82577c2bd948d6d9e97cd09d458e67c92e248bebe
 DIST cpufrequtils-007.tar.bz2 51959 RMD160 f5ba085ad186456099c312d67d67351d5fd4592d SHA1 57c91f5ff2a2abf0e1fbf4aa881702b8846397a9 SHA256 8af517369ad8a8ac40a9e47abe2e1970a9249932ab336367aaf8f68cd979dbad
 DIST cpufrequtils-008.tar.bz2 52186 RMD160 21c1318bd31e2df8b5b6718860e55bf345ad71d4 SHA1 3b6d64dcde86bb6a53842ffb0483465113aac6af SHA256 1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1
 EBUILD cpufrequtils-005-r1.ebuild 1261 RMD160 c05e2849758aa5cd0a5a1560b1bde4c0efdba27d SHA1 7b421ada7beb267804814db9d0dd5b37d88b64f3 SHA256 bc2b10bbc66eb745ebc02e61c8d7e946905d02381cee30f6b063a4e631d2ee80
 EBUILD cpufrequtils-007.ebuild 1465 RMD160 02982e05ef67c400cc825541f789880141100de4 SHA1 1b7e2650600310e7dde592503070092bfb5515ad SHA256 e701f2dbf3903a009beb949e1665df505f02bd9788c6784bb1022c4726f34f75
-EBUILD cpufrequtils-008.ebuild 1474 RMD160 3244dc50626cc7d2061a981f042cd12f95048d7a SHA1 ce49373a1872e214dcfea848bc3ae92b6c6d73d6 SHA256 235f3ede346bb7d7753c19c4f08839f98114e52168ccb63401e56af76535e694
+EBUILD cpufrequtils-008.ebuild 1540 RMD160 ef1f51578338009422512ab2a83c39ad93e7d9ab SHA1 c645ac4be5bf28880f56cf47dce1a367a5e0d30d SHA256 df9490e2115373f00b57653e426cbbcd18dabe589ff7d53105953bef459b4586
 MISC ChangeLog 9475 RMD160 8e74888e6404b3951ed37cd2fee99aba799accbb SHA1 3773915665094a7866246752f45a443bdb489557 SHA256 77cf927289f145a9928355d4b1083cdafea58e09c7076e3421ed265cbf387b69
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkxlUHoACgkQcsIHjyDViGR8DgCg5mB2TArxkD39BZsEIervLpor
-xXoAn3qE/ZBWAKGSz4fH5m7k+QxrM4K8
-=nnDu
+iEYEARECAAYFAk4ogkcACgkQTVUdg23rv53/1gCeJsvs3kuHygL+Sdc1sxQK/sBG
+NCoAoIkaesXSfB2jkLZHEwQ3KRvZWcQw
+=Bag7
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-008.ebuild b/sys-power/cpufrequtils/cpufrequtils-008.ebuild
index e9b477aa736e..aac4e60e9ffb 100644
--- a/sys-power/cpufrequtils/cpufrequtils-008.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-008.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-008.ebuild,v 1.1 2010/07/05 19:43:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-008.ebuild,v 1.2 2011/07/21 19:47:14 mattst88 Exp $
 
 EAPI="3"
 
@@ -15,13 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls"
 
-DEPEND="sys-fs/sysfsutils"
+DEPEND=""
+RDEPEND=""
 
 ft() { use $1 && echo true || echo false ; }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-007-build.patch
 	epatch "${FILESDIR}"/${PN}-007-nls.patch #205576 #292246
+	epatch "${FILESDIR}"/${PN}-008-remove-pipe-from-CFLAGS.patch #362523
 }
 
 src_configure() {
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-008-remove-pipe-from-CFLAGS.patch b/sys-power/cpufrequtils/files/cpufrequtils-008-remove-pipe-from-CFLAGS.patch
new file mode 100644
index 000000000000..8d05fea248d3
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-008-remove-pipe-from-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2011-07-21 15:41:14.696144522 -0400
++++ Makefile	2011-07-21 15:41:21.056144805 -0400
+@@ -123,8 +123,6 @@
+ LIB_SRC = 	lib/cpufreq.c
+ LIB_OBJS = 	lib/cpufreq.o
+ 
+-CFLAGS +=	-pipe
+-
+ ifeq ($(strip $(PROC)),true)
+ 	LIB_OBJS += lib/proc.o
+ 	LIB_SRC += lib/proc.c
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-init.d-006 b/sys-power/cpufrequtils/files/cpufrequtils-init.d-006
index 201f2341cbf9..adb71b0224b8 100755
--- a/sys-power/cpufrequtils/files/cpufrequtils-init.d-006
+++ b/sys-power/cpufrequtils/files/cpufrequtils-init.d-006
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-006,v 1.1 2010/01/15 07:41:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-006,v 1.2 2011/07/21 19:47:14 mattst88 Exp $
 
-affect_change() {
+change() {
 	local c ret=0 opts="$1"
 	shift
 	ebegin "Running cpufreq-set ${opts}"
@@ -33,9 +33,9 @@ affect_change() {
 }
 
 start() {
-	affect_change "${START_OPTS}" ${SYSFS_EXTRA}
+	change "${START_OPTS}" ${SYSFS_EXTRA}
 }
 
 stop() {
-	affect_change "${STOP_OPTS}"
+	change "${STOP_OPTS}"
 }