Migrate to EAPI 2.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

2 files changed, 11 insertions, 12 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index 0378d68ea600..87ad9230dcaa 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-process/htop
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.72 2009/03/04 21:51:08 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.73 2009/03/08 14:16:47 betelgeuse Exp $
+
+  08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> htop-0.8.1-r1.ebuild:
+  Migrate to EAPI 2.
 
   04 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
   +files/htop-0.8.1-no-plpa.patch, htop-0.8.1-r1.ebuild:
diff --git a/sys-process/htop/htop-0.8.1-r1.ebuild b/sys-process/htop/htop-0.8.1-r1.ebuild
index 27f12086e38f..802cd0df7059 100644
--- a/sys-process/htop/htop-0.8.1-r1.ebuild
+++ b/sys-process/htop/htop-0.8.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.1-r1.ebuild,v 1.8 2009/03/04 21:51:08 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.1-r1.ebuild,v 1.9 2009/03/08 14:16:47 betelgeuse Exp $
+
+EAPI="2"
 
 inherit autotools eutils flag-o-matic
 
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses[unicode?]"
 
 pkg_setup() {
 	if use elibc_FreeBSD && ! [[ -f "${ROOT}"/proc/stat && -f "${ROOT}"/proc/meminfo ]] ; then
@@ -24,9 +26,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-desktop-entry.patch
 	epatch "${FILESDIR}"/${P}-non-printable-char-filter.patch
 	epatch "${FILESDIR}"/${P}-no-plpa.patch
@@ -34,19 +34,15 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		die "for unicode support of htop, sys-libs/ncurses must be emerged with USE=unicode"
-	fi
+src_configure() {
 	useq debug && append-flags -O -ggdb -DDEBUG
 	econf \
 		--enable-taskstats \
 		$(use_enable unicode) \
 		|| die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO
+	dodoc README ChangeLog TODO || die
 }