EAPI=5

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 22 insertions, 27 deletions

diff --git a/games-strategy/netherearth/ChangeLog b/games-strategy/netherearth/ChangeLog
index 9242471768d2..b25c3e030a3a 100644
--- a/games-strategy/netherearth/ChangeLog
+++ b/games-strategy/netherearth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/netherearth
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.10 2014/08/10 21:21:05 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.11 2015/03/30 21:25:15 mr_bones_ Exp $
+
+  30 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> netherearth-0.52.ebuild:
+  EAPI=5
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> netherearth-0.52.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index de062f43c8fb..a82e01dc086f 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX Makefile 1003 SHA256 436792a5c1763fff48f7ec33175b323da36c3ceed89fcb3b4d30692a216ebbce SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb WHIRLPOOL 6571c01c858f212fb1ca43ce4482d4f35a7df8f4c6f288a16000d8102cc78116880accf1bef3e950ce7602f0469e30f8d46eda90ffc511948b20e280ca057801
 AUX netherearth-0.52-freeglut.patch 367 SHA256 6a2a6bd3f11b326f8e5c5d4729fe72fb51d04f6cbd75136b4fe5178de5aa027e SHA512 c430a2e409c8b1be98a6d9147d429e98a8333541fdbf7e070c87230b85b43bdde9e6665338281d6a984f20a6af29127b9a165086d0c5a2a33ab392649f762c9d WHIRLPOOL 6c93e55bcaa7dcacf5e7ef6c6b70434f3556c7196cda842c1fcb3878b3fdadc423216f10895f4cfdf76e7b6126a83810eda41addc5b3dbb15d479124cd6b1c60
 AUX netherearth-0.52-gentoo-paths.patch 4356 SHA256 62a2243f3244f0d238383d61909cbd4ebc6c3f6a24e6093bac05657c48913a36 SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca WHIRLPOOL e9de9e6391c741363ec61c8e2629560e601f9debab67649a8b2338b4ada76aa2723c9900c80a51065928200d6c4afa7c50669d9c251d548e76b799c6435849bd
@@ -9,13 +6,6 @@ AUX netherearth-0.52-ldflags.patch 329 SHA256 ba5c6b752afabecda1cbb5955310c4b8ff
 AUX netherearth-0.52-linux.patch 1255 SHA256 3761a82cfb8aa70781a83a9af5d7a2eca5dd0dac98adb14aa232785cdf37a315 SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f WHIRLPOOL 3d1895c815e1af8c55e103ad9be29975f9435f27b6e219b217398c6ab1521427c144e7f78842d7ae57951c50b7355fd21e7ba88801d44970d217fed9721f20a6
 DIST netherearth052.zip 872397 SHA256 79d533a56b4939a402edd7665f234e7f462e68b00ea36d9ae110f02a36357caf SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5 WHIRLPOOL ac0862bfe148b6fbd2f51e559d5b3488b4a4234008566bfecf2153ff82d7bd2decce510deeb0933bc5852da7bc506b624a32e551f7ae32987146644d3c12db85
 DIST sources.zip 75918 SHA256 0d4f80f5d3f73e957ccb7c292dcc830b88cb5624aa086ea3416522a8a66b766f SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75 WHIRLPOOL 755d398586edabe01c9fd299b14e6534b42aecf212332bf00fbca87c9a11a2710a5ad1cf750508d26c98aa34dc71cee5d99aaf7fe5952a89346fcf058553b679
