EAPI=5

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

3 files changed, 19 insertions, 36 deletions

diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 14e8eb15aeb5..33b2c206f800 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/heroes3
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.24 2014/09/07 09:54:24 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.25 2015/03/29 08:17:56 mr_bones_ Exp $
+
+  29 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> heroes3-1.3.1a-r2.ebuild:
+  EAPI=5
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org> heroes3-1.3.1a-r2.ebuild:
   Drop reverse dependencies of sys-libs/lib-compat to unstable, bug 517932.
@@ -103,4 +106,3 @@
   29 Sep 2004; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +heroes3-1.3.1a.ebuild:
   Initial import.  Ebuild submitted by me.  Closing bug #33206.
-
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index a20117674317..7a90a6019451 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,23 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX heroes3-wrapper.sh 195 SHA256 982b2c36a167dd99a6bddc14d13122cf73e306e2711147aa059b1dabb4ae1ae5 SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8 WHIRLPOOL 990180cd2e28edf3b0118ab744964604b6743f42015cc5fe8cdface011a9a1cd83fa60a9977feac851af5fb8126de94dff94bf04f1bf0b958fbf30ad8445a901
 DIST heroes3-1.3.1a-cdrom-x86.run 3012188 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e
 DIST heroes3-1.3.1a-ppc.run 2643068 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137
-EBUILD heroes3-1.3.1a-r2.ebuild 5752 SHA256 15099e49445d59e616d5dc9e2a83df2a73044651c6759c5278b78cebb1cf8f75 SHA512 3e2288257f807f61687480fd40f8bc8499527e674cb0ea2c220848f10a0f1226d51ca98f15c923aa7793d3bf96169088d5636c2ef962ae60e170548964edcec4 WHIRLPOOL d8a2d34def53e6a788daceffa06ab31a32065809dad555a991880ff909f5ecdb47dc1e55ef7e23832f30fbf56e892508c02fb1f8f3fe01b333f6df5127775ec3
-MISC ChangeLog 3997 SHA256 75f1591901d711258e49c2e7d16613934dc1a1688d20899749394ae43715c065 SHA512 77fed19bbfa7f5466b7dd46c43177b98daf9bf235f2e20897847f7a799af9117556a10bef20e766ad71a3ea430dff7c412a0f47c53f23aa51ea603efd622ee6e WHIRLPOOL a9f9507858695835988706818f41e08d3e71376b2ebc446280fdb09f58cf99dad0a4a26f86e50e7a6e16e5c2177d954e76571ded8c034386c915d109518be8bb
+EBUILD heroes3-1.3.1a-r2.ebuild 5588 SHA256 9ea2bd1f62766aa4cde6091bd01c93652c01489c0334bb62c8f184b2db2e96e8 SHA512 9ff6ee39f3440e889a60227220b49a845e598b6baa20a1b029260a2433968d450c25d06b7b5ec8d2855b778789a20e2b8623d47e81e97cec1a237375b95ad1db WHIRLPOOL 7c0b00e9087d7b66631b2a2e5976a4186372615ed876ea81da8a129b469e5cef10b25c49f8612aa18c44c46179b68dda3a5e16430c0fc39cfb86ebeeec1a11d5
+MISC ChangeLog 4093 SHA256 2ddfdf73a77b95a752bf3bed8e4308924f5924b774d16822cbaf88e2e5f52249 SHA512 783f88549eeaf82b54f092a41ec3f074c9c5c64c283c1790f78889fef0a514d92c6bc4e7865d31c9f92996e6a79bf0e77f792d94fdc0672116418d476a007255 WHIRLPOOL cbe5175068d2fd7f3ada3842933d9dd58d313bb1ad338f26813accbf9e6ab009e2a7d7c48d4aa1d7cfc494a90e3561031d82be832c8a5724c56ff6620a87a468
 MISC metadata.xml 352 SHA256 97532bdee3502b348eee8dd1b85a754fb2736f50c1595f6e20b532af1d7a0beb SHA512 e980d80a98e26f27bbbb3fbab6de4fa9d14bffe336de276c93419e7f0a1e4469c030ea203b1e0003a73e928e560ba1b07980b1d86c8df7b4f0600eec34246d32 WHIRLPOOL c106f62c25c4a1b7f5b4cae7e4e73979d1745df4ea22b2a7344c23500318da94cf109977b3119f59303aafc3ff869e01ea69762db5417a5d6a6d06e23984009b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGcBAEBCAAGBQJUDCt5AAoJEJQzkH1pP7W4578L/R1Z12OfZz7AIeHLwB5XIFEP
