fixed bugs #38482, #37619, #32523.

7 files changed, 147 insertions, 9 deletions

diff --git a/sys-apps/cpudyn/ChangeLog b/sys-apps/cpudyn/ChangeLog
index 909fd5a5bb0f..3c9842aa54d0 100644
--- a/sys-apps/cpudyn/ChangeLog
+++ b/sys-apps/cpudyn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/cpudyn
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/ChangeLog,v 1.3 2003/12/02 18:22:13 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/ChangeLog,v 1.4 2004/01/20 00:34:36 robbat2 Exp $
+
+*cpudyn-0.5.0 (19 Jan 2004)
+
+  19 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> cpudyn-0.5.0.ebuild,
+  cpudyn-0.6.1.ebuild, files/cpudyn-0.5.0-init_conf_updates.patch:
+  fixed bugs #38482, #37619, #32523.
 
 *cpudyn-0.4.7-r1 (02 Dec 2003)
 
diff --git a/sys-apps/cpudyn/Manifest b/sys-apps/cpudyn/Manifest
index 0ba1133e99e6..f4fe5329f576 100644
--- a/sys-apps/cpudyn/Manifest
+++ b/sys-apps/cpudyn/Manifest
@@ -1,11 +1,15 @@
+MD5 73eff0d2128a0d73a139af05f24267d6 cpudyn-0.4.6.ebuild 927
+MD5 e763bbcfd3449a4308bbb807aa93fe61 cpudyn-0.4.7-r1.ebuild 934
+MD5 bb1ef73954f9470f59c0d45f98f5a91e cpudyn-0.6.1.ebuild 948
+MD5 1678ab5a07ad35e0c4d6551ab5229078 ChangeLog 881
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d708b7591e4b554647d68be78431cb79 cpudyn-0.4.7.ebuild 930
+MD5 ad6e87d582099a1cf095cddb15a3eef1 cpudyn-0.5.0.ebuild 941
+MD5 66cafade66033a014e49e2b1b8c6957c files/cpudyn-0.5.0-init_conf_updates.patch 1307
 MD5 ea25db65a0cf5097ff0d6c2eddd2665d files/digest-cpudyn-0.4.7-r1 60
-MD5 6a46f6986c00898e09a6d44274ec18c9 files/cpudyn.init 2274
+MD5 7177b71403ded492e472013faffff6e2 files/cpudyn.init 2273
 MD5 5a7b58f7786e6926c3a9dc4f6520e09d files/cpudyn.conf.extra 424
 MD5 b013c06b8e09ed9137d72775c991aff1 files/digest-cpudyn-0.4.6 60
 MD5 ea25db65a0cf5097ff0d6c2eddd2665d files/digest-cpudyn-0.4.7 60
