Fix building against uClibc #205576 by Jos van der Ende. Fix init.d scripts to work properly #243008 by konsti / Rene Meier. Make sure we respect LDFLAGS.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

6 files changed, 178 insertions, 15 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index 16c35a0965ce..127491469b1c 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.40 2008/10/20 16:05:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.41 2008/10/21 21:20:59 vapier Exp $
+
+*cpufrequtils-005-r1 (21 Oct 2008)
+
+  21 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  files/cpufrequtils-init.d-005, +files/cpufrequtils-005-build.patch,
+  +files/cpufrequtils-005-nls.patch, +cpufrequtils-005-r1.ebuild:
+  Fix building against uClibc #205576 by Jos van der Ende. Fix init.d
+  scripts to work properly #243008 by konsti / Rene Meier. Make sure we
+  respect LDFLAGS.
 
 *cpufrequtils-005 (20 Oct 2008)
 
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index 2865b546b776..d56d5a4f3737 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX cpufrequtils-002-parallel-make.patch 580 RMD160 c521c04cf137bd72800f37922b548bfd3464a56e SHA1 c778e3e28ea16f3bd339f5fc2e1e3587936b4618 SHA256 13dea5e075f883bdbf81fb16054c68f2e99e5df89e4d1191e19cd5094a4909dc
+AUX cpufrequtils-005-build.patch 844 RMD160 494f3e1c6681ac01e922bf4a527a8b89f878ea4b SHA1 1266a39a756ee9a2972a47d7b5b5833168146428 SHA256 5b33a052abab8cf33913ffbf649707a238ec4c13320985933552c1a8b0761f9a
+AUX cpufrequtils-005-nls.patch 1581 RMD160 614aee44a46cb01033c7c577711e9f07b70f824b SHA1 1072c513b41e5f43ef895f7d1c99eca3634ded3f SHA256 5ab12e4b5061b72e33c79ee15862db2127c0284532f6016064976c71772daf6e
 AUX cpufrequtils-conf.d 315 RMD160 0336b772aa28b6d83a7b16cf2dc115ae70449a75 SHA1 8cc8598f92d246c02b33842f7b2981854293cd1e SHA256 b64f5ffe55dfcb64475d3af679c3979e8f5e6e7f549d62021a486e2ef5274999
 AUX cpufrequtils-conf.d-005 277 RMD160 09bdd1c1b218f9aa9ce448b01eb0c9f0dc0613c2 SHA1 2befd01f2d527916eee5429920a083ea9543daa1 SHA256 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727
 AUX cpufrequtils-init.d 986 RMD160 d11a01d868df0baf0f2fea58de1f70d6bf23ab90 SHA1 46174efaa14e0e2c0bc2fd503790a9fe5a56ce14 SHA256 5e18a0d9de4892355cb19f5443a63ecf10ac90eede7318ca594d2c76889e486a
-AUX cpufrequtils-init.d-005 437 RMD160 5c199713fb3d6c483334d8e0ae879ae2dd4e5334 SHA1 4cd9193c4f9c7872f147ba80a78120ba336f53d6 SHA256 d2e540f7437c6365579403caf1ea86a7ab80fd3984ef1b8a6e9e0a23d0d4c6e2
+AUX cpufrequtils-init.d-005 531 RMD160 4bca2bc3868c3ef73bf53f3bbd83bd4c4a7164f4 SHA1 67d0fc02e59060358f5a82ea314830df19625524 SHA256 af83b2354bd8876efecd85762a61a40a4b498633e186cb85db7a22389936a2e6
 DIST cpufrequtils-002.tar.bz2 35313 RMD160 da4477af89116d78cbe92e55247cee3f1d1b9f73 SHA1 843e75c28210dbdf58c7d9ae519047227a556899 SHA256 98be6a75f06c535d0acc6948bb1b923c7c400c038c433acfa074c14c89edc39b
 DIST cpufrequtils-005.tar.bz2 39013 RMD160 284b28792635f37a909cc4aaeb626e01936fe95a SHA1 4033b8bb54fbcf13a59d4444e0883160c5499ad1 SHA256 a2c5898cbea032decc6143e82577c2bd948d6d9e97cd09d458e67c92e248bebe
 EBUILD cpufrequtils-002-r4.ebuild 1233 RMD160 f4426ceb21ea138ca6c2325c9dbd0ebc2c86583e SHA1 021f6a82796c7bb0a8c1b4acc829d7b1debe8bfc SHA256 424a3892769eda616297614ec0739798a636665799adce911b282a9e55afcde8
+EBUILD cpufrequtils-005-r1.ebuild 1262 RMD160 c816baab3088b8d94f40b1de868a7b22da7881d1 SHA1 f2847b9101958a19fd3ab6e08d3789211c224cb3 SHA256 6a7050eb5c6ffa9ce08802d52eed64566694732d80c6bf19b4d107ee469272c9
 EBUILD cpufrequtils-005.ebuild 1270 RMD160 7ace9881412e6a3f565db15bb5b53bb4d7bc199b SHA1 0be2135d47ffe712c385ccb1afe710581515de12 SHA256 b6885f3791e2319955bcd63f601330c9d84126a5f3b3c344ef862c136840ec1e
