Version bump. Also bumping the nvclock to use the latest one available from UPSTREAM (0.8b2).

Package-Manager: portage-2.1.2_pre2-r5

5 files changed, 120 insertions, 8 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 2bb8b999ea9d..7d7f55593b3c 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2006/10/07 06:45:42 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.36 2006/10/07 07:00:29 phreak Exp $
+
+*cpufreqd-2.2.0 (07 Oct 2006)
+
+  07 Oct 2006; Christian Heim <phreak@gentoo.org>
+  +files/nvclock0.8b2-fpic.patch, +cpufreqd-2.2.0.ebuild:
+  Version bump. Also bumping the nvclock to use the latest one available from
+  UPSTREAM (0.8b2).
 
   07 Oct 2006; Christian Heim <phreak@gentoo.org> cpufreqd-2.1.0.ebuild,
   cpufreqd-2.1.1.ebuild:
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 14410b3f3787..35fcd3997e6e 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -21,11 +21,17 @@ AUX nvclock0.8b-fpic.patch 641 RMD160 08f803b690e1ebf69859b48604bc746a1ee3c0fd S
 MD5 233e02ceed7ba5fd68304bf19784a79e files/nvclock0.8b-fpic.patch 641
 RMD160 08f803b690e1ebf69859b48604bc746a1ee3c0fd files/nvclock0.8b-fpic.patch 641
 SHA256 c6dfdc3ecf84b7bd8f0eb7729aff4b3f9fde0bcce2ade0aa1765483bd486e159 files/nvclock0.8b-fpic.patch 641
+AUX nvclock0.8b2-fpic.patch 706 RMD160 a18e4fbea3e8c30f45dd7e7988005709916370c2 SHA1 b4672d272b33d21cb6c4285eec75e10527659d06 SHA256 281aaec86579d9e9a2b940e52600b08bccf40284a14b57991619d29308f1de1c
+MD5 ca5856c73cc2a952d660405f2e613208 files/nvclock0.8b2-fpic.patch 706
+RMD160 a18e4fbea3e8c30f45dd7e7988005709916370c2 files/nvclock0.8b2-fpic.patch 706
+SHA256 281aaec86579d9e9a2b940e52600b08bccf40284a14b57991619d29308f1de1c files/nvclock0.8b2-fpic.patch 706
 DIST cpufreqd-1.2.3.tar.gz 330993 RMD160 c58be2c59ded609f4813ba5ade85ca7016e40ed6 SHA1 8b23e86c012b6f7280605ed58e93c94194339010 SHA256 cc13e170f7f9d610ca77ed8bae09eab29f80db7e7dff12a8b1570c8efc685b4a
 DIST cpufreqd-2.0.0.tar.bz2 256423 RMD160 97ae4ccf77f00db2aa2afebde4e5d0cb7dd24439 SHA1 40094db6432ca9638bcd14af331f476d2977e7f8 SHA256 c56e41a1c530cbb0648132660ace4861c9262d241753876c038697120f45fa8c
 DIST cpufreqd-2.1.0.tar.bz2 281762 RMD160 7f4c8efea26f456ddda20092ebe954f366e8d633 SHA1 7e1c677f9a62531c97a4cfb34540bd2519fc40d8 SHA256 852efb0afecd62e848ede20490dd1bddc3d09dbf055d817ae052b5a5d299cb26
 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 nvclock0.8b.tar.gz 353127 RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 SHA1 ff0a9fe81a8f3227338ffccae143310df1b18551 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393
+DIST nvclock0.8b2.tar.gz 316510 RMD160 1c8aff1a0f2bd472f9d5296d2d575823b2cb5107 SHA1 edcf1197001a012f34bc0a4b1b2896ce1ad9831d SHA256 b3c05f1cceb57a816cea096f9b71154c0ce5e2ec31febb85e3db831b0b3407aa
 EBUILD cpufreqd-1.2.3.ebuild 776 RMD160 686f6f566cbe22dcbe4762dc68d1f8a18ce27463 SHA1 66f752549e2042ceaf2de5bff19c144caca5af23 SHA256 b14c6f04e8d82cbef351bf2894de135f150a6eb16701f52c82647bbf8a5219e0
 MD5 5759d3f4cf85eb14ee88c44578c027b6 cpufreqd-1.2.3.ebuild 776
 RMD160 686f6f566cbe22dcbe4762dc68d1f8a18ce27463 cpufreqd-1.2.3.ebuild 776
@@ -42,10 +48,14 @@ EBUILD cpufreqd-2.1.1.ebuild 1629 RMD160 bf3cfa86e97657e47fbe9a7345f6a6f5242c2fc
 MD5 39d6f17ee0072369331f8f70b2627b61 cpufreqd-2.1.1.ebuild 1629
 RMD160 bf3cfa86e97657e47fbe9a7345f6a6f5242c2fc5 cpufreqd-2.1.1.ebuild 1629
 SHA256 8c6b92d681f3b0fd85168400d89b56cdccda7326f7ed1e4f8807efcb20c31f1d cpufreqd-2.1.1.ebuild 1629
