fix usage with systemd when SYSFS_OPTS is not set

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

6 files changed, 38 insertions, 20 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index 99d15ea1b73a..63ee29de0611 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.72 2013/04/21 09:21:07 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.73 2013/05/06 11:09:09 lxnay Exp $
+
+*cpufrequtils-008-r3 (06 May 2013)
+
+  06 May 2013; Fabio Erculiani <lxnay@gentoo.org> -cpufrequtils-008-r2.ebuild,
+  +cpufrequtils-008-r3.ebuild, files/cpufrequtils-init.d-007,
+  files/cpufrequtils.service, files/cpufrequtils-change.sh:
+  fix usage with systemd when SYSFS_OPTS is not set
 
 *cpufrequtils-008-r2 (21 Apr 2013)
 
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index 5a5cb23a46dd..f49134560099 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -8,20 +8,20 @@ AUX cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch 1182 SHA256 2b4c3
 AUX cpufrequtils-008-fix-msr-read.patch 1286 SHA256 55e6d5e4999c8125265331bd7b4953107618e3c6f324996a065bbd3f907e9245 SHA512 ebc0c1c17c1022a23bd6a67bb33d5298b00292a92a14335ad277421f71173bcf2a2e574661c2ea0ee465e0c0c2c66966a398db50d69e69527652cb4a1156034c WHIRLPOOL 15a191ddd71569b63b8ea45b7698a4e085ae404e71c5f64723b5372982627d9c69f958fe32d1d4084130c773d13052e6078be4cc21116352fdb0d5ac83ed6a53
 AUX cpufrequtils-008-increase-MAX_LINE_LEN.patch 834 SHA256 58190c9f785aae0a2a4617544c3896382cfd23e7256aab98255f11173b01efda SHA512 b4e91994300dbc61930fdd016944c9439fc1facc0e15e576d1a496309804c469fbaf0897a5da4186a71e95d1a5b31df2277114c44a4f3761c661a6a00cb90753 WHIRLPOOL 91f4eaf69dd1891c839cf743de8fe1c8d2e754bfe24d66ca50b13346624c08d0cdf5fd02e792f196f053c96f9965ef0c779899305ba07bfb1d56c741c7552ab8
 AUX cpufrequtils-008-remove-pipe-from-CFLAGS.patch 276 SHA256 3b5ca8ecfb128644d31bbcbb988667d0662dbb95a32f104c572499f1cc5f7b0e SHA512 b95a192e01b29281b211006bfe8de37789ce51d96271cd50d38c42183b19e0693e9a02b919cd31faf5bd1a52bf2f8390a81ac2d2e08c1cb8cc38a20af5c6ca8e WHIRLPOOL 07311866d29934b2546b9ff2110c4776b95facd9e18414ddb15b52b1fadce041f70a34df07fd921ee639f3f95a57b3f4dd3a4a57dcb433e7706064972793d956
