Version bump, bug #107334 and bug #103877. Thanks to Prakash Punnoor.

(Portage version: 2.0.51.22-r3)

8 files changed, 316 insertions, 17 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 98339b254dd3..c9285a738b45 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.14 2005/09/17 00:44:43 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.15 2005/10/16 21:25:31 brix Exp $
+
+*cpufreqd-2.0.0_pre1 (16 Oct 2005)
+
+  16 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/nvclock0.8b-fd.patch, +files/cpufreqd-2.0.0-pre1-cpufreqd.conf,
+  +files/cpufreqd-2.0.0-pre1-nv.patch, +files/cpufreqd-2.0.0_pre1-init.d,
+  +cpufreqd-2.0.0_pre1.ebuild:
+  Version bump, bug #107334 and bug #103877. Thanks to Prakash Punnoor.
 
   17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 781a96dd8487..d8d3438b8f0f 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,22 +1,18 @@
------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 650534575443da96a38b9d3252cb9c14 cpufreqd-2.0.0_beta4-r1.ebuild 1248
+MD5 87c343705b83039959722c7c849f18bc cpufreqd-2.0.0_pre1.ebuild 1845
+MD5 afbab3d6b7f96af64bb7d089561a9d42 ChangeLog 4988
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 11d8e50f265ef747379f2a2b9d046e21 ChangeLog 4647
-MD5 c6180b3ca46ef20c71ded9c11eb06847 cpufreqd-2.0.0_beta4.ebuild 1146
-MD5 ae4232c6e814691b97c24efa396281bf cpufreqd-1.2.3.ebuild 766
+MD5 4e4afcab33d4f570322c2f9a449adeb4 files/cpufreqd-2.0.0_beta4-init.d 925
+MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4 72
 MD5 dcec17ebe03bdb9837bfe7285e812a85 files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff 1276
-MD5 df90962c83f1f87437ad708213cfcd23 files/digest-cpufreqd-1.2.3 66
+MD5 f87c95a27cbaa483e8d2ffe10daea2e1 files/cpufreqd-2.0.0_pre1-init.d 813
+MD5 70d89fafd6f395ce87de3c21dad7dbdc files/cpufreqd-2.0.0-pre1-nv.patch 1098
+MD5 d70bc0faf394553981b6c960b724203b files/digest-cpufreqd-2.0.0_pre1 134
 MD5 67d3999fd7d01ffce53d07c879735c6e files/digest-cpufreqd-1.2.2 66
-MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4 72
+MD5 df90962c83f1f87437ad708213cfcd23 files/digest-cpufreqd-1.2.3 66
 MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4-r1 72
