Bump to EAPI=3, add prefix keywords

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

3 files changed, 37 insertions, 20 deletions

diff --git a/dev-lang/mosml/ChangeLog b/dev-lang/mosml/ChangeLog
index 38c674559958..cdd139f5e661 100644
--- a/dev-lang/mosml/ChangeLog
+++ b/dev-lang/mosml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mosml
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.12 2009/08/17 01:41:25 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.13 2010/04/06 09:13:55 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> mosml-2.01-r1.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   17 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> mosml-2.01.ebuild,
   mosml-2.01-r1.ebuild:
diff --git a/dev-lang/mosml/Manifest b/dev-lang/mosml/Manifest
index 44ac0601e931..0ba2e8d87cb6 100644
--- a/dev-lang/mosml/Manifest
+++ b/dev-lang/mosml/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mosml-2.01-malloc.patch 688 RMD160 61b3f87ad34235b0ddf502c38286b0bff1bad817 SHA1 706f795aa94668873d93a304014154e1f57c57d8 SHA256 b03324dd9a62ca564cf50cdf300b08c22d03a2b724832f1783a130dce787d823
 DIST mos201src.tar.gz 2314392 RMD160 b2a9582d8c0bfdad2b8a74740e54ab33d3856637 SHA1 eba58486b10f0359fafba488fa1bf366b2aabf8a SHA256 9ec5695358a4aa4702d856c026f3cf0bce77275e8d1318fd90d455a44c46edff
-EBUILD mosml-2.01-r1.ebuild 1461 RMD160 13719a053d52d46a298458137ba502daae146063 SHA1 f094f39ef899d7e10ebaaedee3283c5854845237 SHA256 dae74b544a893b13e778a90493264b1841c790701ce6fa4f3ecb08253a499ed6
+EBUILD mosml-2.01-r1.ebuild 1585 RMD160 3d85485b60b8c05fd424992fd4cf87db9a7428ad SHA1 d4822112196eb5125b0f45d884ef8559fe5c4723 SHA256 baf540a6d78b4db7cb4a6311676bc9027b49cd6a4d27cc89acaa7b9fe0ebf4cf
 EBUILD mosml-2.01.ebuild 1208 RMD160 8eeab92e5190f214e2eb33e0cd7a9ea2ef81ffa5 SHA1 ed64bf22930873a5c4c28b64e64bde84ad2ca9e7 SHA256 b7bb168ec6107d747a99e9a803d7fb9b6da010e9d7fc974269f1fddfba7eb5da
-MISC ChangeLog 1939 RMD160 ff0c372e870606eb2a13efbd40e3d8ab82e2f9bc SHA1 8b3c6c5c827f6e11f8c0115554472328aafc4b16 SHA256 507df2959f75dfb2b5153f8b8193c1f389f2a2f0ae1f91d2b0f445e8d1884247
+MISC ChangeLog 2045 RMD160 f14c99e42501378afc30039cf0baf8fa1d6a8bb1 SHA1 e1b3ba242575bad50a572716ac11ddbf02f26554 SHA256 f4e37118d1de5a6d622c447019cf29379c0207de58f5a1b6c144ce89dd465043
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku6+1gACgkQOypDUo0oQOp6CgCg2pvANkquxEcuX82HT+o9R0e0
+NqoAoN2OQGfOk0yy3i9SRQFySm2vlN4I
+=mBOo
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/mosml/mosml-2.01-r1.ebuild b/dev-lang/mosml/mosml-2.01-r1.ebuild
index 9f44f1538f0b..b152d41f2041 100644
--- a/dev-lang/mosml/mosml-2.01-r1.ebuild
+++ b/dev-lang/mosml/mosml-2.01-r1.ebuild
@@ -1,49 +1,53 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01-r1.ebuild,v 1.4 2009/08/17 01:41:25 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01-r1.ebuild,v 1.5 2010/04/06 09:13:55 abcd Exp $
+
+EAPI="3"
 
 inherit eutils
 
-S="${WORKDIR}/${PN}/src"
 DESCRIPTION="Moscow ML - a lightweight implementation of Standard ML (SML)"
 SRC_URI="http://www.itu.dk/people/sestoft/mosml/mos201src.tar.gz"
 HOMEPAGE="http://www.itu.dk/people/sestoft/mosml.html"
+
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S="${WORKDIR}/${PN}/src"
+
+
+src_prepare() {
 	epatch "${FILESDIR}/${P}-malloc.patch" #154859
 
 	#Fixing pre-stripped files
 	sed -i -e "/STRIP/d" mosmlyac/Makefile || die "sed Makefile failed"
 	sed -i -e "/STRIP/d" runtime/Makefile || die "sed Makefile failed"
+
+	sed -i -e "s|^CPP=/lib/cpp|CPP=${EPREFIX}/usr/bin/cpp|" Makefile.inc
 }
 
+src_configure() { :; }
+
 src_compile() {
 	emake CC=$(tc-getCC) CPP="$(tc-getCPP) -P -traditional -Dunix -Umsdos" \
-		MOSMLHOME=/opt/mosml world || die
+		MOSMLHOME="${EPREFIX}"/opt/mosml world || die
 }
 
-src_install () {
-
-	make MOSMLHOME="${D}"/opt/mosml install || die
-	rm "${D}"/opt/mosml/lib/camlrunm # This is a bad symlink
-	echo "#!/opt/mosml/bin/camlrunm" > "${D}"/opt/mosml/lib/header
+src_install() {
+	emake -j1 MOSMLHOME="${ED}"/opt/mosml install || die
+	rm "${ED}"opt/mosml/lib/camlrunm # This is a bad symlink
+	echo "#!${EPREFIX}/opt/mosml/bin/camlrunm" > "${ED}"opt/mosml/lib/header
 
 	dodoc  ../README
-	into   /usr/bin
 	dosym  /opt/mosml/bin/mosml     /usr/bin/mosml
 	dosym  /opt/mosml/bin/mosmlc    /usr/bin/mosmlc
 	dosym  /opt/mosml/bin/mosmllex  /usr/bin/mosmllex
 	dosym  /opt/mosml/bin/mosmlyac  /usr/bin/mosmlyac
 	dosym  /opt/mosml/bin/camlrunm  /usr/bin/camlrunm
 	dosym  /opt/mosml/bin/camlrunm  /opt/mosml/lib/camlrunm
-
 }