-AUX cpufrequtils-change.sh 592 SHA256 79f8894663d47596320c262af9c9a7ea1861f3062276e246775891f90a8ca375 SHA512 99e18bae3b1f4fe5edd00a99359b8306560c4a307826bc36633df385d98c14414458c7410d3c7b5080604d29a6d96b679ff0b66f8a098eb1d99de625da365d16 WHIRLPOOL 5c27a2f25fdb6af1aa5ce6d79abfafba139e7e7e7596eb06826c830a36cc85aef10382f9f74cad1e1224632ea2a3bc3a3c5ff2999563a330d04ffd68a294c965
+AUX cpufrequtils-change.sh 830 SHA256 75abed0366917770edcb95b8306b981bff6c039d76857f54e3f2b5a43517611b SHA512 cfc64f3bd6115c5ef9c26858d41ede1b7b670f040da79bd95426d01fe552bf2b0cd6839d37c62d07effddc45c134e0187ffd756c38cdfc47ad1986829bc0326c WHIRLPOOL f2f4e30d7013ec9586e7808576ff4c3a4ddb71d36daef0ec6b093d1167a2f90f6fd9fa975603be3d2f9fe5c830e09859f9a3835de6d88d807b7b07964509deb7
 AUX cpufrequtils-conf.d-006 398 SHA256 f93fed316a161977360a3764f503680316f88e9f8e40f264fccdfbb7d6a6e8d5 SHA512 9cd04f23277e895c9c2d05651fadd9aa6f9ee207e027901da23bc5f9ed65d3f57c9f389b42ad41fa2a9ff5e8e88917e5e7ae5d94bfefe4316fedca46f388b6f7 WHIRLPOOL 6343e50e8166f1a78d979c25448046f5b64c048416340ddd64ce5a45e26ddaf9b317800f6fe87bf107bb4b2f92a7fec7ebb4b1f9c5c7d00bea78affc834902d9
 AUX cpufrequtils-init.d-006 842 SHA256 f3f1978366eff38c419c0fecd531c0ba7a4e2573a1e95d8c02ad27487c925f96 SHA512 eefb59e56aab9ebc8e7697c681c335f50a799a8e781c5d4d425d1fcee21c4112238870568486de0d5e249c6716960d839550ae772b98dca52ebd0992f905826a WHIRLPOOL e8f3bd0e8284f6f29e5be40fd5f4ff4e17bb8f8302c272c335346a8c4fa2715df4bc743be864cd5a9129127d772b6776754e7f20d4f714d7c0486ed8e0561ee4
-AUX cpufrequtils-init.d-007 443 SHA256 171c6ac633c0fbd230d9aa079741a2d285854f2389613bae2712e282750a2500 SHA512 358470da7c48f01d88d0807e8cd280d6b4dea39749c276e7cdf2bb4895f157fece0221889780125d9fe9d456144a8a13b29d2d3e5815ab2bbe53f7821c39ff50 WHIRLPOOL ad610b80de5ef4609a031ddf48e6597867442a643d82d8dc49eff44a44d618b92062459ab314e933a61d6605ff5ad830f194d334bcace3648466f7d5dbc7cab0
-AUX cpufrequtils.service 296 SHA256 5bb7833648345f9f59bd3376c2f94deec1451abe753c9542f50266b2412fdbcb SHA512 a7796c67e1aea87d371b1c23f3abb7dd71316dbaed3b30b4099525e1ebd6679cd444df8b6632d8d11d631629d21a996e0f56c6f53247d8de057ec538d486b440 WHIRLPOOL df5da51e8902c4746d4232da1194116a6709487d926570ec17cc55030185a046ac9df2c686d92408bbe7a3e6c45c81a8b875d760a763aa476a5886873f4380bb
+AUX cpufrequtils-init.d-007 453 SHA256 af587557a66e14f560b65b8ec6f5b880d7f41426ff66205678be8be810bebe6e SHA512 34cde45a3b0959e6aeb7323e2a7550b9a9d981daa2bc5f5ddea9be26b401b5a8a5cdcdcbd55fac464fb879eb778c88e0d77543d4de3b802285fabe34c7f3cca9 WHIRLPOOL 9fbd47369644e9e7bb540dc990dde90d137c9b4a19c98fcc1c8f4f7a2b38056857ee4da21fdaa42af3ff22ca71ed3b7794e25c1d6a0d811fa9aa9ceea9ade94b
+AUX cpufrequtils.service 300 SHA256 a80052315721dccdc842160f446fb7f35d17051fc6fdbde26a1d840766c4d3c0 SHA512 a74b900e1ab892edf0d0018f9d3cc3e7f6814c27ea08a943e093d5016433cb9ec656853efd9c84a1f4af58c8b4815bf41fc4a37ad40ab3fae1b5751c149e72cc WHIRLPOOL 8c76722eb5ae7f24beaabd2cf64ad166181dc5db5d2138ce9d848b26d42f5fcbac1302ce86908590b78bffd2f402b490e2401b4a2fea09cf33998a615a65f3b5
 DIST cpufrequtils-008.tar.bz2 52186 SHA256 1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1 SHA512 d25dcc4fbf15bdca65a3fab6ee33d6cf4b7ab7ed291aea42ed7970b707535ddfcd27fd0189aa48affc2792abf72539f1388cc544019e6fc06353a2f9c5a49d17 WHIRLPOOL dde80900dde3cabf8f2582fed7f30fe34755010a14cf84457b7a53e793054535b8ecc66e493e5599a7e8a20d4f3cf892fff2f34f596659c232496e20482a6526
 EBUILD cpufrequtils-008-r1.ebuild 1896 SHA256 62561660708ac0832ba786c08e98315da5f754dff7f2ebf79083f44d7d69183c SHA512 2224445ba652e1fe540cf6f68a3a81cbf844d5081d577fd4db68a1e6bec69fe658b00e9db9585a02d221dff528be4d29ed5616c0b4a3a1e52861ecdfb25384a7 WHIRLPOOL b178c7c3d9da96905c9d6ccecb6dcf39d095f4f692c857b830cb703c87d49f1bf350149adca0b9f57cc4c2489866be6727f332f28414a6cbfbad9be5c90275a0
