fix bug 34891, move vars to conf file, backported to all ebuilds. -r1 moved to x86.

7 files changed, 57 insertions, 11 deletions

diff --git a/sys-apps/cpudyn/Manifest b/sys-apps/cpudyn/Manifest
index d7d29e6c3f14..7ca7f3a2b8c6 100644
--- a/sys-apps/cpudyn/Manifest
+++ b/sys-apps/cpudyn/Manifest
@@ -1,9 +1,9 @@
-MD5 10a623470f0cbc30127a42b154becabc ChangeLog 593
-MD5 e781b459ae3b51d0ac723e739e59d729 cpudyn-0.4.6.ebuild 927
-MD5 ca2836ea4a7a90e33759b258142cf5a7 cpudyn-0.4.7.ebuild 931
+MD5 1678ab5a07ad35e0c4d6551ab5229078 ChangeLog 881
+MD5 73eff0d2128a0d73a139af05f24267d6 cpudyn-0.4.6.ebuild 927
+MD5 0c01e3d0bffe43f9317cc88c612d0b91 cpudyn-0.4.7.ebuild 932
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-MD5 b529c0428768e8e459f1f4c7a529876b cpudyn-0.4.7-r1.ebuild 930
-MD5 bddf82ba72aa5b1c2f14b9ba08e0f8ad files/cpudyn.init 2273
+MD5 e763bbcfd3449a4308bbb807aa93fe61 cpudyn-0.4.7-r1.ebuild 934
+MD5 7177b71403ded492e472013faffff6e2 files/cpudyn.init 2273
 MD5 b013c06b8e09ed9137d72775c991aff1 files/digest-cpudyn-0.4.6 60
 MD5 ea25db65a0cf5097ff0d6c2eddd2665d files/digest-cpudyn-0.4.7 60
 MD5 ea25db65a0cf5097ff0d6c2eddd2665d files/digest-cpudyn-0.4.7-r1 60
diff --git a/sys-apps/cpudyn/cpudyn-0.4.6.ebuild b/sys-apps/cpudyn/cpudyn-0.4.6.ebuild
index c14c3c72ce3f..e8078152a632 100644
--- a/sys-apps/cpudyn/cpudyn-0.4.6.ebuild
+++ b/sys-apps/cpudyn/cpudyn-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.4.6.ebuild,v 1.1 2003/10/10 06:23:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.4.6.ebuild,v 1.2 2003/12/02 18:22:13 robbat2 Exp $
 
 DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
 HOMEPAGE="http://mnm.uib.es/~gallir/${PN}/"
@@ -20,6 +20,7 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/cpudyn.init cpudyn
 	insinto /etc/conf.d
+	cat ${FILESDIR}/cpudyn.conf.extra >>debian/cpudyn.conf
 	newins debian/cpudyn.conf cpudyn
 
 	into /usr
diff --git a/sys-apps/cpudyn/cpudyn-0.4.7-r1.ebuild b/sys-apps/cpudyn/cpudyn-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..d4429c505874
--- /dev/null
+++ b/sys-apps/cpudyn/cpudyn-0.4.7-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.4.7-r1.ebuild,v 1.1 2003/12/02 18:22:13 robbat2 Exp $
+
+DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
+HOMEPAGE="http://mnm.uib.es/~gallir/${PN}/"
+SRC_URI="http://mnm.uib.es/~gallir/${PN}/download/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake cpudynd || die "Compilation failed."
+}
+
+src_install() {
+	into /
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/cpudyn.init cpudyn
+	insinto /etc/conf.d
+	cat ${FILESDIR}/cpudyn.conf.extra >>debian/cpudyn.conf
+	newins debian/cpudyn.conf cpudyn
+
+	into /usr
+	doman cpudynd.8
+	dosbin cpudynd
+	dodoc INSTALL README VERSION changelog COPYING
+	dohtml *.html
+}
+
+pkg_postinst() {
+	einfo "Configuration file is /etc/conf.d/cpudyn."
+}
diff --git a/sys-apps/cpudyn/cpudyn-0.4.7.ebuild b/sys-apps/cpudyn/cpudyn-0.4.7.ebuild
index c1287612b14f..d8fd9e25f6c5 100644
--- a/sys-apps/cpudyn/cpudyn-0.4.7.ebuild
+++ b/sys-apps/cpudyn/cpudyn-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.4.7.ebuild,v 1.2 2003/11/02 06:11:14 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.4.7.ebuild,v 1.3 2003/12/02 18:22:13 robbat2 Exp $
 
 DESCRIPTION="A daemon to control laptop power consumption via cpufreq and disk standby"
 HOMEPAGE="http://mnm.uib.es/~gallir/${PN}/"
