[gentoo-commits] gentoo-x86 commit in sys-power/powertop: powertop-9999.ebuild powertop-2.2-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in sys-power/powertop: powertop-9999.ebuild powertop-2.2-r1.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      13/03/08 06:16:03

  Modified:             powertop-9999.ebuild powertop-2.2-r1.ebuild
                        ChangeLog
  Log:
  Fix cross-compiling.  Again.
  
  (Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.17                 sys-power/powertop/powertop-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-9999.ebuild?r1=1.16&r2=1.17

Index: powertop-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- powertop-9999.ebuild	22 Nov 2012 15:00:37 -0000	1.16
+++ powertop-9999.ebuild	8 Mar 2013 06:16:03 -0000	1.17
@@ -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 @@
 }
 
 src_prepare() {
-	if [ ${PV} == "9999" ] ; then
+	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
 }
@@ -93,6 +93,13 @@
 	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



1.3                  sys-power/powertop/powertop-2.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild?r1=1.2&r2=1.3

Index: powertop-2.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- powertop-2.2-r1.ebuild	9 Dec 2012 20:48:24 -0000	1.2
+++ powertop-2.2-r1.ebuild	8 Mar 2013 06:16:03 -0000	1.3
@@ -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 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use-package_version.patch
-	if [ ${PV} == "9999" ] ; then
+	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
 }
@@ -96,8 +96,9 @@
 }
 
 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
 }
 



1.75                 sys-power/powertop/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/powertop/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	9 Dec 2012 20:48:24 -0000	1.74
+++ ChangeLog	8 Mar 2013 06:16:03 -0000	1.75
@@ -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,