Add patch from upstream for newer Intel parts.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 173 insertions, 15 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index a8d7576af7bc..56f618c514b3 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.75 2013/03/08 06:16:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.76 2013/03/25 16:30:32 vapier Exp $
+
+*powertop-2.2-r2 (25 Mar 2013)
+
+  25 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/powertop-2.2-cpu-add-new-Intel-cpuid.patch, +powertop-2.2-r2.ebuild:
+  Add patch from upstream for newer Intel parts.
 
   08 Mar 2013; Mike Frysinger <vapier@gentoo.org> powertop-2.2-r1.ebuild,
   powertop-9999.ebuild:
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 3ea89735701e..0440154f53f5 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -6,28 +6,30 @@ AUX powertop-1.98-build-cc.patch 704 SHA256 36ccfeec0c64f0131415238316e14fee2239
 AUX powertop-1.98-build-libnl-3.patch 611 SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328 SHA512 c81b029c18d192792b6ffa89e7f56e12d3c74a37338fa56ea1f7401bd7bf83353b54cbe6b53e85285a2e1627b8b92c8ea84d2bcd59f24035d4e34fef4f6ac256 WHIRLPOOL 7771eb8c61b17c730d338bee42a604e52acb6a4d7ce0b68e419a73b5acd5620cf0771d3885c877bb76de20a4388b83b96afe2517e24e689c7143044eebcd1925
 AUX powertop-1.98-build.patch 2266 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7bf1d79838faa3e52478142ebfeb SHA512 3f356e8526c337756bb803c7a3c695bda0f6eb0da686d53c0d627341bf443be1f925b96a56a9b066512e7f48f1fccb1c9c4db9033100bc9794626744fe74f696 WHIRLPOOL 555abbc36d90c26b46fbb9236895946e61752350ffcf3b2ec8bc53db6babcdcfe2ef8a2841212e7286e23395a63c9c540b723c3a57663c533692494bdafd302b
 AUX powertop-1.98-gcc-4.7.patch 3720 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45fcf656f371b05e6d2751dd248549 SHA512 98b3f0155d517cadc27bd32e87777ef74278c38d019ffdfff00eb68174ba846ea1899b1bfbf4841a843114d0978dde8a880528c7ce8486cb1132d1d0b0f3ab6b WHIRLPOOL 4c45cdaf5098c2093df41eec6f4e719ffea490ca870e049c7715a78c37fe932250cb8ce73e0d1c98e3194f1e786174596c98a6b21dcf648de1ba4798686f224d