-74pNZEdlzZIW0ZwiFPYYJEBJI0NXfN9VE3D7YRXwpM/jVubsCppI6Cc+H1znazh+
-3JYHV4SZtxEinveb5lSNeC+mNigNbVlPSyamZ96Wa0T4rDwcqe9vgfllyTYI1Ux+
-geAW8J12jabccAXaR/cgjD9Ejb8pLQs7Oou9d5H+b20o5eLRPIgxQKpLH28j97Hl
-9DAT1SfVN+B6FOF6K+7oCm+CDw2M4I5iKDnF2CyNF/vUvF2oWQWhWiDfrNDR52A2
-rV+8QyW2uW18QLSdnFJ6yjApIxIDgpkw9zHCiI+kWEARct0wWWCjfHKFwss/iqRI
-ZY1PtS5oXoybM1zdmgy1LFbvoVo9UW9CvQNtETbJ8eCGSXr3YwNBRF3XOERB/GhY
-1enaPfwe/7Q/tvbrFq6HNunXbF0evfWDXmXH6ijvac+wnTJNj/dbcNDCOGOUoiZV
-HI/sRMd7PS0lOJbZNi+/agB1zsRRqwWjRPCyk84tMg==
-=tDo0
------END PGP SIGNATURE-----
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index 95e364d21637..04afaf9b79fe 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.16 2014/09/07 09:54:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.17 2015/03/29 08:17:56 mr_bones_ Exp $
 
 #	[x] Base Install Required (+4 MB)
 #	[x] Scenarios (+7 MB)
@@ -10,6 +10,7 @@
 #	--------------------
 #	Total 341 MB
 
+EAPI=5
 LANGS="de es pl"
 LANGPACKPREFIX="${PN}-lang"
 LANGPACKBASE="http://babelize.org/download/"
@@ -164,11 +165,11 @@ src_install() {
 #		done
 #	fi
 
-	tar zxf "${CDROM_ROOT}"/hiscore.tar.gz -C "${Ddir}" || die "unpacking hiscore"
+	tar zxf "${CDROM_ROOT}"/hiscore.tar.gz -C "${Ddir}" || die
 
 	cd "${S}"
 	loki_patch --verify patch.dat
-	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
@@ -183,24 +184,21 @@ src_install() {
 	if ! use ppc
 	then
 		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-		dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 || die "dosym"
-		dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 || die "dosym"
-		dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 \
-			|| die "dosym failed"
+		dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
+		dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
+		dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
 	fi
 
 	elog "Changing 'hiscore.dat' to be writeable for group 'games'."
-	fperms g+w "${dir}/data/hiscore.dat" || die "fperms failed"
+	fperms g+w "${dir}/data/hiscore.dat"
 
 	# in order to play campaign games, put this wrapper in place.
 	# it changes CWD to a user-writeable directory before executing heroes3.
 	# (fixes bug #93604)
 	einfo "Preparing wrapper."
-	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || \
-		die "copying wrapper failed"
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 ||
-		die "sed failed"
-	dogamesbin "${T}"/heroes3 || die "doexe failed"
+	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || die
+	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 || die
+	dogamesbin "${T}"/heroes3
 
 }