Revision bump: EAPI 4, QA cleanups, support for user patches, fix for bug #389749

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 126 insertions, 14 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 6873275d89ce..72a9e3afa463 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.65 2012/11/18 11:41:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.66 2012/11/19 10:57:20 pinkbyte Exp $
+
+*cpufreqd-2.4.2-r2 (19 Nov 2012)
+
+  19 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> +cpufreqd-2.4.2-r2.ebuild,
+  +files/cpufreqd-battery-attr-name.patch:
+  Revision bump: EAPI 4, QA cleanups, support for user patches, fix for bug
+  #389749
 
   18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop mobile herd as talked in gentoo-dev ML
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 8f111ff4f98a..ab0164aa1f7d 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cpufreqd-2.4.2-PATH_MAX.patch 411 SHA256 3923a28fd4a99f242e07e9596f53871f1274cee2c91af5e3836c6ef0abb6c7a9 SHA512 2d83472bddbd99afe9f0d68750c681f56603d6908a58fe46da7d4426041ccb5ae86c75c38711ff255abcbc800b4a98539607c3553f1c8f9da8df9fe74de71fba WHIRLPOOL e642f4a0e2f823aae5fa85f361774f5e111193934d94f8d44c5e6ec0d5c1ff33c085d35d530c250577a425520cf406efe0edf354f36286c56ab836d9fa34b87e
+AUX cpufreqd-battery-attr-name.patch 1118 SHA256 41bb9f616170e5f15c553068402400e74ae8243296213c3c7b129f4e7bf0b155 SHA512 8206d1eccc68898020bcb2a10060c65926fe5e0de7eabb1a5dd40780644db4186260353d601775bea7c8a56375ed7284873cdd5c98741a38008d452cfb6eae04 WHIRLPOOL d6ad06d2020b42a1051247fe7bf39f04aa49be46254d0c475acdd3940cf860b9ac8d5523a0a30d5a9fce91add4cbb79156f1738e0fd00ceb861b1a673c32e3ce
 AUX cpufreqd-conf.d.patch 269 SHA256 2e4c34e87daffb5929717ba6e91a36c0e85db1e042ff10a1483617f5f4d424e1 SHA512 dc8825a8b24d5f5010e4fe116cfd401f4d562d0f53c17e95a870791840d32653420a181497f589f6491bdfa1a9201ef0fab3db22b4edbdd0378a2084a20167cd WHIRLPOOL 840c2bf455f5901d9e6d6167b37f81015dc5a2c9b954ed3dd2ef4374babe076980da900e832cf6ba2081a431cf103a6256ee284cf2dbab9830267f4aead67a14
 AUX cpufreqd-init.d 1156 SHA256 3fe98f8535e2e7e67f834865d0c3c18d2594d0aa1066e42b06b160955e1c8cf9 SHA512 d6ef65919b6881d410851aa61c88d60aab0089053b27d49b6c62f7f4a45e066176bcc0c7a7ab8f5d1ac49bddc271518347272c6f39f5da3611dd564b0d79ed6b WHIRLPOOL 7621a94118cc9e8471d2b79f4595ffe61518e48fd5fce99691cf1024aef01c099a9a193a7a7cc1a48cb3dbfab60e878c60eed09aa5c7257c68a2fb7230c16e98
 AUX nvclock0.8b-fpic.patch 641 SHA256 c6dfdc3ecf84b7bd8f0eb7729aff4b3f9fde0bcce2ade0aa1765483bd486e159 SHA512 0ffa4f90bac26ca628fadc9a76d92b7ef1b41ac7855522ca64cd591cc3fd14f2e5adc336be4c31d7ffb4d2caf9a32234b6fdb28b3a5062be4e7724e630454a79 WHIRLPOOL ea2f353dc801429f852c18159c8d0d06c763094c2d7ff7c4dabac6a1b10290bd6d1590e6a8e7fa1d4d84d65a4b17dba8c65cb5fd7917e8dce710e71851761ff2
