Version bump.

Package-Manager: portage-2.1.2_rc2-r3

5 files changed, 152 insertions, 8 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index d3a38e6fe948..4f2e23033802 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.45 2006/11/30 16:14:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.46 2006/11/30 16:42:10 peper Exp $
+
+*cpufreqd-2.2.1 (30 Nov 2006)
+
+  30 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  +files/cpufreqd-2.2.1-init.d, +cpufreqd-2.2.1.ebuild:
+  Version bump.
 
   30 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
   -files/cpufreqd-2.0.0-init.d, -files/cpufreqd-2.1.0-init.d,
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 1803bf4e24af..30e40109ccc0 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -9,6 +9,10 @@ AUX cpufreqd-2.2.0-init.d 1133 RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 S
 MD5 9a07728d8a95118f743f7ce56c3dc02d files/cpufreqd-2.2.0-init.d 1133
 RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 files/cpufreqd-2.2.0-init.d 1133
 SHA256 c42a5fccdda0e030ad9215516236c9cb2024a3970bfa6bca7a85aa10ae863133 files/cpufreqd-2.2.0-init.d 1133
+AUX cpufreqd-2.2.1-init.d 1133 RMD160 e8b384de6fbcf78d315dccb3f8929e0745fc2e1d SHA1 c0f902ccf848aecb7b2efa193e62e2021ee798ae SHA256 c177575a205f4620d8e96f8350195b0f45abf35bdb4261f561d27281b74a77ad
+MD5 5e70b65d52c6aa49e8e35d1cbb35cb93 files/cpufreqd-2.2.1-init.d 1133
+RMD160 e8b384de6fbcf78d315dccb3f8929e0745fc2e1d files/cpufreqd-2.2.1-init.d 1133
+SHA256 c177575a205f4620d8e96f8350195b0f45abf35bdb4261f561d27281b74a77ad files/cpufreqd-2.2.1-init.d 1133
 AUX nvclock0.8b-fd.patch 580 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 SHA1 afd021a0144b6adb4dbb936f1a8181db609592fc SHA256 5dad49a3ce2a52b37c4711c497a46c373282bdf27b9b28834a0b5bd977066bf2
 MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 files/nvclock0.8b-fd.patch 580
@@ -23,6 +27,7 @@ RMD160 a18e4fbea3e8c30f45dd7e7988005709916370c2 files/nvclock0.8b2-fpic.patch 70
 SHA256 281aaec86579d9e9a2b940e52600b08bccf40284a14b57991619d29308f1de1c files/nvclock0.8b2-fpic.patch 706
 DIST cpufreqd-2.1.1.tar.bz2 285824 RMD160 06de622db37d67842133f6e1200f6fda24ec98d5 SHA1 d214dda81a7c1ef21b010fe79bbdf0289925495c SHA256 8693c78dd7c7a0b7c02b0d2c0d1ae6f5ce3f18b23c1b7b5c59e78715a307f814
 DIST cpufreqd-2.2.0.tar.bz2 292219 RMD160 2e61db9bac593ae564e5103c80b4c49b9a85011c SHA1 bed1c5fc8c3e42367d143c0d7da9ea6ab6774007 SHA256 13b857d23dff773965eb03a1531e6265627c328d5cc448ec4d446a7c54348d3b
+DIST cpufreqd-2.2.1.tar.bz2 287628 RMD160 ea2e66176edad38383f57143ce39bf0567aec812 SHA1 50244f33aaa65e01662682bdca26cf058180cdc3 SHA256 7aa39922c2aeecbd37916e445560aab8350e645b004cac4390a2ae547be7eb0a
 DIST nvclock0.8b.tar.gz 353127 RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 SHA1 ff0a9fe81a8f3227338ffccae143310df1b18551 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393
 EBUILD cpufreqd-2.1.1.ebuild 1626 RMD160 a1ca6f3c62dd41a8b2cbec269b80a9243af2de3c SHA1 8258275333daf97cb00e166ca8c87633ad2f72c2 SHA256 e2e245c1e659e0711e5011ed65356a59df15db4b79b8703ae80767e0b3133b69
 MD5 ca45ad8fc477bc7d527b935fde207c88 cpufreqd-2.1.1.ebuild 1626
@@ -32,10 +37,14 @@ EBUILD cpufreqd-2.2.0-r2.ebuild 1880 RMD160 a4ea5996f45759439b9b664abb03e4a6f898
 MD5 5e92b3fb1708a86b229992ce82d11a99 cpufreqd-2.2.0-r2.ebuild 1880
 RMD160 a4ea5996f45759439b9b664abb03e4a6f8988858 cpufreqd-2.2.0-r2.ebuild 1880
 SHA256 db0380c85d141703194230201ef08454a729a658f6e5cd78abe9ef9bee767c98 cpufreqd-2.2.0-r2.ebuild 1880
