Version bump.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 154 insertions, 8 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index a478b226f546..e00b29ba4e15 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.48 2010/01/15 19:50:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.49 2010/01/16 23:57:40 vapier Exp $
+
+*cpufrequtils-007 (16 Jan 2010)
+
+  16 Jan 2010; Mike Frysinger <vapier@gentoo.org> +cpufrequtils-007.ebuild,
+  +files/cpufrequtils-007-build.patch, +files/cpufrequtils-007-nls.patch:
+  Version bump.
 
   15 Jan 2010; Mike Frysinger <vapier@gentoo.org> cpufrequtils-006.ebuild,
   -files/cpufrequtils-006-modprobe-gov.patch:
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index 4ee1f7d88faf..fb0c67af1b98 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -3,21 +3,22 @@ Hash: SHA256
 
 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-006-nls.patch 1684 RMD160 b676983d37e7e07fd330bd81788d3d49d861b81c SHA1 dc2754021fb3ff410cae4ea1149688d3a878724d SHA256 4848b3c75b11d58d63625471d93b840d8a4ca798e7b82558dcd860a0fe2b9826
+AUX cpufrequtils-007-build.patch 369 RMD160 317ebc43c5cb8ea40a3dc20deab8b03ba22d958c SHA1 30f2702c94aac2e644a5aae87e2395ab7ba905eb SHA256 2cfafb56502441c06485b38e3e900e354310f252ae47e23134fc63488aeb8ec0
+AUX cpufrequtils-007-nls.patch 1684 RMD160 fe28612cb1e69d75aba33803be6b6e9c9a7a450f SHA1 cdc9f110b12f6574fd06dec80461da6caa9a0bdf SHA256 e4a6a2cdd47da2bd54cf0cb18e5b601c2630af64d747b2e14e524bfd9761a397
 AUX cpufrequtils-conf.d-005 277 RMD160 09bdd1c1b218f9aa9ce448b01eb0c9f0dc0613c2 SHA1 2befd01f2d527916eee5429920a083ea9543daa1 SHA256 602b65f6e9927bfb37a26a34c1b44bd4a87cdb2977b5547398e17432afe55727
 AUX cpufrequtils-conf.d-006 398 RMD160 e3e5f52e5a7c51961506b2220c53d9fbd53c061f SHA1 90547acd2466d383b81540cdb253408bbcd160a9 SHA256 f93fed316a161977360a3764f503680316f88e9f8e40f264fccdfbb7d6a6e8d5
 AUX cpufrequtils-init.d-005 531 RMD160 4bca2bc3868c3ef73bf53f3bbd83bd4c4a7164f4 SHA1 67d0fc02e59060358f5a82ea314830df19625524 SHA256 af83b2354bd8876efecd85762a61a40a4b498633e186cb85db7a22389936a2e6
 AUX cpufrequtils-init.d-006 861 RMD160 7131a3482242d83750c018d1a4f6f6ac31e2f74d SHA1 7c855d01b6d90fe4681c6403f829af823ea5954b SHA256 0fc8e824933d8af8fe19151b1603eba1141f6e5a1d32ad91df3fd810c4518ca5
 DIST cpufrequtils-005.tar.bz2 39013 RMD160 284b28792635f37a909cc4aaeb626e01936fe95a SHA1 4033b8bb54fbcf13a59d4444e0883160c5499ad1 SHA256 a2c5898cbea032decc6143e82577c2bd948d6d9e97cd09d458e67c92e248bebe
-DIST cpufrequtils-006.tar.bz2 52315 RMD160 b60c1c897ca932c6251b1445a170c79da1e259ce SHA1 f6c824e446fd72d69c16867c6c1808d1baf5415e SHA256 b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1
+DIST cpufrequtils-007.tar.bz2 51959 RMD160 f5ba085ad186456099c312d67d67351d5fd4592d SHA1 57c91f5ff2a2abf0e1fbf4aa881702b8846397a9 SHA256 8af517369ad8a8ac40a9e47abe2e1970a9249932ab336367aaf8f68cd979dbad
 EBUILD cpufrequtils-005-r1.ebuild 1261 RMD160 c05e2849758aa5cd0a5a1560b1bde4c0efdba27d SHA1 7b421ada7beb267804814db9d0dd5b37d88b64f3 SHA256 bc2b10bbc66eb745ebc02e61c8d7e946905d02381cee30f6b063a4e631d2ee80
