Fix cross-compiling. Again.

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

4 files changed, 47 insertions, 15 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 3edfdedf44ae..a8d7576af7bc 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/powertop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.74 2012/12/09 20:48:24 zerochaos Exp $
+# 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 $
+
+  08 Mar 2013; Mike Frysinger <vapier@gentoo.org> powertop-2.2-r1.ebuild,
+  powertop-9999.ebuild:
+  Fix cross-compiling.  Again.
 
   09 Dec 2012; Rick Farina <zerochaos@gentoo.org> -powertop-1.11.ebuild,
   -powertop-2.0.ebuild, -powertop-2.1-r1.ebuild, -powertop-2.1.ebuild,
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index a7d8c5d4caaa..3ea89735701e 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX csstoh 198 SHA256 03e4300bd73e0b8da29546e79f2c94be90626c545d88c84c2c95dd04b2d94035 SHA512 321087047f82cc2001e8f85495cefd7bdc19a6ede32ac9065f72e7e7970b979bdb5e1a534f0e6070502adc18a2c3c5f509aa21c39590e10c15b293b6f231d08d WHIRLPOOL 221f3cfdc896812e86a6241999e8c9acf453f37c47fa34dd8f49b60c1191849e33b641dcaef41bb5e1f9ecf270b681dfe093d45c122c5fe1c5572245c73d0f3c
 AUX powertop-1.98-build-cc.patch 704 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457 SHA512 90c8fa25b59ebc726faee96a7a01fe992a271f6cd0c259d59eaf9276b557d84847e1e1588f0db43098cb9b10d04766f727271df99e51cb31592c0e98b76b2793 WHIRLPOOL 0e259abbcded879ecf8f6bb951bd84190a74fe186dd34fba31e24cadf2cc5c93c558f3c506e684d95638a05cd130b8db5c344d97a24ab96e6934bedeed7c29ad
 AUX powertop-1.98-build-libnl-3.patch 611 SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328 SHA512 c81b029c18d192792b6ffa89e7f56e12d3c74a37338fa56ea1f7401bd7bf83353b54cbe6b53e85285a2e1627b8b92c8ea84d2bcd59f24035d4e34fef4f6ac256 WHIRLPOOL 7771eb8c61b17c730d338bee42a604e52acb6a4d7ce0b68e419a73b5acd5620cf0771d3885c877bb76de20a4388b83b96afe2517e24e689c7143044eebcd1925
@@ -7,7 +10,24 @@ AUX powertop-2.2-use-package_version.patch 740 SHA256 40258728ae75fb0ba425bd1295
 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 3611 SHA256 6fe87328a9cdd1a36aa96a5670ffc09a17c0e885f54bbc09ef36613a17e06490 SHA512 ac7c40d0f6297df5c5f3b2142fdddf97264112769a55a08359663dffb87b99112a8c4177cade94a50792c5e74205501ddb9677bf853b8c65ad6db7b6c7b94375 WHIRLPOOL b92664bdc3d9458548762192c6e87ce28c18a81bc887a2661fdeefdd65fd6cd735c38a29a384d092a7de0b7c045bfffe796d4322ce6c5c11dc06abf298b1647d
