Bump to EAPI=3, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 29 insertions, 20 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index e00b29ba4e15..6908e8298259 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,9 @@
 # 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.49 2010/01/16 23:57:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.50 2010/03/31 21:32:11 abcd Exp $
+
+  31 Mar 2010; Jonathan Callen <abcd@gentoo.org> cpufrequtils-007.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
 *cpufrequtils-007 (16 Jan 2010)
 
diff --git a/sys-power/cpufrequtils/cpufrequtils-007.ebuild b/sys-power/cpufrequtils/cpufrequtils-007.ebuild
index 19a3bf644d85..84bbc78887e9 100644
--- a/sys-power/cpufrequtils/cpufrequtils-007.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-007.ebuild
@@ -1,6 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-007.ebuild,v 1.2 2010/03/31 21:32:11 abcd Exp $
+
+EAPI=3
 
 inherit eutils toolchain-funcs multilib
 
@@ -10,24 +12,24 @@ SRC_URI="mirror://kernel/linux/utils/kernel/cpufreq/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls"
 
 DEPEND="sys-fs/sysfsutils"
 
 ft() { use $1 && echo true || echo false ; }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-007-build.patch
 	epatch "${FILESDIR}"/${PN}-007-nls.patch #205576 #292246
+}
 
+src_configure() {
 	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}"
+	export mandir="${EPREFIX}/usr/share/man"
+	export libdir="${EPREFIX}/usr/$(get_libdir)"
+	export docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
 src_compile() {
@@ -37,6 +39,8 @@ src_compile() {
 		AR="$(tc-getAR)" \
 		STRIP=: \
 		RANLIB="$(tc-getRANLIB)" \
+		LIBTOOL="${EPREFIX}"/usr/bin/libtool \
+		INSTALL="${EPREFIX}"/usr/bin/install \
 		|| die
 }
 
diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index ea28f657a9a4..5e6cae1a1bd9 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.30 2010/03/08 20:57:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.31 2010/03/31 21:35:31 abcd Exp $
+
+  31 Mar 2010; Jonathan Callen <abcd@gentoo.org> powertop-1.11.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   08 Mar 2010; Markus Meier <maekke@gentoo.org> powertop-1.11.ebuild:
   arm stable, bug #302349
diff --git a/sys-power/powertop/powertop-1.11.ebuild b/sys-power/powertop/powertop-1.11.ebuild
index 2d389f8711d4..606457c4113a 100644
--- a/sys-power/powertop/powertop-1.11.ebuild
+++ b/sys-power/powertop/powertop-1.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.11.ebuild,v 1.7 2010/03/08 20:57:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.11.ebuild,v 1.8 2010/03/31 21:35:31 abcd Exp $
+
+EAPI=3
 
 inherit toolchain-funcs eutils
 
@@ -10,29 +12,26 @@ SRC_URI="http://www.lesswatts.org/projects/powertop/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86"
+KEYWORDS="amd64 arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="unicode"
 
-DEPEND="sys-libs/ncurses
+DEPEND="sys-libs/ncurses[unicode?]
 	sys-devel/gettext"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i '/${CFLAGS}/s:$: ${LDFLAGS}:' Makefile
 	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${ED}" || die
 	dodoc Changelog README
-	gunzip "${D}"/usr/share/man/man1/powertop.1.gz
+	gunzip "${ED}"/usr/share/man/man1/powertop.1.gz
 }
 
 pkg_postinst() {