@@ -20,6 +20,7 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/cpudyn.init cpudyn
 	insinto /etc/conf.d
+	cat ${FILESDIR}/cpudyn.conf.extra >>debian/cpudyn.conf
 	newins debian/cpudyn.conf cpudyn
 
 	into /usr
diff --git a/sys-apps/cpudyn/files/cpudyn.conf.extra b/sys-apps/cpudyn/files/cpudyn.conf.extra
new file mode 100644
index 000000000000..0298d000d530
--- /dev/null
+++ b/sys-apps/cpudyn/files/cpudyn.conf.extra
@@ -0,0 +1,11 @@
+
+################################################
+# Special Startup Options
+# (you shouldn't need to change these)
+################################################
+# cpufreq sources for 2.4 kernels
+CPUFREQ_24="/proc/cpufreq"
+# cpufreq sources for 2.5/2.6 kernels
+CPUFREQ_25="/sys/devices/system/cpu/cpu0/cpufreq /sysfs/devices/system/cpu/cpu0/cpufreq"
+# pure acpi cpufreq
+CPUFREQ_ACPI="/proc/acpi/processor/CPU0/throttling"
diff --git a/sys-apps/cpudyn/files/cpudyn.init b/sys-apps/cpudyn/files/cpudyn.init
index 36208d9f4125..a35337bc3c6c 100644
--- a/sys-apps/cpudyn/files/cpudyn.init
+++ b/sys-apps/cpudyn/files/cpudyn.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/files/cpudyn.init,v 1.2 2003/10/22 01:17:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/files/cpudyn.init,v 1.3 2003/12/02 18:22:13 robbat2 Exp $
 #
 # Based on the Debian init script written by Celso Gonzalez <celso@bulma.net>,
 # and on the cpufreqd Gentoo init script written by Robert Gogolok <robertgogolok@web.de>.
@@ -17,9 +17,6 @@ depend() {
 }
 
 checkconfig() {
-	local CPUFREQ_24="/proc/cpufreq"
-	local CPUFREQ_25="/sys/devices/system/cpu/cpu0/cpufreq /sysfs/devices/system/cpu/cpu0/cpufreq"
-	local CPUFREQ_ACPI="/proc/acpi/processor/CPU0/throttling"
 	local CPUFREQ_FILES="${CPUFREQ_24} ${CPUFREQ_25} ${CPUFREQ_ACPI}"
 	local CPUFREQ_FILE=""
 	for i in ${CPUFREQ_FILES}; do [ -e ${i} ] && CPUFREQ_FILE="${i}" && break ; done
diff --git a/sys-apps/cpudyn/files/digest-cpudyn-0.4.7-r1 b/sys-apps/cpudyn/files/digest-cpudyn-0.4.7-r1
new file mode 100644
index 000000000000..7a1a82332e38
--- /dev/null
+++ b/sys-apps/cpudyn/files/digest-cpudyn-0.4.7-r1
@@ -0,0 +1 @@
+MD5 2550bf84873f78425c40dadae1000cad cpudyn-0.4.7.tgz 27327