-MD5 50bdfc10ccc26013cc4ae6953f9edb5f cpudyn-0.4.6.ebuild 928
-MD5 c63dad22fff1ade42493b5361a27257c cpudyn-0.4.7-r1.ebuild 935
-MD5 144158b8d2d4aaf9a8e7b17595fa1f5e .#Manifest.1.10 617
-MD5 cb24fc30b3217c5e55147c6ab32cd99c ChangeLog 882
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 7f8eec56febae37ca92076ca12b6e43a cpudyn-0.4.7.ebuild 931
+MD5 870f5dd221d7c2c2271ea0d6b3dbb643 files/digest-cpudyn-0.5.0 60
+MD5 076f3a56fd59ad2c6758ee12da211b28 files/digest-cpudyn-0.6.1 60
diff --git a/sys-apps/cpudyn/cpudyn-0.5.0.ebuild b/sys-apps/cpudyn/cpudyn-0.5.0.ebuild
new file mode 100644
index 000000000000..d8eaf24d9d79
--- /dev/null
+++ b/sys-apps/cpudyn/cpudyn-0.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.5.0.ebuild,v 1.1 2004/01/20 00:34:36 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_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir gentoo
+	cp debian/cpudyn.conf gentoo
+	cp ${FILESDIR}/cpudyn.init gentoo
+	epatch ${FILESDIR}/${P}-init_conf_updates.patch
+}
+
+src_compile() {
+	emake cpudynd || die "Compilation failed."
+}
+
+src_install() {
+	into /
+	exeinto /etc/init.d
+	newexe gentoo/cpudyn.init cpudyn
+	insinto /etc/conf.d
+	newins gentoo/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.6.1.ebuild b/sys-apps/cpudyn/cpudyn-0.6.1.ebuild
new file mode 100644
index 000000000000..6219828052e2
--- /dev/null
+++ b/sys-apps/cpudyn/cpudyn-0.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpudyn/cpudyn-0.6.1.ebuild,v 1.1 2004/01/20 00:34:36 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_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir gentoo
+	cp debian/cpudyn.conf gentoo
+	cp ${FILESDIR}/cpudyn.init gentoo
+	epatch ${FILESDIR}/${PN}-0.5.0-init_conf_updates.patch
+}
+
+src_compile() {
+	emake cpudynd || die "Compilation failed."
+}
+
+src_install() {
+	into /
+	exeinto /etc/init.d
+	newexe gentoo/cpudyn.init cpudyn
+	insinto /etc/conf.d
+	newins gentoo/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/files/cpudyn-0.5.0-init_conf_updates.patch b/sys-apps/cpudyn/files/cpudyn-0.5.0-init_conf_updates.patch
new file mode 100644
index 000000000000..08d1f5e725d0
--- /dev/null
+++ b/sys-apps/cpudyn/files/cpudyn-0.5.0-init_conf_updates.patch
@@ -0,0 +1,40 @@
+--- gentoo/cpudyn.conf.orig	2004-01-08 17:20:39.575230665 +0100
++++ gentoo/cpudyn.conf	2004-01-08 17:20:37.450290151 +0100
+@@ -32,6 +32,12 @@
+ 
+ THROTTLING_LOW=7
+ 
++#
++# Count also niced process in CPU usage. Default is no.
++#
++
++#NICE=yes
++
+ ################################################
+ # DISK OPTIONS
+ # (disabled by default)
+@@ -51,4 +57,14 @@
+ # DISKS=/dev/hda,/dev/hdb
+ 
+ 
++################################################
++# 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"
+ 
+--- gentoo/cpudyn.init.orig	2004-01-08 17:15:08.404162507 +0100
++++ gentoo/cpudyn.init	2004-01-08 17:17:06.697265020 +0100
+@@ -51,6 +51,7 @@
+ 	if [ -n "$THROTTLING_LOW" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -l $THROTTLING_LOW"; fi
+ 	if [ -n "$TIMEOUT" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -t $TIMEOUT"; fi
+ 	if [ -n "$DISKS" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -h $DISKS"; fi
++	if [ "$NICE" == "yes" ]; then CPUDYN_OPTS="$CPUDYN_OPTS -nice"; fi
+ 
+ 	ebegin "Starting cpudynd"
+ 	if checkconfig; then
diff --git a/sys-apps/cpudyn/files/digest-cpudyn-0.5.0 b/sys-apps/cpudyn/files/digest-cpudyn-0.5.0
new file mode 100644
index 000000000000..950feb8b1e41
--- /dev/null
+++ b/sys-apps/cpudyn/files/digest-cpudyn-0.5.0
@@ -0,0 +1 @@
+MD5 33db9d7547f72e8ddad3d3316a23b828 cpudyn-0.5.0.tgz 28627
diff --git a/sys-apps/cpudyn/files/digest-cpudyn-0.6.1 b/sys-apps/cpudyn/files/digest-cpudyn-0.6.1
new file mode 100644
index 000000000000..221e9a531372
--- /dev/null
+++ b/sys-apps/cpudyn/files/digest-cpudyn-0.6.1
@@ -0,0 +1 @@
+MD5 879e95eb14ebcd53fbb8f79262ab4a52 cpudyn-0.6.1.tgz 29637