EAPI=5; tidy

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

6 files changed, 32 insertions, 44 deletions

diff --git a/games-action/descent1-demodata/ChangeLog b/games-action/descent1-demodata/ChangeLog
index a76e0ee616e1..ddd0295038ec 100644
--- a/games-action/descent1-demodata/ChangeLog
+++ b/games-action/descent1-demodata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/descent1-demodata
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/ChangeLog,v 1.5 2014/12/31 13:38:15 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/ChangeLog,v 1.6 2015/02/06 10:55:11 mr_bones_ Exp $
+
+  06 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  descent1-demodata-1.4.ebuild:
+  EAPI=5; tidy
 
   31 Dec 2014; Tupone Alfredo <tupone@gentoo.org> descent1-demodata-1.4.ebuild:
   Migrating to EAPI 4
@@ -24,4 +28,3 @@
   +descent1-demodata-1.4.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
   #154591.
-
diff --git a/games-action/descent1-demodata/Manifest b/games-action/descent1-demodata/Manifest
index 08438bfb41a8..82ed9ef3dfab 100644
--- a/games-action/descent1-demodata/Manifest
+++ b/games-action/descent1-demodata/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST desc14sw.exe 2892216 SHA256 3dadb7fbc01efce2904d0908c55d9a9cf1f402e83bf771970552efaca15efcb0 SHA512 121bd909285138eef3009af4a46174a4af241b139230eda5c232fe710b17419e385ffeb97e13678c253390e6393615006c739a8dd4b0e14b375678491629ab3e WHIRLPOOL 5fbc95c6cbb5d26c30c3a5b9cf79b0fe0932d1a1b3886dc4db1e396854592c63e22e7f539b5fef04cb0eefaf902202a1de397d85adab8a7e2466c98127108534
-EBUILD descent1-demodata-1.4.ebuild 1338 SHA256 a6a8188a6f2256959b39964d9fdc7e06f83b866cbb39b1c7527c634d28d3ff5a SHA512 4007ccede46b329e5d30f32a461014c668b97eed30ac02d41629024f7936dfb8a6f8e8c78d61d392ed97a22d6976f8d11aed576a62b43b901edffca82b796ea6 WHIRLPOOL 502af4d14bc8ab0055ebe34cb61b8fc79d4b9e287b1df0fa53b4d4baac619f953f894d74c667dceb7676aa721cc24358c383353f1732685fb288492694db3ab2
-MISC ChangeLog 1006 SHA256 9d0f4138ac865031f07c10d34108e67d4a51d23ec1a1ac88077040485e4578a1 SHA512 d212f53384073bd42e4cbd769df1c1bd8a379e160ff3491080398b8b94bfe765dfc73fa87e40c9e555dd0c8aff9f90d621a77213fcb4cb3f73adfccb7bd8ca67 WHIRLPOOL 1ff285cd2cab43c421ef1826060cd888e57452a7dfbe64ce3752860ea9c75e9676c5e790d410d8ae933900bd88830099f903b4f55858eb74a888e1cae4af4d97
+EBUILD descent1-demodata-1.4.ebuild 1261 SHA256 6a74ba2b2701e49c1f7129f490cf80b990f18a274f1461e26837882f0bba848b SHA512 e7790fef0a7cb749d2358a560494061a79744362eb1173c051910c18807e1b3d3fec76ee8e747bcb484d13133d5f3f20a419ed700fcdec02a0f4296497c83818 WHIRLPOOL e50f6f384a32c18693524dfdb2e465cc21405d5a2bfa9cddb92f48a66d3328825ce61ee22a19ebb2cf3224d450d562f79ac6ae1c1ec573a70fbdf78da7e7451d
+MISC ChangeLog 1111 SHA256 7c5c7b4a41cc2f22b08b490f539fcdb4732544370d235b769b36066a8317d836 SHA512 f5cfdcb2ff5b41de568d288ba3398e5ecac702d4bf35d3d1a9d44a36762b914c148e66af536802ca112be878fb69f94fc0f136ce9fdd796f00028965216580f4 WHIRLPOOL a742071126312d4a43c663e13663d0034d30fee0f48a3f795f90c322f61eb3a402d1c6d6d3e275b02aadb20ddbf6447082701ee599ac8a829f3185ede2444f04
 MISC metadata.xml 469 SHA256 2f3b8f55c783f0769e7d174e5ad54b6431c375cbc9a0deca11f489d9990f1163 SHA512 60e30fa189fb9539bf0cde0e3806f9c3b0b8b4ca4ed3534ac68139508435e1046751e25cf911c1322df5564a47c003a48dbe6f7dce567b51fed2cb2cc6058d1f WHIRLPOOL e30c39f9b9d647fc92050485df77bd1adbc356a732df6a4edd93fb05bbf8f2b74d5d135333128b78f4f06ca015de3243eb6066ca3f6753151d8adef602ab3ecf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlSj/EwACgkQIY77eQFFFC3s5ACeKBFQAOLr248jHQHbrzsSaQ/V