-MISC ChangeLog 8397 RMD160 9e5b5985dc995e0771472e4bc4e159e85c84b08f SHA1 ab4fa3e16f01a381eaf20b57e4d9a2ede00fb5af SHA256 c1e2a76b53a0f2dd0d9b7ca6a689773a64fc0d3cb2fde10e0b519e09b0e45402
-MD5 279553f10112630d4a399e46843e1c6c ChangeLog 8397
-RMD160 9e5b5985dc995e0771472e4bc4e159e85c84b08f ChangeLog 8397
-SHA256 c1e2a76b53a0f2dd0d9b7ca6a689773a64fc0d3cb2fde10e0b519e09b0e45402 ChangeLog 8397
+EBUILD cpufreqd-2.2.0.ebuild 1572 RMD160 e529f2ca4780fb6f691905e810f4bc2395ab3aff SHA1 dea7edec91699de20cb8804f49f440d5d2e09970 SHA256 07ac513467d382fab96fa285a54585a689ca1ec6be018dfb32c71958aa2c69c9
+MD5 760d2947dcafe056698dfb6e7d54bfbb cpufreqd-2.2.0.ebuild 1572
+RMD160 e529f2ca4780fb6f691905e810f4bc2395ab3aff cpufreqd-2.2.0.ebuild 1572
+SHA256 07ac513467d382fab96fa285a54585a689ca1ec6be018dfb32c71958aa2c69c9 cpufreqd-2.2.0.ebuild 1572
+MISC ChangeLog 8635 RMD160 8c9e180632532bced186779ef4aba1157ef394e5 SHA1 5ad444ef3b4aa5c8017711927511426ce7bab39e SHA256 a99760a1d40e06a16a9c1da32819d5392d072678b022c3aeb5d43e7771c99e24
+MD5 f51e1a722a1989902fc5c27a11ee8af1 ChangeLog 8635
+RMD160 8c9e180632532bced186779ef4aba1157ef394e5 ChangeLog 8635
+SHA256 a99760a1d40e06a16a9c1da32819d5392d072678b022c3aeb5d43e7771c99e24 ChangeLog 8635
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -62,10 +72,13 @@ SHA256 d0070d2db2de2754c0bf6fd5fd9ece5c5a0081886253b8ab56dbdaf2e9c9dbeb files/di
 MD5 b60f240c0551bd5c19a5bcef73d57319 files/digest-cpufreqd-2.1.1 482
 RMD160 468018e88c4786887c320f992b3ac410e06d1073 files/digest-cpufreqd-2.1.1 482
 SHA256 d4e8e35e673798e45c2eed31d735c475a39515027864a796e387df7210d18942 files/digest-cpufreqd-2.1.1 482
+MD5 1027b39f67d9223fbfd6949491f1e931 files/digest-cpufreqd-2.2.0 485
+RMD160 536635523fc1c067f8c69adf69ad6d22d4b28931 files/digest-cpufreqd-2.2.0 485
+SHA256 7444115196c6b39bc97423098659698e8de72ee478b0da4ea4687fafe8fbe711 files/digest-cpufreqd-2.2.0 485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJ00fyuNVb5qfaOYRAhYdAJ4wQHtw8QW8HcnLhSlq8kSSTFrf0wCfUvrm
-GzrUmyBp5Ykne53bIc+mZzk=
-=G1fo
+iD8DBQFFJ1CVyuNVb5qfaOYRArsBAJ4vkrxsPytaTuMBnPfKFB49Jg+1ywCgjMST
+3hz9L1dpCgxeyGLuFH/d7QQ=
+=bu/Q
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.0.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.0.ebuild
new file mode 100644
index 000000000000..180318a1c635
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# 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.0.ebuild,v 1.1 2006/10/07 07:00:29 phreak Exp $
+
+inherit eutils
+
+NVCLOCK_VERSION="0.8b2"
+
+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}
+
+	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}
+}
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0 b/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0
new file mode 100644
index 000000000000..bee4d49cb0f4
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.2.0
@@ -0,0 +1,6 @@
+MD5 a8916004d3fb75ed43822eb978c08fc5 cpufreqd-2.2.0.tar.bz2 292219
+RMD160 2e61db9bac593ae564e5103c80b4c49b9a85011c cpufreqd-2.2.0.tar.bz2 292219
+SHA256 13b857d23dff773965eb03a1531e6265627c328d5cc448ec4d446a7c54348d3b cpufreqd-2.2.0.tar.bz2 292219
+MD5 8b9f55115f3c5b7b9a9a16fe40cec4a5 nvclock0.8b2.tar.gz 316510
+RMD160 1c8aff1a0f2bd472f9d5296d2d575823b2cb5107 nvclock0.8b2.tar.gz 316510
+SHA256 b3c05f1cceb57a816cea096f9b71154c0ce5e2ec31febb85e3db831b0b3407aa nvclock0.8b2.tar.gz 316510
diff --git a/sys-power/cpufreqd/files/nvclock0.8b2-fpic.patch b/sys-power/cpufreqd/files/nvclock0.8b2-fpic.patch
new file mode 100644
index 000000000000..ab926f6c8dc4
--- /dev/null
+++ b/sys-power/cpufreqd/files/nvclock0.8b2-fpic.patch
@@ -0,0 +1,20 @@
+Index: nvclock0.8b2/src/backend/Makefile.in
+===================================================================
+--- nvclock0.8b2.orig/src/backend/Makefile.in
++++ nvclock0.8b2/src/backend/Makefile.in
+@@ -5,7 +5,7 @@ RANLIB=@RANLIB@
+ system=@system@
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ OBJECTS=backend.o bios.o config.o error.o nv30.o nv31.o nv40.o info.o overclock.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
+-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
++CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol -fPIC
+ 
+ ifeq ($(system), FreeBSD)
+     OBJECTS+=back_bsd.o
+@@ -36,4 +36,4 @@ distclean: clean
+ 	rm -f Makefile
+ 
+ install:
+-uninstall:
+\ No newline at end of file
++uninstall: