version bump (bug #233481) - fixes install of broken .la files (bug #268701) - remove obsolet init script

Package-Manager: portage-2.2_rc42/cvs/Linux i686

4 files changed, 93 insertions, 41 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 8533da10d6f5..2600d946c2a1 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.54 2009/10/20 10:21:33 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.55 2009/10/20 13:06:45 bangert Exp $
+
+*cpufreqd-2.3.4 (20 Oct 2009)
+
+  20 Oct 2009; Thilo Bangert <bangert@gentoo.org>
+  -files/cpufreqd-2.1.1-init.d, +cpufreqd-2.3.4.ebuild:
+  version bump (bug #233481) - fixes install of broken .la files (bug
+  #268701) - remove obsolet init script
 
   20 Oct 2009; Thilo Bangert <bangert@gentoo.org> cpufreqd-2.1.1.ebuild,
   files/cpufreqd-init.d:
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 646ec6a26377..78eb0ec812cb 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,4 +1,3 @@
-AUX cpufreqd-2.1.1-init.d 914 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 SHA1 f1eb7f0871b902a766263e9d1287886029b7300f SHA256 bb7dc7bebaf3b8adb942903f78624836dd93d7c8a34764767a5c0d5a30fa53e5
 AUX cpufreqd-conf.d.patch 269 RMD160 7d597a9fefff26dc0270a94ee6c360e1322390b7 SHA1 9ce182311b269da517f4f126aa485af1dded5423 SHA256 2e4c34e87daffb5929717ba6e91a36c0e85db1e042ff10a1483617f5f4d424e1
 AUX cpufreqd-init.d 1156 RMD160 b64937c969717b5d7234a447b6e548b4c4269638 SHA1 9159187780cd31f657c8f771e534d7d55e2d68c3 SHA256 3fe98f8535e2e7e67f834865d0c3c18d2594d0aa1066e42b06b160955e1c8cf9
 AUX nvclock0.8b-fd.patch 580 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 SHA1 afd021a0144b6adb4dbb936f1a8181db609592fc SHA256 5dad49a3ce2a52b37c4711c497a46c373282bdf27b9b28834a0b5bd977066bf2
@@ -7,9 +6,11 @@ AUX nvclock0.8b2-fpic.patch 706 RMD160 a18e4fbea3e8c30f45dd7e7988005709916370c2
 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 cpufreqd-2.3.4.tar.bz2 299759 RMD160 1b12b9e6321d0f6d764fb9da8d472e13b26217d6 SHA1 a41b50115c3e91a70368f15727702b5f69fb7ac8 SHA256 05c9fe7273831eaa5b9c131dad885e14234a588e7cd54757db5535944c94e436
 DIST nvclock0.8b.tar.gz 353127 RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 SHA1 ff0a9fe81a8f3227338ffccae143310df1b18551 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393
 EBUILD cpufreqd-2.1.1.ebuild 1637 RMD160 fd8c8b13a3d70363fa8f795052aa2200343f1252 SHA1 dfb5cc7231f69f31928c1d656b8f40112efaaca1 SHA256 a48266d19c3d4009b5d0faf6910a74ed89471b32bd120731328bcf0f6a5469f7
 EBUILD cpufreqd-2.2.0-r2.ebuild 1926 RMD160 314111a332e4cd9c647a26249d5d8b80019efd42 SHA1 3ffda088fbd7568dc267643c0c5371e5d0c2ee50 SHA256 e6a5c3d140cee3f1adb8d9cc48f673f1a84235a084e8908fd5ef4aff7b57ab1c
 EBUILD cpufreqd-2.2.1.ebuild 1877 RMD160 1a3ad419483efe19032644e56898bfd10bd936a9 SHA1 44def411a04793a6fd8baa1df14fc1925633f6a8 SHA256 870e461ff92867eddc7ffd4851a46099100a8a2d4b85c9e1dc6879bc910d8388
-MISC ChangeLog 11936 RMD160 1375f07c2c71c0ce8e3c5d670e2ab3d29ed72dd7 SHA1 afec56dfa393f165f57e9e53d2155a18c67c1808 SHA256 b435998ec9f598db5d9514d4c86ca18234702989bbafedb149453da70d5a77df
+EBUILD cpufreqd-2.3.4.ebuild 1988 RMD160 15a69444a7de079ca1469136a0aaa73540234994 SHA1 506e8a68d300bafad102bce8aae8b5df27610eaf SHA256 a30cb3b6549845dafb922adc59c34733738cead7dcbb18110eba89a4524e3d24
+MISC ChangeLog 12184 RMD160 f7c967804b83af5f8c26e748a2eef1303927d789 SHA1 57427ef371509eab644790e73a4718b440d6aa10 SHA256 af152ffef89ecbeba002271e35f819ebfd2633023c912bccd4f7f703601fe6e4
 MISC metadata.xml 423 RMD160 d843208101d0e0aef245a5d5219e23ba0c7a38a6 SHA1 a88afdeb4b95664870a648ee552b15c329b6a8a9 SHA256 acc4e407d32dcef3e0806c8fec555d9b5bc59cfc5d38f5e989dd5fea62723c93
diff --git a/sys-power/cpufreqd/cpufreqd-2.3.4.ebuild b/sys-power/cpufreqd/cpufreqd-2.3.4.ebuild
new file mode 100644
index 000000000000..305682943814
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.3.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.3.4.ebuild,v 1.1 2009/10/20 13:06:45 bangert Exp $
+
+EAPI="2"
+
+inherit eutils
+
+NVCLOCK_VERSION="0.8b"
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://www.linux.it/~malattia/wiki/index.php/Cpufreqd"
+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 ~ppc64 ~sparc ~x86"
+
+IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
+RDEPEND=">=sys-power/cpufrequtils-002
+		lm_sensors? ( <sys-apps/lm_sensors-3 )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-conf.d.patch
+
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fpic.patch
+	fi
+}
+
+src_configure() {
+	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_compile() {
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+	fi
+
+	cd "${S}"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}"/usr/$(get_libdir)/*.la
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+}
+
+pkg_postinst() {
+	if [ -f "${ROOT}"/etc/conf.d/cpufreqd ] ; then
+		ewarn "An old \"/etc/conf.d/cpufreqd\" file was found. It breaks"
+		ewarn "the new init script! Please remove it."
+		ewarn "# rm /etc/conf.d/cpufreqd"
+	fi
+}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.1.1-init.d b/sys-power/cpufreqd/files/cpufreqd-2.1.1-init.d
deleted file mode 100644
index d83cac6dca91..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.1.1-init.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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.1.1-init.d,v 1.1 2006/07/04 16:34:49 brix 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 ]] && [[ ! -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 --exec /usr/sbin/cpufreqd -- \
-		-f ${CONFIGFILE}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping CPU Frequency Daemon"
-	start-stop-daemon --stop --exec /usr/sbin/cpufreqd
-	eend ${?}
-}