-C/8AoLDyTi3bQdqr64bZRBvhjYhxMb+J
-=1Ag2
------END PGP SIGNATURE-----
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
index ad55686180de..1a67adb1440e 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4.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-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.6 2014/12/31 13:38:15 tupone Exp $
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.7 2015/02/06 10:55:11 mr_bones_ Exp $
+
+EAPI=5
 inherit eutils unpacker games
 
 MY_PV=${PV/./}
@@ -29,13 +30,13 @@ S=${WORKDIR}
 src_unpack() {
 	unpack_zip ${A}
 
-	unarj e DESCENT1.SOW || die "unarj DESCENT1.SOW failed"
+	unarj e DESCENT1.SOW || die
 	mv descent.pig{,1}
-	unarj e DESCENT2.SOW || die "unarj DESCENT2.SOW failed"
+	unarj e DESCENT2.SOW || die
 	mv descent.pig{,2}
 
 	# From the sows, big porkie pies shall grow
-	cat descent.pig{1,2} > descent.pig || die "cat descent.pig failed"
+	cat descent.pig{1,2} > descent.pig || die
 
 	rm *{1,2} *.{bat,exe,EXE,SOW,ubn}
 }
diff --git a/games-action/descent2-demodata/ChangeLog b/games-action/descent2-demodata/ChangeLog
index 8436c82d280b..e396e97a0c26 100644
--- a/games-action/descent2-demodata/ChangeLog
+++ b/games-action/descent2-demodata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/descent2-demodata
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-demodata/ChangeLog,v 1.7 2014/12/31 13:58:01 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-demodata/ChangeLog,v 1.8 2015/02/06 10:57:02 mr_bones_ Exp $
+
+  06 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  descent2-demodata-1.0.ebuild:
+  EAPI=5; tidy
 
   31 Dec 2014; Tupone Alfredo <tupone@gentoo.org> descent2-demodata-1.0.ebuild:
   Migrating to EAPI 4
@@ -32,4 +36,3 @@
   +descent2-demodata-1.0.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com> and based loosely
   on games-action/d2x. Closing bug #137306.