-EBUILD netherearth-0.52.ebuild 2191 SHA256 2c420518717d5993f36dcf3094806840da2227e729114e275a9d7d7d226141d4 SHA512 622535f8d0e85655ef038db1791fe76df36ed7d74233ae950cba960b5aa678c8c2576299233fa826d55011e05a854a231c8f1e40603fe95bf1115c1430028a8c WHIRLPOOL 03fd9245d481bcba481640aa830d850f278b55bc73b4e70e3dd31a2655a186e5c71b72207ba51db9fd4d7de7e42a2bfcd1d78dd4de839bdf53838d4c706803a3
-MISC ChangeLog 1828 SHA256 00ed0df7e91babe27ab68a1c38d7926c5ca279f3a58f6eca0a9bb251520755db SHA512 5fa117064b737713fa9f022f7bb4c50a785bddac4e67ffab95011f47115a8d07ac921274eead8cd28cc0d2adea76eb284876ac266e3e90342ceb72842de7acd3 WHIRLPOOL e65afea1fb80a8fee414a60d5bcdc0098adfd78e400320d135cbf17dc557b2d5106e6549d988b055d0006df2690ee7f114c80376e0511d8fcff1eb178d2ec587
+EBUILD netherearth-0.52.ebuild 1978 SHA256 215958e112111c0365b785c6b2e39f8e553ba7e64fe5fe97aed440a9ce9454a2 SHA512 bcedd54d810bae28eb7749c8903070bda2072cd5b45779519b5416f02c54309bfc74663dd49a014c703fce04df6847ef20f3be4f13e0bd4670935197a28348d7 WHIRLPOOL 40fe9880159204585c3024f1ed02a22ac7790c8a7d497c4d441207a53400f6fd851009762a9a594d005becbe39df15a6a7e9a090d0576358dc12ff8aa372a9b6
+MISC ChangeLog 1921 SHA256 53e0b6e7b4df13013e7ba2b745de68c0cd39589ffb832f6b7d790721b3f7ed79 SHA512 bc431703fe588be834f0f21284252674c1c46411808a9903ef3959f3c32c20cacb9b9f05385ba209f624c42da376fbf9939b8c1fa26d4897931c931de38281d7 WHIRLPOOL 97a1d0ff311e3ed6ecb92a83b95d34c67de38fc99b7d3bbf491714cb4df1bf1f633f012f0e3a71fadab4dbfe76af01a465b5910e995af53ffa996ec8fe102e37
 MISC metadata.xml 436 SHA256 95624e4ca82861963e6a1414a75493eb67db3f504e00be22a9376c941c63c7cf SHA512 927ffba3c3b54808c4a717a76385410c8e342d41b949a885a7d0e3eab7eb4c54aefe0174474ea3b4ffad924277a0c9317fe2202a5b31b6e8c7b0a5a601353ada WHIRLPOOL 84cf39b08ce381b339a621e7d2eb9be4bfc73d819f7aca2474a579a6e33596f9a62099a0b5ba26175a2683beb486c19b2d79f3836bf64635f07d4ba6f1ffea16
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn4kEACgkQcaHudmEf86q7JgCdGsyenX2YDxyj9QpKh9OV6KHW
-5SkAmQEgVLk1wPEoV6r3NqRZBEe1v9aD
-=1IFW
------END PGP SIGNATURE-----
diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52.ebuild
index 9a8f51f0d2b8..304f4be0c900 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52.ebuild
@@ -1,7 +1,8 @@
-# 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/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.10 2014/08/10 21:21:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.11 2015/03/30 21:25:15 mr_bones_ Exp $
 
+EAPI=5
 inherit eutils games
 
 MY_PV="${PV/./}"
@@ -19,7 +20,6 @@ RESTRICT="mirror bindist"
 RDEPEND=">=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-mixer-1.2.5-r1
 	media-libs/freeglut"
-
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -28,12 +28,14 @@ S=${WORKDIR}/sources
 data=../nether\ earth\ v${PV}
 
 src_unpack() {
+	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
+	unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die
+}
+
+src_prepare() {
 	DATA_DIR=${GAMES_DATADIR}/${PN}
 
-	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die "unzip ${PN}${MY_PV} failed"
-	unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die "unzip sources.zip failed"
-	cd "${S}"
-	cp "${FILESDIR}/Makefile" . || die "Makefile copying failed"
+	cp "${FILESDIR}/Makefile" . || die
 
 	# Fix compilation errors/warnings
 	epatch "${FILESDIR}"/${P}-linux.patch
@@ -49,29 +51,29 @@ src_unpack() {
 		-e "s:textures:${DATA_DIR}/textures:" \
 		-e "s:maps/\*:${DATA_DIR}/maps/\*:" \
 		-e "s:\./maps:${DATA_DIR}/maps:" \
-		mainmenu.cpp || die "sed mainmenu.cpp failed"
+		mainmenu.cpp || die
 	sed -i \
 		-e "s:models:${DATA_DIR}/models:g" \
 		-e "s:textures:${DATA_DIR}/textures:" \
 		-e "s:sound/:${DATA_DIR}/sound/:" \
-		nether.cpp || die "sed nether.cpp failed"
+		nether.cpp || die
 	sed -i -e "s:maps:${DATA_DIR}/maps:" \
-		main.cpp || die "sed main.cpp failed"
+		main.cpp || die
 	sed -i -e "s:textures/:${DATA_DIR}/textures/:" \
-		myglutaux.cpp || die "sed myglutaux.cpp failed"
+		myglutaux.cpp || die
 
 	cd "${data}"
 	rm textures/thumbs.db
 }
 
 src_install() {
-	dogamesbin nether_earth || die "dogamesbin failed"
+	dogamesbin nether_earth
 
 	cd "${data}"
 
 	# Install all game data
 	insinto "${DATA_DIR}"
-	doins -r maps models sound textures || die "doins failed"
+	doins -r maps models sound textures
 
 	dodoc readme.txt