-MD5 4e4afcab33d4f570322c2f9a449adeb4 files/cpufreqd-2.0.0_beta4-init.d 925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK2cvLLFUmVNQ7rkRAgxcAJ4kPiiro+twhczqmJHop5hrx+Ka1gCeKZo0
-x7QpUtR7Ay5K4/iu9FXNVEo=
-=qet5
------END PGP SIGNATURE-----
+MD5 ef5357bf562da5e6617e64e98c47aaf3 files/cpufreqd-2.0.0-pre1-cpufreqd.conf 2128
+MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
diff --git a/sys-power/cpufreqd/cpufreqd-2.0.0_pre1.ebuild b/sys-power/cpufreqd/cpufreqd-2.0.0_pre1.ebuild
new file mode 100644
index 000000000000..d64bdff4840a
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.0.0_pre1.ebuild
@@ -0,0 +1,82 @@
+# 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_pre1.ebuild,v 1.1 2005/10/16 21:25:31 brix Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+NVCLOCK_VERSION="0.8b"
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://cpufreqd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+		nvidea? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="acpi apm lm_sensors nforce2 nvidea pmu"
+DEPEND="sys-power/cpufrequtils
+		lm_sensors? ( sys-apps/lm_sensors )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+	epatch ${FILESDIR}/nvclock${NVCLOCK_VERSION}-fd.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-nv.patch
+}
+
+src_compile() {
+	local config
+
+	if use nvidea; then
+		cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+		econf \
+			--disable-gtk \
+			--disable-qt \
+			--disable-nvcontrol \
+			|| die "econf nvclock failed"
+		emake -j1 || die "emake nvclock failed"
+		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
+	fi
+
+	cd ${S}
+	econf \
+		$(use_enable acpi) \
+		$(use_enable apm) \
+		$(use_enable lm_sensors sensors) \
+		$(use_enable nforce2) \
+		$(use_enable pmu) \
+		${config} \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+
+	insinto /etc
+	newins ${FILESDIR}/${MY_P}-cpufreqd.conf cpufreqd.conf
+}
+
+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-pre1-cpufreqd.conf b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-cpufreqd.conf
new file mode 100644
index 000000000000..aa07c6c64968
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-cpufreqd.conf
@@ -0,0 +1,132 @@
+# this is a comment
+# see CPUFREQD.CONF(5) manpage for a complete reference
+
+[General]
+  pidfile=/var/run/cpufreqd.pid
+  poll_interval=3
+#  enable_plugins= programs,acpi_ac,cpu,acpi_battery,acpi_temperature,nforce2,sensors,nvclock,apm,pmu
+  verbosity=5
+[/General]
+
+#[nforce2_atxp1]
+#vcore_path=/some/path
+#vcore_default=1500
+#[/nforce2_atxp1]
+
+#[sensors_plugin]
+#sensors_conf=/some/file
+#[/sensors_plugin]
+
+[Profile]
+name=On Demand High
+minfreq=40%
+maxfreq=100%
+policy=ondemand
+[/Profile]
+
+[Profile]
+name=On Demand Low
+minfreq=20%
+maxfreq=80%
+policy=ondemand
+[/Profile]
+
+[Profile]
+name=Performance High
+minfreq=100%
+maxfreq=100%
+policy=performance
+[/Profile]
+
+[Profile]
+name=Performance Low
+minfreq=80%
+maxfreq=80%
+policy=performance
+[/Profile]
+
+[Profile]
+name=Powersave High
+minfreq=70%
+maxfreq=70%
+policy=powersave
+[/Profile]
+
+[Profile]
+name=Powersave Low
+minfreq=30%
+maxfreq=30%
+policy=powersave
+[/Profile]
+
+#[Profile]
+#name=Conservative High
+#minfreq=33%
+#maxfreq=100%
+#policy=conservative
+#[/Profile]
+#
+#[Profile]
+#name=Conservative Low
+#minfreq=0%
+#maxfreq=66%
+#policy=conservative
+#[/Profile]
+
+##
+# Basic states
+##
+# when AC use performance mode
+[Rule]
+name=AC Rule
+ac=on                    # (on/off)
+profile=Performance High
+[/Rule]
+ 
+# conservative mode when not AC
+[Rule]
+name=AC Off - Low Battery
+ac=off                   # (on/off)
+battery_interval=0-30
+profile=Powersave Low
+[/Rule]
+
+# conservative mode when not AC
+[Rule]
+name=AC Off - Medium Battery
+ac=off                   # (on/off)
+battery_interval=30-70
+profile=On Demand Low
+[/Rule]
+
+# stay in performance mode for the first minutes
+[Rule]
+name=AC Off - High Power
+ac=off                   # (on/off)
+battery_interval=70-100
+profile=On Demand High
+[/Rule]
+
+##
+# Special Rules
+##
+# CPU Too hot!
+[Rule]
+name=CPU Too Hot
+acpi_temperature=55-100
+cpu_interval=50-100
+profile=Performance Low
+[/Rule]
+
+# use performance mode if I'm watching a movie
+# I don't care for batteries! 
+# But don't heat too much.
+[Rule]
+name=Movie Watcher
+programs=xine,mplayer,gmaplayer
+battery_interval=0-100
+acpi_temperature=0-60
+cpu_interval=0-100
+profile=Performance High
+[/Rule]
+
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
new file mode 100644
index 000000000000..3e8f36e02f45
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
@@ -0,0 +1,29 @@
+diff -urp cpufreqd-2.0.0-pre1/src/cpufreqd_nvclock.c cpufreqd-2.0.0-pre1-nv/src/cpufreqd_nvclock.c
+--- cpufreqd-2.0.0-pre1/src/cpufreqd_nvclock.c	2005-09-24 20:13:53.000000000 +0200
++++ cpufreqd-2.0.0-pre1-nv/src/cpufreqd_nvclock.c	2005-10-17 00:58:41.000000000 +0200
+@@ -106,11 +106,11 @@ static void nvcore_change(void *obj, con
+ 	
+ 	if (nv->card < nvclock.num_cards) {
+ 		clog(LOG_INFO, "Setting nv_core for card %i to (%u)\n", nv->card, nv->value);
+-		set_card(nv->card);
+ 		nvclock.card[nv->card].gpu = DESKTOP;
+ 		nv_card.number = -1; /* Force a re-init of the function pointers */
+ 		set_card(nv->card);
+ 		nv_card.set_gpu_speed(nv->value);
++		unset_card(nv->card);
+ 	}
+ }
+ 
+@@ -119,11 +119,11 @@ static void nvmem_change(void *obj, cons
+ 	
+ 	if (nv->card < nvclock.num_cards) {
+ 		clog(LOG_INFO, "Setting nv_mem for card %i to (%u)\n", nv->card, nv->value);
+-		set_card(nv->card);
+ 		nvclock.card[nv->card].gpu = DESKTOP;
+ 		nv_card.number = -1; /* Force a re-init of the function pointers */
+ 		set_card(nv->card);
+ 		nv_card.set_memory_speed(nv->value);
++		unset_card(nv->card);
+ 	}
+ }
+ 
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre1-init.d b/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre1-init.d
new file mode 100644
index 000000000000..1415f73a4771
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre1-init.d
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre1-init.d,v 1.1 2005/10/16 21:25:31 brix Exp $
+
+CONFIGFILE=/etc/cpufreqd.conf
+
+depend() {
+	need localmount
+	use logger
+}
+
+checkconfig() {
+	if [[ ! -f ${CONFIGFILE} ]]; then
+		eerror "Configuration file ${CONFIGFILE} not found"
+		return 1
+	fi
+
+	if [[ ! -e /proc/cpufreq ]] && [[ ! -e /sys/devices/system/cpu/cpu0/cpufreq ]]; then
+		eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting CPU Frequency Daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cpufreqd -- \
+		-f ${CONFIGFILE}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping CPU Frequency Daemon"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cpufreqd
+	eend ${?}
+}
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1
new file mode 100644
index 000000000000..8b9b27aed009
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1
@@ -0,0 +1,2 @@
+MD5 5a3b7315b06c1c68d3998f0cbb73783b cpufreqd-2.0.0-pre1.tar.gz 362917
+MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127
diff --git a/sys-power/cpufreqd/files/nvclock0.8b-fd.patch b/sys-power/cpufreqd/files/nvclock0.8b-fd.patch
new file mode 100644
index 000000000000..8925816e7e89
--- /dev/null
+++ b/sys-power/cpufreqd/files/nvclock0.8b-fd.patch
@@ -0,0 +1,12 @@
+diff -urp nvclock0.8b/src/backend/back_linux.c nvclock0.8b-fd/src/backend/back_linux.c
+--- nvclock0.8b/src/backend/back_linux.c	2005-08-29 13:44:56.000000000 +0200
++++ nvclock0.8b-fd/src/backend/back_linux.c	2005-10-17 01:03:09.000000000 +0200
+@@ -260,6 +260,8 @@ int map_mem(const char *dev_name)
+     nv_card.PCIO    = map_dev_mem(fd, nv_card.reg_address + 0x601000, 0x2000);
+     nv_card.PRAMDAC = map_dev_mem(fd, nv_card.reg_address + 0x680000, 0x2000);
+     nv_card.PROM    = map_dev_mem(fd, nv_card.reg_address + 0x300000, 0xffff);
++
++    close(fd);
+     
+     return 1;
+ }