-
diff --git a/games-action/descent2-demodata/Manifest b/games-action/descent2-demodata/Manifest
index 9502873952f5..9a781fe5d1d8 100644
--- a/games-action/descent2-demodata/Manifest
+++ b/games-action/descent2-demodata/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST d2demo10.zip 4306833 SHA256 f8d005670fe5cd17e07ca9bf4022f1045aed436639c37f1e83dd647e14fcec1f SHA512 a4229be701a4b2fc28d3c71591a477d242c1c784dc233c1e9ca6b798b3774de9744d8a91b0b80904b3fe63e1285b79234bf48681cddaeca702b3d9ce4c2b6fab WHIRLPOOL 063961a4cc768f4553c460413d862c7dc604d3be69b87b31af1db6ab7a2da80e1e7213ef590283126b85dd1c45745f4f4f9c61b0bfb286bb178d2cbf57fec77e
-EBUILD descent2-demodata-1.0.ebuild 1907 SHA256 fac2a5f753564c765bc97a84040954b35cda174b59b17f5e991173372b358c8e SHA512 7a354d1c86ed8f0ae1f1519fb1d000755dfa20738b03aefa0324bbe329b1446682d9bda5c4114aa7aaadcd39b02e40aba2b0451ee1f7c9fb99d50a8f5f7e1054 WHIRLPOOL 5e497319bfa066a84a3a2e1280e1965bef28cf92010914f70a7be8d5460f35222e2a64ad89c89506c7fc7b6c436b8f75c035491903fddb8e9d466efeaf8d80e5
-MISC ChangeLog 1250 SHA256 be2b3b736d54b04a7505b2e0efbe8f0953199da992a93928ae05e71bb88de84e SHA512 d8bf559efeccc481fd9183e9aec58fafd0569cad89f41a9de513348e2bd8dde49ac2e9396092e4ada60454a87f20f6a5cb44c650a76eccbdd6eae30122d6d6fe WHIRLPOOL 91eb35dc343210c2818b57f663d741cb4e3988b62cde0594c399d4268d1842fccf32b9a39c53e8bdaa6eb3c2609b9f115a23140e2c7e8d3c941cdf79993413f8
+EBUILD descent2-demodata-1.0.ebuild 1806 SHA256 49ba8d2ef3132141110de2910f9c0107723829299b3bffa9f81897e7d8b310b9 SHA512 15ee9087949028f258189889487271a93ca8d3c3f884f0246943376efa0e5f797c413ae7bf1751be7a1e8c82a94220bf1308fa6d76864b81ec990290f64b55f2 WHIRLPOOL a0e5442a0f46e3c7204d65c0453e8944036113491b4388145b58741ca95320fd1f5db4267312121be7a4f385212f4d72d7bd88e4cb36796298bbc0eafd5a6c8f
+MISC ChangeLog 1355 SHA256 2bca364d9e5051f0f582ee3d926d8b8f9d91de3880f0cc8b6a81194a6af05fd6 SHA512 5015746cb0c2409f1ed0d412a9a95a7d4dbd8b86b5d60f938d0ad55740d194153cabc09f7ee58b8a7f31420ad08f2c351707d935afa7111155112feac166ef70 WHIRLPOOL 55a4a62d0ce6b491f5caca12cd0efc102a24677dcbdeaf834f567055215e7271653655aa94413d39a44131eb2bc21b2c13bb6e3f705a3460b92037893a704778
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlSkAOoACgkQIY77eQFFFC38dgCg3gjqq/0M4fUoM+tEkGXRScYl
-e88AoNGeCk3KuYM/CNb9rPtkn8BC9oov
-=dfkx
------END PGP SIGNATURE-----
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0.ebuild
index 9e71c6d64823..c4ab4e359a79 100644
--- a/games-action/descent2-demodata/descent2-demodata-1.0.ebuild
+++ b/games-action/descent2-demodata/descent2-demodata-1.0.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-action/descent2-demodata/descent2-demodata-1.0.ebuild,v 1.9 2014/12/31 13:58:01 tupone Exp $
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-demodata/descent2-demodata-1.0.ebuild,v 1.10 2015/02/06 10:57:02 mr_bones_ Exp $
+
+EAPI=5
 inherit eutils games
 
 MY_PN="d2demo"
@@ -37,17 +38,17 @@ src_unpack() {
 
 	# This is much more fun than simply downloading
 	# http://www.icculus.org/d2x/data/d2shar10.tar.gz
-	unarj e D2_1.SOW || die "unarj D2_1.SOW failed"
+	unarj e D2_1.SOW || die
 	mv ${MY_PN}.ham{,1}
-	unarj e D2_2.SOW || die "unarj D2_2.SOW failed"
+	unarj e D2_2.SOW || die
 	mv ${MY_PN}.ham{,2}
 	mv ${MY_PN}.pig{,2}
-	unarj e D2_3.SOW || die "unarj D2_3.SOW failed"
+	unarj e D2_3.SOW || die
 	mv ${MY_PN}.pig{,3}
 
 	# From the sows, big porkie pies shall grow
-	cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die "cat ham failed"
-	cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die "cat pig failed"
+	cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die
+	cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die
 
 	rm *{1,2,3} *.{386,bat,ubn} eregcard.ini
 	mkdir controls