-EBUILD powertop-9999.ebuild 3423 SHA256 daa3420ab6ef011b084486dd9e1ec6aea837b8ef9c5cd6c331d881ad4a30d1fc SHA512 e2075b5c8f8465c59fbeacf7517991c8ece4325ae7afbce9c612b992084d70a81d33d865e3145f5407239b4fbfbd8d583a94d5c21ba10d743cb0a6d4b6fc9df4 WHIRLPOOL d000d6c661171660a4bc9683b3a8db493d918bf500ffc0b39e914c6fceb6eef880fa4e4c76ca3a3902abf5b1e193020ad95c1ea766e4b1606b5499b20741ccbe
-MISC ChangeLog 11050 SHA256 2b88d8cd8d4584a96dc03ed82b66969fc1e4234214051bc93622e7e24456514a SHA512 52bb36f90b683c7d96f4ff40d0a54544be42b70b9d2ed7c2d22a278290517b93ac87f4d4d19304f5f87d6da35e39dcc31a742a366a4d6da4175790951a266ee7 WHIRLPOOL 3bb02d74acd888c4b083478c9d6fd0488ee167b0d60c9928851cc9c871461dfc329c862a5a034ed460c6b8c30b66fc2bd03ec9527a6e5cfc89dff75d2d3c4036
+EBUILD powertop-2.2-r1.ebuild 3642 SHA256 c21ac3f6f7cc6e51851b7e02e15ebe428b0960d521a404abc63546093982496b SHA512 93db7edddab96c7d056b625dbdb7d58f9792754537d576044b25bef33f2bdd2bf1e035f219fed9d759563e5c88cf71cb73556467ab48f7752dd18cc3ba3a0f23 WHIRLPOOL 1f78423f19479611a2bbb672276b3c36f3bf015d3c456850fc396a417c698fcee124a5c30e8d0db80ced8eb1d532f869158c600ac0770b2c591d20912c3c7eea
+EBUILD powertop-9999.ebuild 3571 SHA256 41577755e5780b4f57497589b7f698f56d07547b464b0da44e0133bb6b750e59 SHA512 1f046372ca7c386aecaf1c9244f4c900ee5edd23020018a38593850617f73b9aff21e29ec50733477d9cf6b2c60ecebfd07a0906e38f9c22b891ae57160927b7 WHIRLPOOL 775b70ef29bc9213a9cc04add3bface8e82723040e81ef01fe5f1ea1fd670abaf0810a1cac5ad1b0450d02ecac3aede3b2ff1daff4c58aca3ec2619e08f99634
+MISC ChangeLog 11177 SHA256 dd85f50c7f3c535077f859784a9459097224bddc4058b319039a881cf1dfee70 SHA512 d1fb744c3b3c275d4f6fedfebc6cc840cd2111b7de376c8eba9fe96b00f08c64cf752284e491dda7f4799a599184ae89cf56731df11fa64a798d30f47a1eae86 WHIRLPOOL 183d89dd9663498cd227e3533525db2d44a189fb1c19eb2de598aa45c5ce5e695657f8c91c95f9de34edd48654d64e434fc7cf0ca493cd1e63a73e7496230690
 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
+-----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-2.2-r1.ebuild b/sys-power/powertop/powertop-2.2-r1.ebuild
index 9443d3c3fcbd..8b81f3396c76 100644
--- a/sys-power/powertop/powertop-2.2-r1.ebuild
+++ b/sys-power/powertop/powertop-2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2012/12/09 20:48:24 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild,v 1.3 2013/03/08 06:16:03 vapier Exp $
 
 EAPI="5"
 
 inherit eutils linux-info
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
 	inherit git-2 autotools
 	SRC_URI=""
@@ -85,7 +85,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use-package_version.patch
-	if [ ${PV} == "9999" ] ; then
+	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
 }
@@ -96,8 +96,9 @@ src_configure() {
 }
 
 src_compile() {
-	#the clean is needed because the 2.1 tarball had object files in src/tuning/
-	emake clean
+	# This fixes cross-compiling.  Please verify before deleting.
+	emake -C src csstoh
+	cp "${FILESDIR}"/csstoh src/ || die
 	emake
 }
 
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index ba7570238b3e..b1efc316eb65 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-9999.ebuild,v 1.16 2012/11/22 15:00:37 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.17 2013/03/08 06:16:03 vapier Exp $
 
 EAPI="4"
 
 inherit eutils linux-info
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
 	inherit git-2 autotools
 	SRC_URI=""
@@ -83,7 +83,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${PV} == "9999" ] ; then
+	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
 }
@@ -93,6 +93,13 @@ src_configure() {
 	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