Added patch from upstream to fix cpu/cpu_interval confusion as noted in bug #103798.

(Portage version: 2.0.51.22-r2)

5 files changed, 107 insertions, 12 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 15baaa8f481e..cb3bf8ec65c6 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.11 2005/08/28 14:05:10 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.12 2005/08/29 20:20:18 brix Exp $
+
+*cpufreqd-2.0.0_beta4-r1 (29 Aug 2005)
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff,
+  +cpufreqd-2.0.0_beta4-r1.ebuild:
+  Added patch from upstream to fix cpu/cpu_interval confusion as noted in bug
+  #103798.
 
   28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> cpufreqd-1.2.3.ebuild:
   Stable on amd64.
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index f731408ea15a..56167cc9a6b1 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ae4232c6e814691b97c24efa396281bf cpufreqd-1.2.3.ebuild 766
 MD5 c6180b3ca46ef20c71ded9c11eb06847 cpufreqd-2.0.0_beta4.ebuild 1146
 MD5 957cdc8541deb498c827b66b7a263bc1 cpufreqd-1.2.2.ebuild 768
-MD5 3a653d50f8d61172bb0c1c3613db4312 ChangeLog 4122
+MD5 60d010295c7fa2bedf7f47955b94bb71 cpufreqd-2.0.0_beta4-r1.ebuild 1138
+MD5 109140fe7030e7b2d87cabe16b012b18 ChangeLog 4404
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 6dfe51aafe839f3c3b78cd74a950c5f2 files/cpufreqd-2.0.0_beta4-init.d 913
 MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4 72
+MD5 dcec17ebe03bdb9837bfe7285e812a85 files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff 1276
 MD5 67d3999fd7d01ffce53d07c879735c6e files/digest-cpufreqd-1.2.2 66
 MD5 df90962c83f1f87437ad708213cfcd23 files/digest-cpufreqd-1.2.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDEcStntT9W3vfTuoRAk4LAJ952CZPtFv6dcC3VnNenndVjJJ31gCfVwhW
-0m96P86ErPJPrxSpVhiTsys=
-=H07w
------END PGP SIGNATURE-----
+MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4-r1 72
diff --git a/sys-power/cpufreqd/cpufreqd-2.0.0_beta4-r1.ebuild b/sys-power/cpufreqd/cpufreqd-2.0.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..8eddfba4e635
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.0.0_beta4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.0.0_beta4-r1.ebuild,v 1.1 2005/08/29 20:20:18 brix Exp $
+
+inherit eutils linux-info
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://cpufreqd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND="sys-power/cpufrequtils"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="CPU_FREQ"
+ERROR_CPU_FREQ="${P} requires support for CPU Frequency scaling (CONFIG_CPU_FREQ)"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-cpu_interval_inconsistency.diff
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Significant changes have happened since the 1.x releases, including"
+	einfo "changes in the configuration file format."
+	einfo
+	einfo "Make sure you update your /etc/cpufreqd.conf file before starting"
+	einfo "${PN}. You can use 'etc-update' to accomplish this:"
+	einfo
+    einfo "  # etc-update"
+	einfo
+}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff b/sys-power/cpufreqd/files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff
new file mode 100644
index 000000000000..994fab7f89ec
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff
@@ -0,0 +1,43 @@
+Index: cpufreqd.conf
+===================================================================
+RCS file: /cvsroot/cpufreqd/sources2/cpufreqd.conf,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- cpufreqd.conf	21 Aug 2005 18:40:02 -0000	1.6
++++ cpufreqd.conf	29 Aug 2005 16:30:49 -0000	1.7
+@@ -139,7 +139,7 @@
+ [Rule]
+ name=CPU Too Hot
+ acpi_temperature=55-100
+-cpu=30-100
++cpu_interval=30-100
+ profile=Performance Low
+ [/Rule]
+ 
+@@ -151,7 +151,7 @@
+ programs=xine,mplayer,gmaplayer
+ battery_interval=0-100
+ acpi_temperature=0-60
+-cpu=0-100
++cpu_interval=0-100
+ profile=Performance High
+ [/Rule]
+ 
+Index: src/cpufreqd_cpu.c
+===================================================================
+RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_cpu.c,v
+retrieving revision 1.9
+retrieving revision 1.11
+diff -u -r1.9 -r1.11
+--- src/cpufreqd_cpu.c	18 Aug 2005 20:45:36 -0000	1.9
++++ src/cpufreqd_cpu.c	29 Aug 2005 16:55:16 -0000	1.11
+@@ -43,7 +43,7 @@
+ static unsigned int delta_time, kernel_version;
+ 
+ static struct cpufreqd_keyword kw[] = {
+-	{ .word = "cpu", .parse = &cpu_parse, .evaluate = &cpu_evaluate },
++	{ .word = "cpu_interval", .parse = &cpu_parse, .evaluate = &cpu_evaluate },
+ 	{ .word = NULL, .parse = NULL, .evaluate = NULL, .free = NULL }
+ };
+ 
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_beta4-r1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_beta4-r1
new file mode 100644
index 000000000000..576f49f75e13
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_beta4-r1
@@ -0,0 +1 @@
+MD5 ead34f298bc2e2e6f227ea03350e588f cpufreqd-2.0.0-beta4.tar.gz 456917