Migrate Gentoo Prefix modifications from overlay. EAPI, arch-specific fixes, KEYWORDS. bug 389943

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

3 files changed, 24 insertions, 11 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index 5dafe4668fa4..3bfa79c0818f 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.26 2010/10/08 08:34:50 leio Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.27 2011/11/16 16:01:11 darkside Exp $
+
+  16 Nov 2011; Jeremy Olexa <darkside@gentoo.org> fortune-mod-1.99.1-r2.ebuild:
+  Migrate Gentoo Prefix modifications from overlay. EAPI, arch-specific fixes,
+  KEYWORDS. bug 389943
 
   08 Oct 2010; Mart Raudsepp <leio@gentoo.org> fortune-mod-1.99.1-r2.ebuild:
   Drop to ~mips
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 9b835ecc03a4..cfc9e615a353 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 1392 RMD160 1961d70207e17293dacebfd2234b35f72749416e SHA1 a992b9e5aa1c4d20cbaf907f8d7d7f4af529169d SHA256 49d6f760c27ca0ac57b2b4fc2fa19c4fa6d7bb256731abde16f04e89a6be9cc2
-MISC ChangeLog 5694 RMD160 64a51f3360545fcc5ea3ca93ad16273efbdf53d2 SHA1 dd9e80670ad1fd78b3ea23df82d2305c2fff1df5 SHA256 c431e573e2d4aa8bc19862e0e831f53669677e2b208cbca7332c8c3804200010
+EBUILD fortune-mod-1.99.1-r2.ebuild 1890 RMD160 6f87d3c24b86eb23e98df14ca82386c6eb386938 SHA1 38095f1ee579106dafe14b6ee38f0267d6853882 SHA256 d6361a7c119653661bf533b9ce81f470ec0398af84dec0ad7fb9d3f45f3ea12a
+MISC ChangeLog 5881 RMD160 c1ff1824a0ea7dcc4e965017c5ea5f5b2165c199 SHA1 35d9328efefaf2e9fe0b5cb7364561b8e47fca60 SHA256 f2338889132423b6b7ae8cd09a4046ab1c4bfdc07882ae056b39a315ba51958a
 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 f5fda3984aeb..f448b39b837e 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,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.9 2010/10/08 08:34:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.10 2011/11/16 16:01:11 darkside Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
@@ -11,7 +11,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive elibc_glibc"
 
 DEPEND="app-text/recode"
@@ -29,20 +29,29 @@ src_prepare() {
 		Makefile || die "sed Makefile failed"
 
 	if ! use elibc_glibc ; then
-		local reglibs="-lcompat"
+		[[ ${CHOST} == *-*bsd* ]] && local reglibs="-lcompat"
+		[[ ${CHOST} == *-darwin* ]] && local reglibs="-lc"
 		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
 		sed -i \
 			-e "/^REGEXLIBS=/s:=.*:= ${reglibs}:" \
 			Makefile \
 			|| die "sed REGEXLIBS failed"
 	fi
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's:u_int:uint:g' util/strfile.h || die "sed strfile.h failed"
+	fi
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/-DBSD_REGEX/-DPOSIX_REGEX/' Makefile || die "sed Makefile failed"
+	fi
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	local myrex=
+	[[ ${CHOST} == *-interix* ]] && myrex="REGEXDEFS=-DNO_REGEX"
+	emake CC="$(tc-getCC)" $myrex || die "emake failed"
 }
 
 src_install() {
-	emake prefix="${D}" install || die "emake install failed"
+	emake prefix="${ED}" install || die "emake install failed"
 	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
 }