+AUX powertop-2.2-cpu-add-new-Intel-cpuid.patch 1308 SHA256 ac53965cebf261cea753e73a17f95478d39294847d92581fd10260a5cdcaae67 SHA512 5c36318d0ea7ebf166162957fb72e8b38e4e010e8029128a3f5e9bc789ee6efbf4b87b1a5a96fba2c675397e90c8c37333542c5cab4ea5077a3d26f8e6df0eaa WHIRLPOOL 8d76929edd03ceabff268e7d39584b1e68c6338e3f1452d4bfff0ee80d66df7e4f81084392a635077569c372e747827ae74f39dfc4cc4904b904a80d20b221aa
 AUX powertop-2.2-use-package_version.patch 740 SHA256 40258728ae75fb0ba425bd1295ce88784ca03bde59ef52aa114a2269020f1cd8 SHA512 196a866d13999103a6c0d7b5e1b03ce0a11ce1c3a7550346b45bcbb5597b1080b0b9fbd7b18b5d66e2b9d140d5e7ec460cd8be4749bc52c7b904287a0e621999 WHIRLPOOL 715823eb0e936764ebfc5ad6c4bbc7b818f54c310081dd3112da2640923046582b4eaec8b8c0f85891adcf147b04fb25150d1322099664b75a091f39b3c729b5
 DIST powertop-1.13.tar.gz 104675 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98 SHA512 0c22a903da64798d987492336d57260372e03eab067ad94cf30b7640e9ee05e759a2fe9fa48fbdc35404cd2782b6b29d705e11e68452653b08f7f9df1a52be44 WHIRLPOOL 5ba44b84f49609f67c32563f75e20f6576c21a93fcb1ca99ebfe064475397602aa0f0fb9575e05b5a0290983791e7cf6ebae0139b39158b962e4b51027a6f5aa
 DIST powertop-2.2.tar.gz 617805 SHA256 1339e1bc3b9675c71dd70fed1132abf215d01469b348d23be7344bc65557b028 SHA512 f57586e100ca36a6787cd9a3794a8f057fffe7bd9decaa8cf04b9d81300bb1da7c2d1f7eab91e3c0faa9616b7d47007b6b796dcd777bde5aec53dbe3a7ed4bec WHIRLPOOL 62aae460529032d30174f51e1cd22d3986a197f6b03460184a4bd9b199c2f08a031e5f7c8732d552f479548c90cba567d93b95629d8ca1e668a5dd8aaa5c8d98
 EBUILD powertop-1.13.ebuild 1121 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030 SHA512 d87e4874baf0163ddef11ab5c2984ca276e98d551caaf2760e1054cde03e60248ee17ed143a0dcbca23f4a591b883c3b2e46fd1c7f773ab78e1fcb117340232e WHIRLPOOL a372742bb77b08e8b208342ca14e33f1a2d2d6287610613aebb7ec73ae76714448fd4baa39ec84f1f75658fcbd34ec42e058a1dc181e04c68c1d901ef0a78a2f
 EBUILD powertop-2.2-r1.ebuild 3642 SHA256 c21ac3f6f7cc6e51851b7e02e15ebe428b0960d521a404abc63546093982496b SHA512 93db7edddab96c7d056b625dbdb7d58f9792754537d576044b25bef33f2bdd2bf1e035f219fed9d759563e5c88cf71cb73556467ab48f7752dd18cc3ba3a0f23 WHIRLPOOL 1f78423f19479611a2bbb672276b3c36f3bf015d3c456850fc396a417c698fcee124a5c30e8d0db80ced8eb1d532f869158c600ac0770b2c591d20912c3c7eea
+EBUILD powertop-2.2-r2.ebuild 3699 SHA256 19056ba268d196fb7f5c0ef5599aeef9ddd9e4e298ce92d01ba68d5581dcf032 SHA512 b39b3c62f3a739d1f75a295e11f5e3fb84937c670f21c501a460fb6bad75637caec0a4c787c7142fd4c203abf0ab0e34859b625f12cda89223d73d900bf84411 WHIRLPOOL 0c079f8959d92d0e9c592a9640f5e58695f304f12543eab5b9306cc8f60557c99becd2d4c9cc1770b1a2de57d96b57277c8c8d70f311fea9f22fa2c9f8c80b3e
 EBUILD powertop-9999.ebuild 3571 SHA256 41577755e5780b4f57497589b7f698f56d07547b464b0da44e0133bb6b750e59 SHA512 1f046372ca7c386aecaf1c9244f4c900ee5edd23020018a38593850617f73b9aff21e29ec50733477d9cf6b2c60ecebfd07a0906e38f9c22b891ae57160927b7 WHIRLPOOL 775b70ef29bc9213a9cc04add3bface8e82723040e81ef01fe5f1ea1fd670abaf0810a1cac5ad1b0450d02ecac3aede3b2ff1daff4c58aca3ec2619e08f99634