-MISC ChangeLog 7055 RMD160 3c81748d3a40181835ebfd8476db9c729b5c6d46 SHA1 0fe44830434e3e9db926162550eb7ec922611b61 SHA256 848fd45198bcc13249caf2ee207a3edc4ad5556929ee6af40f1d7ab7e27db6f9
+MISC ChangeLog 7439 RMD160 828e9e95438119e73fcb1046e356233094ed6edc SHA1 dcfebcadcd237dd9608e1621e39b42ac63c6b6c3 SHA256 3d2cc7cedcded9f6513912baf9226af0e9fb69b9258c4fbc9dae5180e230af4c
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj8rEAACgkQ67wieSYcaxevvwCg0Hs6f5cuG/dYGZODe6HFy+9e
-MXMAoMcZz5mgm4h2rC2sc2QcujDEzdiO
-=YVlu
+iEYEARECAAYFAkj+R8EACgkQ67wieSYcaxcYtACfTJ4jWQbRcDQ7LRlY6u1CJdgQ
+PeEAoJFWjmmT9hWVTPl3N28ZkMgySaMv
+=dVQu
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-005-r1.ebuild b/sys-power/cpufrequtils/cpufrequtils-005-r1.ebuild
new file mode 100644
index 000000000000..f4bb3d573d8f
--- /dev/null
+++ b/sys-power/cpufrequtils/cpufrequtils-005-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-005-r1.ebuild,v 1.1 2008/10/21 21:20:59 vapier Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Userspace utilities for the Linux kernel cpufreq subsystem"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/cpufreq/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug nls"
+
+DEPEND="sys-fs/sysfsutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-nls.patch #205576
+}
+
+ft() { use $1 && echo true || echo false ; }
+
+src_compile() {
+	emake \
+		OPTIMIZATION= V=true \
+		DEBUG=$(ft debug) \
+		NLS=$(ft nls) \
+		CC=$(tc-getCC) LD=$(tc-getCC) AR=$(tc-getAR) STRIP=echo RANLIB=$(tc-getRANLIB) \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		NLS=$(ft nls) \
+		mandir=/usr/share/man \
+		libdir=/usr/$(get_libdir) \
+		install || die "make install failed"
+
+	newconfd "${FILESDIR}"/${PN}-conf.d-005 ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d-005 ${PN}
+
+	dodoc AUTHORS README
+}
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-005-build.patch b/sys-power/cpufrequtils/files/cpufrequtils-005-build.patch
new file mode 100644
index 000000000000..e6b8ce8f2530
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-005-build.patch
@@ -0,0 +1,24 @@
+--- Makefile
++++ Makefile
+@@ -158,10 +158,10 @@ endif
+ 
+ # if DEBUG is enabled, then we do not strip or optimize
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGDEF  += -O1 -g -DDEBUG
++	CFLAGDEF  += -DDEBUG
+ 	STRIPCMD = /bin/true -Since_we_are_debugging
+ else
+-	CFLAGDEF  += $(OPTIMIZATION) -fomit-frame-pointer
++	CFLAGDEF  += $(OPTIMIZATION)
+ 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ endif
+ 
+@@ -191,7 +191,7 @@ libcpufreq: libcpufreq.la
+ 
+ cpufreq-%: libcpufreq.la $(UTIL_OBJS)
+ 	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c
+-	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o
++	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g $(LDFLAGS) -I./lib/ -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq
+ 	$(QUIET) $(STRIPCMD) $@
+ 
+ utils: cpufreq-info cpufreq-set
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-005-nls.patch b/sys-power/cpufrequtils/files/cpufrequtils-005-nls.patch
new file mode 100644
index 000000000000..7a0336fff4cf
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-005-nls.patch
@@ -0,0 +1,73 @@
+make nls/gettext support optional
+
+patch by Jos van der Ende <seraph@xs4all.nl>
+
+http://bugs.gentoo.org/205576
+
+--- cpufrequtils-005/Makefile
++++ cpufrequtils-005/Makefile
+@@ -141,6 +141,7 @@
+ ifeq ($(strip $(NLS)),true)
+ 	INSTALL_NLS += install-gmo
+ 	COMPILE_NLS += update-gmo
++	CFLAGDEF += -DNLS
+ endif
+ 
+ 
+--- cpufrequtils-005/utils/info.c
++++ cpufrequtils-005/utils/info.c
+@@ -10,7 +10,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
+ #include <getopt.h>
+@@ -18,9 +17,18 @@
+ #include "cpufreq.h"
+ 
+ 
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+ 
+ #define LINE_LEN 10
+ 
+--- cpufrequtils-005/utils/set.c
++++ cpufrequtils-005/utils/set.c
+@@ -12,16 +12,24 @@
+ #include <limits.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
+ #include <getopt.h>
+ 
+ #include "cpufreq.h"
+ 
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+ 
+ #define NORM_FREQ_LEN 32
+ 
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-init.d-005 b/sys-power/cpufrequtils/files/cpufrequtils-init.d-005
index 0e910b3f3401..9aadd94c10b9 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-init.d-005
+++ b/sys-power/cpufrequtils/files/cpufrequtils-init.d-005
@@ -1,16 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.1 2008/10/20 16:05:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.2 2008/10/21 21:20:59 vapier Exp $
 
-start() {
-	ebegin "Running cpufreq-set ${START_OPTS}"
-	cpufreq-set ${START_OPTS}
-	eend $?
+affect_change() {
+	local c ret=0
+	ebegin "Running cpufreq-set $*"
+	for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
+		cpufreq-set -c ${c} $*
+		: $((ret+=$?))
+	done
+	eend ${ret}
 }
 
 start() {
-	ebegin "Running cpufreq-set ${START_OPTS}"
-	cpufreq-set ${STOP_OPTS}
-	eend $?
+	affect_change ${START_OPTS}
+}
+
+stop() {
+	affect_change ${STOP_OPTS}
 }