Bump to EAPI=5 and clean the ebuild

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 56 insertions, 50 deletions

diff --git a/dev-scheme/stalin/ChangeLog b/dev-scheme/stalin/ChangeLog
index 15a69736592a..26963fa414f1 100644
--- a/dev-scheme/stalin/ChangeLog
+++ b/dev-scheme/stalin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-scheme/stalin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stalin/ChangeLog,v 1.2 2014/08/10 21:26:00 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stalin/ChangeLog,v 1.3 2015/03/21 16:25:50 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml, stalin-0.11.ebuild:
+  Bump to EAPI=5 and clean the ebuild
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> stalin-0.11.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-scheme/stalin/Manifest b/dev-scheme/stalin/Manifest
index 4789e8a13cc7..76b0d4879bba 100644
--- a/dev-scheme/stalin/Manifest
+++ b/dev-scheme/stalin/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST stalin-0.11.tgz 5392735 SHA256 95eafb4fa870cb93f5d79b8935c42664cf54f227b2c7eacf7b55b06b33e1e3fe
-EBUILD stalin-0.11.ebuild 2474 SHA256 4960153f723cbb1850b4d500bca194a9b7f68a61737c237818fe99f6727c99a4 SHA512 661cc761f5748774eab4db5a87a63994e4ef795ebb89e6b32563148fb94431a23236c1f34a8b039c19381f536f7f9a3a11a405b23a6da713c209a494ccd895ee WHIRLPOOL f2b6aa7a93391be3b81d29b4fee371234d36d2b1dfbce1a5f098fb52551a632f1c67c0a77e52fd7bd10fda22623b884fea34494b2c29ce457d8d5e7b974be1e7
-MISC ChangeLog 540 SHA256 093affb5fb1c6efc891bc17ff2b1eef4cc13100aad58ef373e21b416a188243d SHA512 bda57e9c6b248dc9d4fab31c055323678cd2b9e141d62ec1d4eec6649217d6c11e78183aa3f5f1f8919fde0651e18c0d9e2223d965159cd86017aa095b417ca5 WHIRLPOOL b8ccc0dc0da34b63e2a9038366fbc54e86eff3ba7be1a88b03f5ebbcf5dfd5382a46f87a2610fc0a2a7016880b284cc603f7903f43d5a761533fd490ba47f83a
-MISC metadata.xml 552 SHA256 c1426710f72a427a727ba4cfc25562f739feb396e6cf48dd3f60b21ed69af61e SHA512 f19e0497a7775c0b1419bb7f10d8756fce192afa7fcba9a679aef8a18db381afcebf9e2b5de37b76e4945709d55dcb514f1408ebde133d84d89314c20b53f8e6 WHIRLPOOL ee08a29c0072f6c211aec07eeeb6df4ef00cee7f7815baf1f5cb23aaba26f7688d05f323c88908a5800b5c0a1179c393da700eeb5aaba6e3eaaf520ea7bb26ee
+DIST stalin-0.11.tgz 5392735 SHA256 95eafb4fa870cb93f5d79b8935c42664cf54f227b2c7eacf7b55b06b33e1e3fe SHA512 c42dfd5e6240fb865adc6c6f20dec2ae5fae9273a7750f4919a9fabfe8f2cd533031ca977006bb700939b7e5c113700cffdbddbc816a535996ab012cecb62517 WHIRLPOOL 6b623bd1667deef1c7cda014845b2550eae7600001647e706e5a0bbaa2dbb2eae840adbd1f4483a201e8c1b347f50aefcf6a1d99bf53adffebdd10e5507885fa
+EBUILD stalin-0.11.ebuild 2083 SHA256 8b6508380ecbaf56aaef34635cb5333a4bf08708ad0b0104e245f36f20730b1a SHA512 0ff2558ad8da62ef7d0227153b2aa0ae69498611f85c6dbc5083a8cae75a085facf7f22c5e40d4ea133a97adc9d3f79028b5d599698e8c6077f65dc42255e354 WHIRLPOOL e021b52cc1ebc43c5e7c0f8b90deb3f782ff887d64aa2be2ef711260938abef8f1cbc561278022374914d66adc8b41d5a90d438ff66803a8885b0433cb2c40b9
+MISC ChangeLog 658 SHA256 57b3d0b644caa3f7cf61530a2d225a7105cba1e587009fd39d3b99ebf7afe083 SHA512 5caaa98e3ca651680ae5872c70427161950874001443521506511e92a394fd3b5b3c8aec0843070a2b2c11598eb626c9e6da5a79301d54adb14b79c74c4db2bd WHIRLPOOL 03074f18cd7db33ab143918c5f9ea34911a7f27690025af36cab9e4079e27840a27bff4dbf12f6c74213a86ece6fa3f4f91555f39b9ea1dddd498f58e8812af3
+MISC metadata.xml 559 SHA256 cb79efe572b2144556c4d0cc1a7ab3a393fed00220f3a0a0b14a969d57f81ada SHA512 018318483e65f2aa89bb42273eb105668652793ee75dc8e36c95dd3929d377f814f186eb2e286489aca126d68750eefd263dff1999448f611273eb0bf50bc21d WHIRLPOOL 50cdf3b03824d169495ceedc5d2fa077b5a8ef93214cd533f509c933ae2da92a424fb0e6436a4c87de6173a93fbc660d8f9b6782513457d2e9fe348e5d959589
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn42gACgkQcaHudmEf86ozzACdFzfvqtmv6Ftgkh/jmnDhwv2B
-IEwAn1BjQ2hMTIg8GhOGhASUBGzDCAnW
-=iIdU
+iQJ8BAEBCgBmBQJVDZuTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViriuMP/RHv4WsbBdN5mvT89xdPsz+x
+Qlzqu87O+8CPhNp/Cgu3I5WkRJ1vR1R8HUgOmqEY77gVzAEhDA2DOe85Uc6C2ST2
+tvl+e9YBnFruhLqK47KnJUBg8z6fJRLoRxqNC3bFWKyaqke7AQ/q77y9mUmC5bc5
+XNc9Y8df6Gt6G/ZuiaOyj4qBikFXk6OB/8ZRhYXsZJbheaZxDzgwVui980SsMBS5
+KJxMDq/EYp34GpdOyKW4KT/8rfJCZEOoealGKIU13Cfbp0v4zq4Zh+uCiuBUWT+3
+5PIBhk49V3ofDjujizzuVCNyp5bfjahW2T9m0kUG9x1mfaKhE/kBpZ9oo0UldosV
+i6qx6MWizfTikhdD6531gVmmVeet4i76+Lml/QWl2ZL1C2MZ42iYLDIk02Bymlm3
+MKEBNUxnxNzSdU2kwSHbQJXlK8weMbP+x/0kJila95UYbDOJeQpSwKvw9xyFfY9t
++M7LEuv+5ZIbUoUVvJwE4eHFuLPGRgrvtqW4r/Uy3j9JJv39BOvaIMOFLwtxdwml
+3UKfaAnxZ1cpaYg/oR7PcT/x+s5GgqGEvmPBKnU9NzzpV9FP/SUhs06YnBY1FpDj
+Zw4kW9kCpDxPwEF9z4QZKxaXTez2oYu70rATwNmLJdZovjpkqUZkK+G2tG8PtzQr
+dOUup50R8z3vr8W9383w
+=zIxm
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/stalin/metadata.xml b/dev-scheme/stalin/metadata.xml
index 2a1ff0f8a0dc..06b97553c3d2 100644
--- a/dev-scheme/stalin/metadata.xml
+++ b/dev-scheme/stalin/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
-	<maintainer>
-		<email>pchrist@gentoo.org</email>
-		<name>Panagiotis Christopoulos</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>scheme</herd>
+  <maintainer>
+    <email>pchrist@gentoo.org</email>
+    <name>Panagiotis Christopoulos</name>
+  </maintainer>
+  <longdescription lang="en">
 		Stalin is an aggressively optimizing Scheme compiler. It is the most
 		highly optimizing Scheme compiler, and in fact one of the most highly
 		optimizing compilers of any sort for any language. It was written by 
 		Jeffrey M. Siskind.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/dev-scheme/stalin/stalin-0.11.ebuild b/dev-scheme/stalin/stalin-0.11.ebuild