-DIST cpufreqd-2.4.2.tar.bz2 299946 SHA256 3b7810a3d244d9b10c8c151fd6037e7d14c9889cdf5cdff1867bd978b9f7482a
-DIST nvclock0.8b.tar.gz 353127 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393
+DIST cpufreqd-2.4.2.tar.bz2 299946 SHA256 3b7810a3d244d9b10c8c151fd6037e7d14c9889cdf5cdff1867bd978b9f7482a SHA512 42067a28c1901cb2c45f21f918169648db77f553db1fbd44e2aae64e7092b530a1e3697a0cc4b4b70e0d474966671e924950501a0feb5d0ada166aa369dbc33b WHIRLPOOL 0771aab45a4748ed8a16076da847600be4d09d75b8d8a1bc35d0b944c8f00685088b555184805302c251855fd178937e962242b85bce2ad7277e591a5f6b04c3
+DIST nvclock0.8b.tar.gz 353127 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393 SHA512 94ec46ddcfc732c99cd67082f20a3499c5fa1fe2d9889b0a384f466b9a4fa1df1898d9c34393b986e401802b90fad56f3ddd2151aaa7f006497e48aaffc6e8df WHIRLPOOL 06d9821bc3956a84632e042e9554e410d992d7e6f5978c27f556146550b930b62815140cf4d14484f38e8f59b1196ca71b582d3670d73924642e6b8e3f6ced6d
 EBUILD cpufreqd-2.4.2-r1.ebuild 2059 SHA256 edcc6e4a3b7ff8fbd962c4b7c24378c7f49d38a06130bbf323aebf0a56de0617 SHA512 c98589f6012dfbf26c1887875d9d7f8815f29eaedefdb4a01c27e7e10bc7ea9f45003349f159e1f2ac8d3e0c16bb1481761ea4c77a89b6d445ec29a0d0f9f90f WHIRLPOOL e4c885d68f3db4a49bd94b7e46ef3a759c72df2c2dd22508af51d5acfe64a85669fb1e73a77fd13fd31ecce0b41dee2004f7671a5f03b88e33eb6aaaa54b0542
+EBUILD cpufreqd-2.4.2-r2.ebuild 1926 SHA256 e2520c05f607213c9f6ae66bf5c6dcdf5f6949790633ba80c0fdcee23b070256 SHA512 c4c59219b8e474d1d686bfbe3c74cd028460cd7151991a0a1fe2af8a4db62e4d1f2592f8befaf7afbfe81792e60a9c109b1a995c897b95c934792db9c02f89ba WHIRLPOOL c9f5c5d4fd4b91b40efbbbabbc45c9c5e6443016d7228047bd445a3e9c151422efb9477d04794008ae39b44aa14201b53a42b8dfe8f7de7c784a229d7e315cf2
 EBUILD cpufreqd-2.4.2.ebuild 2004 SHA256 f10aa2b7ee325e3b1318180e28ba19b8119d8d2a3ad1dfade5b207ba4fd4dcb9 SHA512 0a5b282f07ae800b2014149de1298fa65d7b2514cb960b7ff6071eae6f0790c8b8fbeb8f07ff3bf85ded490c4bd3dcb24575cbefa8daba390e61e9dd5222a638 WHIRLPOOL 243fb25be59d18c0745ff1b440ad0c65ee7c98af2442b7d74908b9c1840a1543a1d85b82daf2402c75fc6a0fd1d4710a08e02fb1108d069b346b47ffb41cf971
-MISC ChangeLog 13723 SHA256 2ca09cae0a99a41f1249d750144bdef8e9ba0eeea95a31109668777a882cb036 SHA512 7dbbb4856d5f7fe698edcf9265a931effa50419cfc46f48dfa804760b4fd1d10e5c9d8acc94a4a3f6bb7b3716cb36b9e9d1e256d859980a64f2b0853731fc872 WHIRLPOOL 43daf4ce6478a4294ba74ec3bbd5cfee383b35a8765ceea1616291473a3c192e6104934d0871ac7553efa3425ec5b28e944c3ea9531410d75e57038d11067573
+MISC ChangeLog 13967 SHA256 a00a55ea359731fa67377142d35a9b9a6fc8272fe7e036d70df687c627187147 SHA512 a54f0663b89f0c62783636242bd516286db5a83f0552a685edff2059ce73c840d64f36de688f5f840a0b880398c863db0cf9ae0e4d44a09b42466a6839e64000 WHIRLPOOL e57b17413c440e4bc1900a09496470dcc1dc9fb19aac4e710635534af7556bfc3b7aab8782d705d770b527d84464784f74b5ee443d753d317e1e2ca2b1e83d97
 MISC metadata.xml 471 SHA256 030a2b7b0490c028d7555dbe8997db56ce885d0fb75f8c62aae8d53a42105cac SHA512 86150beed05a1ca9e2986877d0a2cfec3fd366d80275c953a28d05174bdb37ba7ebafbc80abd9c1b82cb70904fd7085d6f2854c74df05fdc43de790b27ffa1fc WHIRLPOOL 3f72b437e54d12781530db6d45dfcc0707a1993a8828e5c251fce1f0cc59abdd5eb86b53d4269abe34dc9c69a38477e7f5f744625ff3b5a23a377f12b5d592fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCoyWAACgkQCaWpQKGI+9TdzwCdGnoGZVNd7uPHwLgIAP20XPRz
