EAPI=2; tidy

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

3 files changed, 14 insertions, 12 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index 1912d89958f6..fa37504972c2 100644
--- a/games-misc/fortune-mod/ChangeLog
+++ b/games-misc/fortune-mod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/fortune-mod
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.24 2008/01/14 19:43:25 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.25 2010/01/25 22:52:18 mr_bones_ Exp $
+
+  25 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  fortune-mod-1.99.1-r2.ebuild:
+  EAPI=2; tidy
 
   14 Jan 2008; Fabian Groffen <grobian@gentoo.org>
   fortune-mod-1.99.1-r2.ebuild:
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index db0c1d8b5ae8..1c8cb347eb66 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,6 +1,6 @@
 AUX 01_all_fortune_all-fix.patch 783 RMD160 b9e0958d5f2ac3a6cd6404dfb70513077266ae0f SHA1 3845fecaf5c109d2f2eaafd1c49ac8868844bb20 SHA256 2208361d950999f14d59eda8f7b07e1fbef500d1424dd54bee7ad2082dee62c1
 AUX fortune-mod-1.99.1-gentoo.patch 2699 RMD160 01c0e6a534933841dd5529cb36bcc24874861275 SHA1 4733ec91baf87a2d96a285287e6943d0778861ea SHA256 840c56ee0128d118a861dd33c3aa04e635d20af5febc626864cdc22943223490
 DIST fortune-mod-1.99.1.tar.gz 1812089 RMD160 020e597bde43ebd58ea82171d0e69222dc26b566 SHA1 53aa354025094d7c0e544bb1662714815fa63918 SHA256 fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
-EBUILD fortune-mod-1.99.1-r2.ebuild 1409 RMD160 ada520a8264c8421f314bcc7b2856932f17ecd4a SHA1 0d5ecbd836f549662b0dac717b21f9c6a63ec180 SHA256 e6a58e98bbe466a5078f64ff85d83d2e0abf551458642eccc81d06934f1f33f7
-MISC ChangeLog 5500 RMD160 312bd5223341c9d2579171cd07592bd5bee9b83e SHA1 d401ae3f9653c25d2c2781bbbf933f897a666e87 SHA256 0eff32210a992234a0918648a4b3b75f77fec2b548d5c468e9c8dd09bec3e304
+EBUILD fortune-mod-1.99.1-r2.ebuild 1396 RMD160 eebd14cf113f56c69e73fe9e2a7c3a7a1703c43e SHA1 ebc50fdbbbd49af92d0afdb8ebfabfded4171b01 SHA256 849bdba3c9a85282f04cea7fa1de5e3fce53750426fce1f2e17af62c5e5f9632
+MISC ChangeLog 5605 RMD160 03b80e31effad3bb4e250f45b2494a6b1f88f052 SHA1 624bd4bf723a9ba4fe535e65ec4bcce717df0595 SHA256 4e60894390fbaec5ac8a380f963d206a6a8732c065e3f1a5652dc00f2199f243
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
index a0d212c846b1..99553ba28858 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.7 2008/01/14 19:43:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.8 2010/01/25 22:52:18 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
@@ -15,10 +16,7 @@ IUSE="offensive elibc_glibc"
 
 DEPEND="app-text/recode"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/01_all_fortune_all-fix.patch
 
@@ -32,7 +30,7 @@ src_unpack() {
 
 	if ! use elibc_glibc ; then
 		local reglibs="-lcompat"
-		built_with_use app-text/recode nls && reglibs="${reglibs} -lintl"
+		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
 		sed -i \
 			-e "/^REGEXLIBS=/s:=.*:= ${reglibs}:" \
 			Makefile \
@@ -45,6 +43,6 @@ src_compile() {
 }
 
 src_install() {
-	make prefix="${D}" install || die "make install failed"
+	emake prefix="${D}" install || die "emake install failed"
 	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
 }