-MISC ChangeLog 11177 SHA256 dd85f50c7f3c535077f859784a9459097224bddc4058b319039a881cf1dfee70 SHA512 d1fb744c3b3c275d4f6fedfebc6cc840cd2111b7de376c8eba9fe96b00f08c64cf752284e491dda7f4799a599184ae89cf56731df11fa64a798d30f47a1eae86 WHIRLPOOL 183d89dd9663498cd227e3533525db2d44a189fb1c19eb2de598aa45c5ce5e695657f8c91c95f9de34edd48654d64e434fc7cf0ca493cd1e63a73e7496230690
+MISC ChangeLog 11387 SHA256 e232a267c11d141164d5ca6d1bbcc884bd7ed911595b8ffb68f26d054452d77b SHA512 eb82f6f473cb0981ee9136df6e9471b098faf9509ee3f9a1caf43d346dba109c0517f2e0c855364f9e0321597a3a0307b1c6d6850212d598536529f51f89fb83 WHIRLPOOL eb4e6d5a47d03072e3b148cf90ff75f8a3c72f094deb661430c67867aa74d020acb97d5fb014d475ca99203b6e606b4484bbd561f816d45c6b6ef44ab2f53bc5
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJROYKqAAoJELEHsLL7fEFWzeYQAK9cvPqRfJUox5mKSZ9W1BSH
-1UTUmHbRns6PPwX3qbJejfOPEqD3aaTpMZJ5QghZhW74HLspmoEP/3DyfsdMXqUE
-YDnedlvR9No9RdeXMeHpjmcqQZlJbq1eslu4lANlpScChhEwBtEkmN6/NTC9pyyv
-L43wcV+6ShLA5o1Qg0fZVGyLHWdjr9B5Izebpc/YaO68DFtqGypn4/cgStS40nom
-LdTr+e80PENDP1rhcm7LlX7BUFBDGy3UlCQutV/3Sqdo11PPQo3WbFuGv8ueBZKF
-zrYndtxrirrnALNKzTe6lFPfo6pR89XusfMtFmkLT85/cnFdo2XcGytaNs8mZJz4
-vl3tIOXL4p7QdqG/phyN6Zovt55DlSP1A9fygXADX/yOA4OE5vSz+QEfI9NuA1oR
-en9asYnveHEH853kIe08jL66Szd7NU4WpZNBh3RdR/dIfmD9kurvQ6JhCPIl4BIt
-t3Ij91X846TifML2KsQEr9DpZVF7lLC8v3Vo3NxPPeMJ4uKLl1+l5pHNvmaIEvmi
-1snjxiLKVAsceTsxa/lvt2OIJGhr0AMUpe+qEv4uyX13FLBxG7ZXJ8lsm414y8YE
-TQ7YvfOI2oo1EATG7OD67RxcFvMt0nA2JlBZv1lPlpj9Inwnm2icHik9Z0I9LoiQ
-JRiwYN5WXObpCGWPKzIc
-=vV2S
+iQIcBAEBCAAGBQJRUHyvAAoJELEHsLL7fEFW2VwQAIlUiPf5aegwAe/UZ45cdPhv
+oLmBJONVEf8SkMXzGuYLqKzKcPX6MIrz18OI0R5DIHWZHMJYcIFOuaA+f8xH2VS7
+7IdtOGBm+x0aTAfvKP7NSaaOVQsdOutAGGULsterz0mt0eYOsyJODw7uTXpK0z/0
+DjaZdnYgPs7sJY9JA9H2dImPN1Xa22fOWrEXHoRmZrwdTS1ojX1f6k01PXp1cVIi
+yd/aONa4O7cUh4CO0n95s1FFBuWCkfJWwwCqEXYFCPu1xXmNT3cEPHqAA+6uIEXN
+EeKtyPsI3OGC6wB/qAcxOalYl0KZUHK/Y5cco9h1/Q+44xRac8Naswx/IilDJ0YE
+N4Kdi2fhvmbxC+l6kNhwbhsEsKbJZCS6pSaLRQlz0uYZvchN8FOMcVY48iSxLAO+
+3AfJb5Xqiu65zrAlFiZ2hOofVR885Kq3jplU7A023InCq5o2LWBiJjn93qeD1hSk
+WjxMr3jWPee497uOEgtYpJ36y33dpmvgBKDSkJ3USKAh+COoMPUMap1+4qE93sfO
+Uy6Zp24jEed+31VXI89To+ADIaRyAqYEzIUJR5SIZtxQKkcqpV7CQ14p9VscsAPy
+JEsKf3nq5OUWxZGgzZGTMwLlTA6EdFtQvn/T/ENTe87HyBJ08N0icduKVGmQ6i2d
+xqrICWHvuVbJmw5ar6m0
+=08ch
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch b/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch
new file mode 100644
index 000000000000..04f17a3b5e82
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch
@@ -0,0 +1,41 @@
+From 6626761dec9b3d1e3053d214913f329ed27c468c Mon Sep 17 00:00:00 2001
+From: Kristen Carlson Accardi <kristen@linux.intel.com>
+Date: Tue, 19 Mar 2013 16:45:47 -0700
+Subject: [PATCH] cpu: add new Intel cpuid
+
+update cpu to support next generation Intel core processor
+---
+ src/cpu/cpu.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
+index 1eb340c..afe6a8c 100644
+--- a/src/cpu/cpu.cpp
++++ b/src/cpu/cpu.cpp
+@@ -78,6 +78,7 @@ static class abstract_cpu * new_package(int package, int cpu, char * vendor, int
+ 			case 0x3A:      /* IVB */
+ 			case 0x3C:
+ 			case 0x3D:      /* IVB Xeon */
++			case 0x45:	/* Next Gen Intel Core Processor */
+ 				has_c2c7_res = 1;
+ 				ret = new class nhm_package;
+ 				break;
+@@ -116,6 +117,7 @@ static class abstract_cpu * new_core(int core, int cpu, char * vendor, int famil
+ 			case 0x3A:      /* IVB */
+ 			case 0x3C:
+ 			case 0x3D:      /* IVB Xeon */
++			case 0x45:	/* Next Gen Intel Core Processor */
+ 				ret = new class nhm_core;
+ 			}
+ 	}
+@@ -159,6 +161,7 @@ static class abstract_cpu * new_cpu(int number, char * vendor, int family, int m
+ 			case 0x3A:      /* IVB */
+ 			case 0x3C:
+ 			case 0x3D:      /* IVB Xeon */
++			case 0x45:	/* Next Gen Intel Core Processor */
+ 				ret = new class nhm_cpu;
+ 			}
+ 	}
+-- 
+1.8.1.2
+
diff --git a/sys-power/powertop/powertop-2.2-r2.ebuild b/sys-power/powertop/powertop-2.2-r2.ebuild
new file mode 100644
index 000000000000..b06bd5f68203
--- /dev/null
+++ b/sys-power/powertop/powertop-2.2-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r2.ebuild,v 1.1 2013/03/25 16:30:32 vapier Exp $
+
+EAPI="5"
+
+inherit eutils linux-info
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
+	inherit git-2 autotools
+	SRC_URI=""
+else
+	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="tool that helps you find what software is using the most power"
+HOMEPAGE="https://01.org/powertop/ http://www.lesswatts.org/projects/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses[unicode?]
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+DOCS=( TODO README )
+
+pkg_setup() {
+	if linux_config_exists; then
+		CONFIG_CHECK="
+			~X86_MSR
+			~DEBUG_FS
+			~PERF_EVENTS
+			~TRACEPOINTS
+			~NO_HZ
+			~HIGH_RES_TIMERS
+			~HPET_TIMER
+			~CPU_FREQ_STAT
+			~CPU_FREQ_GOV_ONDEMAND
+			~USB_SUSPEND
+			~FTRACE
+			~BLK_DEV_IO_TRACE
+			~TIMER_STATS
+			~EVENT_POWER_TRACING_DEPRECATED
+			~TRACING
+		"
+		if kernel_is -lt 3 7 0; then
+			linux_chkconfig_present SND_HDA_INTEL && CONFIG_CHECK+="~SND_HDA_POWER_SAVE"
+			linux_chkconfig_present SND_HDA_INTEL && ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+		fi
+		ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+		ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+		ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_NO_HZ="NO_HZ should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_USB_SUSPEND="USB_SUSPEND should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+		ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
+		ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+		ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+		linux-info_pkg_setup
+	else
+		ewarn "unable to find kernel config, all checks disabled"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-use-package_version.patch
+	epatch "${FILESDIR}"/${P}-cpu-add-new-Intel-cpuid.patch
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	default
+}
+
+src_compile() {
+	# This fixes cross-compiling.  Please verify before deleting.
+	emake -C src csstoh
+	cp "${FILESDIR}"/csstoh src/ || die
+	emake
+}
+
+src_install() {
+	default
+	keepdir /var/cache/powertop
+}