-xVAAn36dRZ00Uf57IgqOCPJDYgrSrAq6
-=nlHc
------END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.4.2-r2.ebuild b/sys-power/cpufreqd/cpufreqd-2.4.2-r2.ebuild
new file mode 100644
index 000000000000..af872ac7cf2c
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.4.2-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.4.2-r2.ebuild,v 1.1 2012/11/19 10:57:20 pinkbyte Exp $
+
+EAPI="4"
+
+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
+		sys-fs/sysfsutils
+		lm_sensors? ( >sys-apps/lm_sensors-3 )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-conf.d.patch
+	epatch "${FILESDIR}"/${P}-PATH_MAX.patch #318287
+	epatch "${FILESDIR}"/${PN}-battery-attr-name.patch #389749
+
+	if use nvidia; then
+		cd "${WORKDIR}/nvclock${NVCLOCK_VERSION}"
+		epatch "${FILESDIR}/nvclock${NVCLOCK_VERSION}-fpic.patch"
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local config
+
+	if use nvidia; then
+		cd "${WORKDIR}/nvclock${NVCLOCK_VERSION}" || die 'cd to nvclock dir failed'
+		econf \
+			--disable-gtk \
+			--disable-qt \
+			--disable-nvcontrol
+		emake -j1
+		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
+	fi
+
+	cd "${S}" || die 'cd to source dir failed'
+	econf \
+		$(use_enable acpi) \
+		$(use_enable apm) \
+		$(use_enable lm_sensors sensors) \
+		$(use_enable nforce2) \
+		$(use_enable pmu) \
+		${config}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+	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-battery-attr-name.patch b/sys-power/cpufreqd/files/cpufreqd-battery-attr-name.patch
new file mode 100644
index 000000000000..e35cac15cfbd
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-battery-attr-name.patch
@@ -0,0 +1,36 @@
+--- src/cpufreqd_acpi_battery.c.orig	2010-04-18 15:57:41.000000000 +0200
++++ src/cpufreqd_acpi_battery.c	2012-04-07 14:26:54.409641936 +0200
+@@ -36,6 +36,7 @@
+ #define PRESENT		"present"
+ #define STATUS		"status"
+ #define CURRENT_NOW	"current_now"
++#define POWER_NOW	"power_now"
+ 
+ struct battery_info {
+ 	int capacity;
+@@ -146,8 +147,12 @@
+ 	if (!binfo->status)
+ 		return -1;
+ 	binfo->current_now = get_class_device_attribute(binfo->cdev, CURRENT_NOW);
+-	if (!binfo->current_now)
+-		return -1;
++	if (!binfo->current_now) {
++		/* try the "power_now" name */
++		binfo->current_now = get_class_device_attribute(binfo->cdev, POWER_NOW);
++		if (!binfo->current_now)
++			return -1;
++	}
+ 
+ 	/* read the last full capacity, this is not going to change
+ 	 * very often, so no need to poke it later */
+@@ -311,6 +316,10 @@
+ 
+ 	/* Read battery informations */
+ 	for (i = 0; i < bat_dir_num; i++) {
++		if (!info[i].open) {
++			clog(LOG_INFO, "Skipping %s (closed)\n", info[i].cdev->name);
++			continue;
++		}
+ 
+ 		if (read_int(info[i].present, &info[i].is_present) != 0) {
+ 			clog(LOG_INFO, "Skipping %s\n", info[i].cdev->name);