fix dep on lm_sensors (<3) bug #244588

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

5 files changed, 22 insertions, 28 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index a83a792db8f9..ac2f45f00795 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/cpufreqd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.52 2008/08/16 04:12:00 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.53 2009/10/16 13:22:12 bangert Exp $
+
+  16 Oct 2009; Thilo Bangert <bangert@gentoo.org> cpufreqd-2.1.1.ebuild,
+  cpufreqd-2.2.0-r2.ebuild, cpufreqd-2.2.1.ebuild:
+  fix dep on lm_sensors (<3) bug #244588
 
   16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index d47f1cd3e1cf..761c26e21494 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 1128 RMD160 c5ac4245afd7c3dd7273fd134c891ed1e64b0719 SHA1 4f1e3231b6d2651ebb12609134950f9f401c24bf SHA256 c7a1e351a2c65dccd0a303bf5cef34ce7ce93b790215d20950140e3146bbc936
@@ -11,15 +8,8 @@ DIST cpufreqd-2.1.1.tar.bz2 285824 RMD160 06de622db37d67842133f6e1200f6fda24ec98
 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
-EBUILD cpufreqd-2.2.0-r2.ebuild 1922 RMD160 c38ac10455c4deec2a65449556c93666874018de SHA1 cdf17e715c3be07efb2b15aa534352bf9d523aad SHA256 ba46dada975f6d665fe477d81ea4fb72a7825ce31da109e8ed8fc58c099a1d40
-EBUILD cpufreqd-2.2.1.ebuild 1872 RMD160 ddd95726110572e9a339924cdac1448f996db729 SHA1 4a45e99b17225c8904549d3ad5c077c96a8f0a9f SHA256 8e0af3c94e6950cb0e60c1a1f3aa0d0871ae668c2aec1dad8cb2ee1ec3390a17
-MISC ChangeLog 11612 RMD160 edd9d86503e8969cfa9ae7c2ec681a86584b836e SHA1 3c4247b227c082619743491af77d10964ec5e8cb SHA256 a609a5f03271f4149024458c30029444229fe11130f3d6f6e53be2b6f82637cc
+EBUILD cpufreqd-2.1.1.ebuild 1636 RMD160 458eeddf986cb218251bd3c8164fbe9964e3588d SHA1 3ae1581ceceb5bf8bb4e9f5ed70df257be32d746 SHA256 4da548f58e698639665708dab40f6a1cafebf9b392e065d4f41e932c5af4d71a
+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 11779 RMD160 4767768d30d4b2fae86e83d8328a515272b88fc4 SHA1 10b2527fd18fc71e1bd43629f98846ec2bbff193 SHA256 e044dea1a2fec6bba1c47d94cb0a60c3224d8545c29f013234025a5b0c2271f9
 MISC metadata.xml 423 RMD160 d843208101d0e0aef245a5d5219e23ba0c7a38a6 SHA1 a88afdeb4b95664870a648ee552b15c329b6a8a9 SHA256 acc4e407d32dcef3e0806c8fec555d9b5bc59cfc5d38f5e989dd5fea62723c93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkimU5YACgkQoeSe8B0zEfzGsgCfbkJinYpxd+SEpCeUHuTQw4nV
-ihgAmwRvIz6v3nbIKInC9cemzUV3nNJw
-=ZMUm
------END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.1.1.ebuild b/sys-power/cpufreqd/cpufreqd-2.1.1.ebuild
index d02ba9d2294f..1d3dfcb25d0d 100644
--- a/sys-power/cpufreqd/cpufreqd-2.1.1.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1.1.ebuild,v 1.6 2006/11/13 10:20:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.1.1.ebuild,v 1.7 2009/10/16 13:22:12 bangert Exp $
 
 inherit eutils
 
@@ -17,17 +17,17 @@ KEYWORDS="amd64 ppc ~sparc x86"
 
 IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
 RDEPEND=">=sys-power/cpufrequtils-002
-		lm_sensors? ( sys-apps/lm_sensors )"
+		lm_sensors? ( <sys-apps/lm_sensors-3 )"
 DEPEND="sys-apps/sed
 		${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-	sed -i -e "s:acpi_event:acpi:" ${S}/cpufreqd.conf
+	sed -i -e "s:acpi_event:acpi:" "${S}"/cpufreqd.conf
 
 	if use nvidia; then
-		cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
 		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fd.patch
 		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fpic.patch
 	fi
@@ -37,7 +37,7 @@ src_compile() {
 	local config
 
 	if use nvidia; then
-		cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
 		econf \
 			--disable-gtk \
 			--disable-qt \
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
index bfdece55882f..28c20ab36269 100644
--- a/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2.0-r2.ebuild,v 1.3 2007/05/17 08:51:45 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild,v 1.4 2009/10/16 13:22:12 bangert Exp $
 
 inherit eutils autotools
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
 RDEPEND=">=sys-power/cpufrequtils-002
-		lm_sensors? ( sys-apps/lm_sensors )"
+		lm_sensors? ( <sys-apps/lm_sensors-3 )"
 DEPEND="sys-apps/sed
 		${RDEPEND}"
 
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
index 0004492e3c6d..4e7812085ab7 100644
--- a/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2.1.ebuild,v 1.5 2007/10/11 05:57:00 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild,v 1.6 2009/10/16 13:22:12 bangert Exp $
 
 inherit eutils autotools
 
@@ -17,7 +17,7 @@ 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 )"
+		lm_sensors? ( <sys-apps/lm_sensors-3 )"
 DEPEND="sys-apps/sed
 		${RDEPEND}"