-EBUILD cpufrequtils-008-r2.ebuild 2026 SHA256 be966b650bde88e1c64066cfee76088fd9a865f6708d3ba5aa914c8682c8e0b0 SHA512 686b854d3c4b7415b7a422bf7326a3cb5add38556d4939e61fbe1048084a796723631902e8eb13cf95c14f6edb5c1ac82f957bd63d1c839853e01ed40ea4e90f WHIRLPOOL ef8ece239cf097ebda963d0ff9be09a88fe342c2fc2d8a3cffb9789b46002741c2de3841a28a7903669021ba245917087b5b79fae55b461c73764c409859b51c
-MISC ChangeLog 12339 SHA256 edfff6d771ec9bb10ec25dea79a90ef9fb5cdfbf07375abe6a2bd14e60c6b11a SHA512 371959614dbe34f7df989edd426fd18fb292e0a11b0b8e1b3dd1ce82ca2c70ab4621e155ca1cdf9700281e24e80cf25698deec5bbefcfdb6940ebbdb4158342c WHIRLPOOL fe52a1e0d383a4f900ba94d043a077b26da6ae9615eb00fa1e814364f07fe504529cab8fcd4d497c5bdac62b583755f1f99c226c8db41658af1b097b4d5d6fd7
+EBUILD cpufrequtils-008-r3.ebuild 2026 SHA256 48f28ec06e8bb337f8a13e996ce0b4be9f403eb957ae5c32ec020642aecd2082 SHA512 acbd56519dba138d2ff033e133680ef7ef98954109d8a26b0d79f7469af0698e9ea14ee078206dfca222e1c90e21ae661800d19834396d9b15d2a0c4c5f3850a WHIRLPOOL 27ffd835b74894a40c7d069b452c0bb7ac0fc0aa8f3c37b061918eaae625d630b639cdff827515ce5f4944102d0f3616cc3d3056776d4f1d3ae330ebba8dec50
+MISC ChangeLog 12629 SHA256 f562deee73370aabd4e55159702cf74ad76ad3d648d7912246934d56e79423d6 SHA512 2112bcc010fbb857115955af26b8dbe998169dd8b30ca0b42987cf6da4e04b1dffca08bd412b70988f69c9d8f6e84a19005882b85806a4433e4e27c420ee3177 WHIRLPOOL 99f09cae399118621fdcf8be7ae080208d279f4b2a6d9794d35c2cc3e688ad7c766ad11bedd0bf2c2d830f97f5235ae2cce4193d533ffc140fe2926d05cded97
 MISC metadata.xml 232 SHA256 8ae801887850df00c8cdbc188198ee88e9ed83425d87e49a042c38482761c21b SHA512 bcb999183962b932730fd3eb2d94f99a4e6e2f0f494f80b085277c5b0a119a47a066b3231d6e0acc89767140db39981c18ff6792f710086fcccc0bc92ace472f WHIRLPOOL f42084f673c2e73fc2c87c5686052407044035194de2eb575cd748adb07cdbbe540e66d3ae9981f3b8027bdd943f8136df1e7ffa16b70e5cbd26fec6ab4a6ae3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFzvVUACgkQfaj9zK3JFuV8RwCfTrttS2eMwFBOg7to67/7J6u8
