Version bump, bug #113676. Removed pre-releases.

(Portage version: 2.0.51.22-r3)

11 files changed, 20 insertions, 302 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 7de12b9de3e0..95e5464c1f49 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.21 2005/11/21 23:34:33 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.22 2005/11/27 09:46:06 brix Exp $
+
+*cpufreqd-2.0.0 (27 Nov 2005)
+
+  27 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/cpufreqd-2.0.0-init.d, -files/cpufreqd-2.0.0-pre1-cpufreqd.conf,
+  -files/cpufreqd-2.0.0-pre1-nv.patch, -files/cpufreqd-2.0.0_pre1-init.d,
+  -files/cpufreqd-2.0.0_pre2-init.d, -cpufreqd-2.0.0_pre1-r1.ebuild,
+  -cpufreqd-2.0.0_pre2.ebuild, +cpufreqd-2.0.0.ebuild:
+  Version bump, bug #113676. Removed pre-releases.
 
   21 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
   cpufreqd-2.0.0_pre1-r1.ebuild, cpufreqd-2.0.0_pre2.ebuild:
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 815de1f16e33..8429c256881d 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,13 +1,8 @@
 MD5 ae4232c6e814691b97c24efa396281bf cpufreqd-1.2.3.ebuild 766
-MD5 728c29b49b62e0454af7e7e255140570 cpufreqd-2.0.0_pre2.ebuild 1839
-MD5 b093c2191862bd0af4c39241c6ebf6bf cpufreqd-2.0.0_pre1-r1.ebuild 1960
-MD5 ba112a3201c07196b54c4ce8d25b4e4d ChangeLog 6060
+MD5 c0c064048acfd9c4a7575bc0a9913f87 cpufreqd-2.0.0.ebuild 1737
+MD5 14bb29fc3fc70fa699a6e5be5ea31e28 ChangeLog 6469
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 4db9302e6a5ee36c9d8f0c3f0a760c4d files/cpufreqd-2.0.0_pre2-init.d 924
-MD5 95795535f5a0008b811ee27f41c03906 files/cpufreqd-2.0.0_pre1-init.d 924
-MD5 d70bc0faf394553981b6c960b724203b files/digest-cpufreqd-2.0.0_pre1-r1 134
-MD5 1ad2c167e774a2946ea647d8fd203795 files/cpufreqd-2.0.0-pre1-nv.patch 1277
-MD5 4fd32dc323c312bbedc6a5f27742e17c files/digest-cpufreqd-2.0.0_pre2 134
 MD5 df90962c83f1f87437ad708213cfcd23 files/digest-cpufreqd-1.2.3 66
-MD5 ef5357bf562da5e6617e64e98c47aaf3 files/cpufreqd-2.0.0-pre1-cpufreqd.conf 2128
+MD5 1c0f7f9cae4252395d5afdcd4be58f70 files/digest-cpufreqd-2.0.0 130
+MD5 4db9302e6a5ee36c9d8f0c3f0a760c4d files/cpufreqd-2.0.0-init.d 924
 MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
diff --git a/sys-power/cpufreqd/cpufreqd-2.0.0_pre2.ebuild b/sys-power/cpufreqd/cpufreqd-2.0.0.ebuild
index 340d8bd5cf51..9c3a725ba7f6 100644
--- a/sys-power/cpufreqd/cpufreqd-2.0.0_pre2.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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_pre2.ebuild,v 1.2 2005/11/21 23:34:33 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.0.0.ebuild,v 1.1 2005/11/27 09:46:06 brix Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ NVCLOCK_VERSION="0.8b"
 
 DESCRIPTION="CPU Frequency Daemon"
 HOMEPAGE="http://cpufreqd.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 		nvidia? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -45,7 +45,7 @@ src_compile() {
 		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
 	fi
 
-	cd ${S}
+	cd "${S}"
 	econf \
 		$(use_enable acpi) \
 		$(use_enable apm) \
diff --git a/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild b/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild
deleted file mode 100644
index bbe0786cfa44..000000000000
--- a/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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-r1.ebuild,v 1.4 2005/11/21 23:34:33 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
-		nvidia? ( 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 nvidia pmu"
-DEPEND="sys-power/cpufrequtils
-		lm_sensors? ( sys-apps/lm_sensors )"
-
-src_unpack() {
-	unpack ${A}
-
-	if use nvidia; then
-		cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
-		epatch ${FILESDIR}/nvclock${NVCLOCK_VERSION}-fd.patch
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-nv.patch
-}
-
-src_compile() {
-	local config
-
-	if use nvidia; 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-init.d b/sys-power/cpufreqd/files/cpufreqd-2.0.0-init.d
index 1415f73a4771..1ef3968904f2 100644
--- a/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre1-init.d
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0-init.d
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.0.0-init.d,v 1.1 2005/11/27 09:46:06 brix Exp $
 
 CONFIGFILE=/etc/cpufreqd.conf
 
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
deleted file mode 100644
index aa07c6c64968..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-cpufreqd.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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
deleted file mode 100644
index ef077e3445ca..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 10:08:19.000000000 +0200
-@@ -107,10 +107,9 @@ 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);
-+		if(nv_card.supported & GPU_OVERCLOCKING_SUPPORTED)
-+			nv_card.set_gpu_speed(nv->value);
-+		unset_card(nv->card);
- 	}
- }
- 
-@@ -120,10 +119,9 @@ 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);
-+		if(nv_card.supported & MEM_OVERCLOCKING_SUPPORTED)
-+			nv_card.set_memory_speed(nv->value);
-+		unset_card(nv->card);
- 	}
- }
- 
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre2-init.d b/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre2-init.d
deleted file mode 100644
index 8f934afa1666..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.0.0_pre2-init.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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_pre2-init.d,v 1.1 2005/11/02 19:33:24 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 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0
new file mode 100644
index 000000000000..fe5899d20ede
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0
@@ -0,0 +1,2 @@
+MD5 26a6e0795624114cc15aa48ad8b6ca6b cpufreqd-2.0.0.tar.bz2 256423
+MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1
deleted file mode 100644
index 8b9b27aed009..000000000000
--- a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a3b7315b06c1c68d3998f0cbb73783b cpufreqd-2.0.0-pre1.tar.gz 362917
-MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre2 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre2
deleted file mode 100644
index 7c0c16ef7688..000000000000
--- a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 af918101ee328e0d3e783281ad537bfd cpufreqd-2.0.0-pre2.tar.gz 371238
-MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127