-EBUILD cpufrequtils-006.ebuild 1280 RMD160 c741f472fe0fc89165daaba6f1002dd925ca3720 SHA1 2cc76ea086b2f678c12923d3acf7d15286dd59fa SHA256 250044959843cc5844da0ea08fc5c09991cbe74d4e41888313562b9f20969176
-MISC ChangeLog 8585 RMD160 3e24dc369a0ecbdd6383db3bf760f0259003f8b2 SHA1 c2e7464664ea3979ed513e5ec3b355d09b996359 SHA256 860f0cbd6a295be6c891fad8ace1932998c05831db4d54e420f7c496099432a0
+EBUILD cpufrequtils-007.ebuild 1331 RMD160 6208fb656a654a811acc96ef6711aa3907123809 SHA1 2e1a53fa775a02e148088d450993cea8640b7c97 SHA256 5278cf92e377bf0beffa2ba59eb3ca3a5a5b245521d50c6f9c6e58ad67c840c8
+MISC ChangeLog 8785 RMD160 550681a0c022b6b31c12424acc307bda86664314 SHA1 ba828de7a76a1a40d40b581d330ffaabe8052e9c SHA256 d340386be7b45084227de429b3496a63dcf32c954c6e1824b6d13a36e21f9708
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktQxxEACgkQTwhj9JtAlp4ktQD/YyllIGCZyExe5w8WzEiT8rFb
-Me8HEWP9Ci2DF1vGKdkA/R4ZBPAiYYuS00ZDkMmtA61+fF8vkkRXYq+miSvDOZtc
-=QvM7
+iF4EAREIAAYFAktSUo8ACgkQTwhj9JtAlp6ScAD+Nxnx7BCLmCVQI0t/7ld7zsEQ
+XueMwB9qt5kLHU+Va2oA/AqDVOgIJJMG1uCK7qivD/X/i+yuaCR3QpsmIfSHZy6f
+=dYAV
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-007.ebuild b/sys-power/cpufrequtils/cpufrequtils-007.ebuild
new file mode 100644
index 000000000000..19a3bf644d85
--- /dev/null
+++ b/sys-power/cpufrequtils/cpufrequtils-007.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-007.ebuild,v 1.1 2010/01/16 23:57:40 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug nls"
+
+DEPEND="sys-fs/sysfsutils"
+
+ft() { use $1 && echo true || echo false ; }
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-007-build.patch
+	epatch "${FILESDIR}"/${PN}-007-nls.patch #205576 #292246
+
+	export DEBUG=$(ft debug) V=true NLS=$(ft nls)
+	unset bindir sbindir includedir localedir confdir
+	export mandir="/usr/share/man"
+	export libdir="/usr/$(get_libdir)"
+	export docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		STRIP=: \
+		RANLIB="$(tc-getRANLIB)" \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+
+	newinitd "${FILESDIR}"/${PN}-init.d-006 ${PN} || die
+	newconfd "${FILESDIR}"/${PN}-conf.d-006 ${PN}
+}
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch b/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch
new file mode 100644
index 000000000000..3e0d18b0ab3d
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-007-build.patch
@@ -0,0 +1,14 @@
+--- Makefile
++++ Makefile
+@@ -158,11 +158,9 @@ endif
+ 
+ # if DEBUG is enabled, then we do not strip or optimize
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS += -O1 -g
+ 	CPPFLAGS += -DDEBUG
+ 	STRIPCMD = /bin/true -Since_we_are_debugging
+ else
+-	CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+ 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ endif
+ 
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch b/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch
new file mode 100644
index 000000000000..83ab0b11f0cd
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-007-nls.patch
@@ -0,0 +1,76 @@
+make nls/gettext support optional
+
+patch by
+Jos van der Ende <seraph@xs4all.nl>
+Lars Wendler <polynomial-c@gentoo.org>
+
+http://bugs.gentoo.org/205576
+http://bugs.gentoo.org/292246
+
+--- cpufrequtils-006/Makefile
++++ cpufrequtils-006/Makefile
+@@ -147,6 +147,7 @@
+ ifeq ($(strip $(NLS)),true)
+ 	INSTALL_NLS += install-gmo
+ 	COMPILE_NLS += update-gmo
++	CPPFLAGS += -DNLS
+ endif
+ 
+ ifeq ($(strip $(CPUFRQ_BENCH)),true)
+--- cpufrequtils-006/utils/info.c
++++ cpufrequtils-006/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-006/utils/set.c
++++ cpufrequtils-006/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
+