index 9128073c9c6b..e3b215665e03 100644
--- a/dev-scheme/stalin/stalin-0.11.ebuild
+++ b/dev-scheme/stalin/stalin-0.11.ebuild
@@ -1,41 +1,37 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stalin/stalin-0.11.ebuild,v 1.4 2014/08/10 21:26:00 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stalin/stalin-0.11.ebuild,v 1.5 2015/03/21 16:25:50 jlec Exp $
+
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="An aggressively optimizing Scheme compiler"
 HOMEPAGE="http://community.schemewiki.org/?Stalin"
 SRC_URI="ftp://ftp.ecn.purdue.edu/qobi/${P}.tgz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RESTRICT="strip"
+
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's/-O3 -fomit-frame-pointer/$(CFLAGS)/' makefile
-}
+RESTRICT="strip"
 
-pkg_setup() {
-	ewarn "Stalin is an ugly beast, which will eat all your memory and stress your"
-	ewarn "processor to levels you have never experienced. If you want to abort,"
-	ewarn "please do it now. You have been warned."
+src_prepare() {
+	sed -i -e "s/-O3 -fomit-frame-pointer/${CFLAGS}/" makefile  || die
 }
 
 src_compile() {
-	einfo "Beginning of stalin's compilation process. It may take several minutes."
 	./build || die "Stalin's compilation failed"
 }
 
 src_test() {
 	einfo "This may take REALLY much time and requires"
 	einfo "possibly more than 2Gb of RAM+swap."
-	cd benchmarks
+	cd benchmarks || die
 	./compile-and-run-stalin-old-benchmarks || die "old benchmarks failed"
 	#./compile-and-run-stalin-bcl-benchmarks || die "bcl bechmarks failed"
 	#./compile-and-run-stalin-fdlcc-benchmarks || die "fdlcc benchmarks failed"
@@ -43,32 +39,28 @@ src_test() {
 
 src_install() {
 	pushd include
-		dodir /usr/include/${PN}
-		insinto /usr/include/${PN}
-		doins gc.h gc_config_macros.h
-		dodir /usr/lib/${PN}
-		insinto /usr/lib/${PN}
-		doins libgc.a libstalin.a stalin stalin-architecture-name \
+	doheader gc.h gc_config_macros.h
+	insinto /usr/lib/${PN}
+	doins \
+		libgc.a libstalin.a stalin stalin-architecture-name \
 		stalin.architectures QobiScheme.sc xlib.sc xlib-original.sc \
 		Scheme-to-C-compatibility.sc
-		fperms 755 /usr/lib/${PN}/stalin \
-		/usr/lib/${PN}/stalin-architecture-name
+	fperms 755 /usr/lib/${PN}/stalin /usr/lib/${PN}/stalin-architecture-name
 	popd
-(
-cat <<'EOF'
-#!/bin/bash
 
-exec /usr/lib/stalin/stalin -I /usr/include/stalin \
--I /usr/lib/stalin -copt -fno-strict-aliasing $@
+	cat > stalin  <<- EOF
+	#!/bin/bash
+
+	exec /usr/lib/stalin/stalin -I /usr/include/stalin \
+		-I /usr/lib/stalin -copt -fno-strict-aliasing $@
+
+	EOF
 
-EOF
-) > stalin
-	exeinto /usr/bin
-	doexe stalin
+	dobin stalin
 	doman stalin.1
 	dodoc ANNOUNCEMENT MORE README
 	pushd benchmarks
-		sed -i -e 's/..\/stalin/stalin/' make-hello
+		sed -i -e 's/..\/stalin/stalin/' make-hello || die
 		dodoc hello.sc make-hello
 	popd
 }