-nf4An0CvoMYqcZR0VG471wd0TDb71IdG
-=SMQ2
+iEYEAREIAAYFAlGHj2YACgkQfaj9zK3JFuViSQCg5Lv4QWOmqy9qyalW1tiXbkMw
+6toAn18cNreDYC5O6KpYKTfqsXJ9y3Pz
+=0VHp
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-008-r2.ebuild b/sys-power/cpufrequtils/cpufrequtils-008-r3.ebuild
index d5ee5b5e7aef..712a4f3c8387 100644
--- a/sys-power/cpufrequtils/cpufrequtils-008-r2.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-008-r3.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/cpufrequtils/cpufrequtils-008-r2.ebuild,v 1.1 2013/04/21 09:21:07 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-008-r3.ebuild,v 1.1 2013/05/06 11:09:09 lxnay Exp $
 
 EAPI=4
 
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-change.sh b/sys-power/cpufrequtils/files/cpufrequtils-change.sh
index d6f3e21eef8a..65ae5f403074 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-change.sh
+++ b/sys-power/cpufrequtils/files/cpufrequtils-change.sh
@@ -1,10 +1,21 @@
 #!/bin/sh
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-change.sh,v 1.1 2013/04/21 09:21:06 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-change.sh,v 1.2 2013/05/06 11:09:09 lxnay Exp $
+
+ret=0 opts= gov_opts= sep=
+for o in "${@}" ; do
+	[ "${o}" == "--" ] && sep=1 && continue
+	if [ -n "${sep}" ]; then
+		gov_opts="${gov_opts} ${o}"
+	else
+		opts="${opts} ${o}"
+	fi
+done
+
+echo "cpufreq-set options: ${opts}"
+echo "Governor options: ${gov_opts}"
 
-ret=0 opts="${1}"
-shift
 for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
 	cpufreq-set -c ${c} ${opts}
 	: $(( ret += $? ))
@@ -13,7 +24,7 @@ done
 if [ $# -gt 0 ] ; then
 	c=1
 	if cd /sys/devices/system/cpu/cpufreq ; then
-		for o in "${@}"; do
+		for o in ${gov_opts}; do
 			v=${o#*=}
 			o=${o%%=*}
 			echo ${v} > ${o} || break
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-init.d-007 b/sys-power/cpufrequtils/files/cpufrequtils-init.d-007
index 3849e9fd5671..a17c4a473e5a 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-init.d-007
+++ b/sys-power/cpufrequtils/files/cpufrequtils-init.d-007
@@ -1,16 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2013 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-007,v 1.1 2013/04/21 09:21:06 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-007,v 1.2 2013/05/06 11:09:09 lxnay Exp $
 
 change() {
-	ebegin "Running cpufreq-set ${opts}"
-	/usr/libexec/cpufrequtils-change.sh "${@}"
+	ebegin "Running cpufreq-set ${*}"
+	/usr/libexec/cpufrequtils-change.sh "${@}" > /dev/null
 	eend $?
 }
 
 start() {
-	change "${START_OPTS}" ${SYSFS_EXTRA}
+	change ${START_OPTS} -- ${SYSFS_EXTRA}
 }
 
 stop() {
diff --git a/sys-power/cpufrequtils/files/cpufrequtils.service b/sys-power/cpufrequtils/files/cpufrequtils.service
index e969a357cc7a..1951ed3e246e 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils.service
+++ b/sys-power/cpufrequtils/files/cpufrequtils.service
@@ -3,9 +3,9 @@ Description=CPU frequency scaling via cpufrequtils
 
 [Service]
 EnvironmentFile=/etc/conf.d/cpufrequtils
-ExecStart=/usr/libexec/cpufrequtils-change.sh $START_OPTS $SYSFS_EXTRA
+ExecStart=/usr/libexec/cpufrequtils-change.sh $START_OPTS -- $SYSFS_EXTRA
 ExecReload=/usr/libexec/cpufrequtils-change.sh $STOP_OPTS
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target