-MISC ChangeLog 10494 RMD160 9407441d18266e49a085462a3c0b7d5f42e989dd SHA1 eb676f9135b36c565fdb098d72a8bfc5ea2096f7 SHA256 1d8b36fd273ce902d00e5760330504b671c16b30123440611f78da85b1e5f78b
-MD5 a5bed23b81982d8491deebf18a1992bd ChangeLog 10494
-RMD160 9407441d18266e49a085462a3c0b7d5f42e989dd ChangeLog 10494
-SHA256 1d8b36fd273ce902d00e5760330504b671c16b30123440611f78da85b1e5f78b ChangeLog 10494
+EBUILD cpufreqd-2.2.1.ebuild 1876 RMD160 28259481b49de02d438dd8767f35eaba37c83071 SHA1 15f97b1a052c66104db2bf3dcb2f5e7674b93b40 SHA256 0432b2d9e17ae65d290d6f846f5b3e3440e97384e9eadafd405fd917c6cfab72
+MD5 ed58f5b7940e624d729570779f47d987 cpufreqd-2.2.1.ebuild 1876
+RMD160 28259481b49de02d438dd8767f35eaba37c83071 cpufreqd-2.2.1.ebuild 1876
+SHA256 0432b2d9e17ae65d290d6f846f5b3e3440e97384e9eadafd405fd917c6cfab72 cpufreqd-2.2.1.ebuild 1876
+MISC ChangeLog 10651 RMD160 bf69bdadb17f66d818a82e7aae1348f188ff0e37 SHA1 3dd17edb00ac63e6acf822f12745773a48daa436 SHA256 3340fc14742c7a850fc606d78967f9ac9900a9eaf2eb491d22023ff22b526844
+MD5 1f12be3fa7298da9a568816b0a4d9fee ChangeLog 10651
+RMD160 bf69bdadb17f66d818a82e7aae1348f188ff0e37 ChangeLog 10651
+SHA256 3340fc14742c7a850fc606d78967f9ac9900a9eaf2eb491d22023ff22b526844 ChangeLog 10651
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -46,10 +55,13 @@ SHA256 d4e8e35e673798e45c2eed31d735c475a39515027864a796e387df7210d18942 files/di
 MD5 2bf021953099bfb20f6a6d71a6a9e2d9 files/digest-cpufreqd-2.2.0-r2 482
 RMD160 7aa959463eae588a3f8737b217c07e66f6e82b4f files/digest-cpufreqd-2.2.0-r2 482
 SHA256 ece8527560ea346e55eca1f480239b7744db81a6c842424e08a86af247f6b411 files/digest-cpufreqd-2.2.0-r2 482
+MD5 7189f2037d95a8b59b409460cda4b07c files/digest-cpufreqd-2.2.1 482
+RMD160 0102e92dda98b8bb18c1d34284bb9815aba455bb files/digest-cpufreqd-2.2.1 482
+SHA256 868c3e1002f7fe14ca68532470a7b8868dd64b8cfe258c5b4dfa20d197642828 files/digest-cpufreqd-2.2.1 482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFbwOgppoStNGKGywRArcOAKCaWiRmWlThomQl4lViGPxnpPsTqQCff76A
-IfzqtxrN/nbjLJqSPhJbIas=
-=/FAi
+iD8DBQFFbwnpppoStNGKGywRAkbIAJ0WTI6HSWi0r5QWdeDW1CfEnFHYrQCgrxmd
+0QBaSBFK7zsBwpuJN2Sg9Yg=
+=Tc/S
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
new file mode 100644
index 000000000000..542ca02c885f
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild,v 1.1 2006/11/30 16:42:10 peper Exp $
+
+inherit eutils autotools
+
+NVCLOCK_VERSION="0.8b"
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://cpufreqd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		nvidia? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
+RDEPEND=">=sys-power/cpufrequtils-002
+		lm_sensors? ( sys-apps/lm_sensors )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:acpi_event:acpi:" "${S}"/cpufreqd.conf
+
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fpic.patch
+	fi
+}
+
+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() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	newinitd "${FILESDIR}"/${P}-init.d ${PN}
+}
+
+pkg_postinst() {
+	if [ -f "${ROOT}"/etc/conf.d/cpufreqd ] ; then
+		ewarn "Please make sure, you remove \"/etc/conf.d/cpufreqd\". It breaks"
+		ewarn "the init-script! (#152096)"
+		ewarn
+		ewarn "Use this if you don't know how to do it:"
+		ewarn "# rm /etc/conf.d/cpufreqd"
+	fi
+}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d b/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d
new file mode 100644
index 000000000000..b7ffa4f0a2ed
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d,v 1.1 2006/11/30 16:42:10 peper Exp $
+
+CONFIGFILE=/etc/cpufreqd.conf
+
+depend() {
+	need localmount
+	use logger lm_sensors
+}
+
+checkconfig() {
+	if [[ ! -f ${CONFIGFILE} ]]; then
+		eerror "Configuration file ${CONFIGFILE} not found"
+		return 1
+	fi
+
+	if [[ ! -e /proc/cpufreq ]] ; then
+		for cpu in /sys/devices/system/cpu/cpu[0-9]* ; do
+                        # We need just one cpu supporting freq scaling.
+                        [[ -e ${cpu}/cpufreq ]] && return 0
+		done
+		eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
+		eerror "Make sure that the appropiate drivers for your CPU are available."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting CPU Frequency Daemon"
+	start-stop-daemon --start --exec /usr/sbin/cpufreqd -- \
+		-f ${CONFIGFILE}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping CPU Frequency Daemon"
+	start-stop-daemon --stop --exec /usr/sbin/cpufreqd
+	eend ${?}
+}
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.2.1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.2.1
new file mode 100644
index 000000000000..4ee4483432c5
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.2.1
@@ -0,0 +1,6 @@
+MD5 e66f22915c8ce609cd0c8f254da11c08 cpufreqd-2.2.1.tar.bz2 287628
+RMD160 ea2e66176edad38383f57143ce39bf0567aec812 cpufreqd-2.2.1.tar.bz2 287628
+SHA256 7aa39922c2aeecbd37916e445560aab8350e645b004cac4390a2ae547be7eb0a cpufreqd-2.2.1.tar.bz2 287628
+MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127
+RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 nvclock0.8b.tar.gz 353127
+SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393 nvclock0.8b.tar.gz 353127