EAPI=5

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

3 files changed, 23 insertions, 32 deletions

diff --git a/games-server/ut2004-ded/ChangeLog b/games-server/ut2004-ded/ChangeLog
index b715e23b1ca9..92b85203887b 100644
--- a/games-server/ut2004-ded/ChangeLog
+++ b/games-server/ut2004-ded/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/ut2004-ded
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ChangeLog,v 1.27 2011/12/14 17:31:42 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ChangeLog,v 1.28 2015/03/30 18:15:37 mr_bones_ Exp $
+
+  30 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  ut2004-ded-3369.3-r1.ebuild:
+  EAPI=5
 
   14 Dec 2011; Mike Frysinger <vapier@gentoo.org> ut2004-ded-3369.3-r1.ebuild:
   The games.eclass has dropped GAMES_CHECK_LICENSE support (since portage now
@@ -128,4 +132,3 @@
   <cuban@drunkstudents.net> with an init script submitted by Ken Smith
   <themyrmidon@mac.com>. Updated to 3236-1 patch by Davin Boling
   <davin@postmark.net> with some modifications by me. Closing bug #46057.
-
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index b9ad5d2261a3..8faa451724a6 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ut2004-ded.confd 228 RMD160 1bee4e7eac41d92fbbb3fef02599de177fc46f4d SHA1 69a27ccfb5a2ddd4cfe3c2f7cd9b452452809e6b SHA256 f585ee80c116f56ef1cca1429dfb143e8bde736e6b6db7d059fbc6b3685bb065
-AUX ut2004-ded.initd 679 RMD160 100fb00a6194f122703952ab1fcfb7f4b3f33223 SHA1 4719b4bb5132a28c142f51377743a34fc1de1ab2 SHA256 957ca9d1a4a0f8749fa254e5cd5ecd9a7ad682694a5c93956104e8eca6935cd2
-DIST dedicatedserver3339-bonuspack.zip 914213907 RMD160 e31cdb4f1ecfd31e51b4caea76db4ea7b522a4ca SHA1 e1eda562d99e66a7e5972f05bbf0de8733bf60c9 SHA256 b8fc94fc843483b18c225e100736d10cb2690ba8666d6abbb274ea6ad718b18e
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA1 a8cc33877a02a0a09c288b5fc248efde282f7bdf SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3
-DIST ut2004-v3369-3-linux-dedicated.7z 5013927 RMD160 4326acaeca0e40185a5f8321330188fc34ab7920 SHA1 db5cccc4b08e6314f203e8f036adf8421861c501 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192
-EBUILD ut2004-ded-3369.3-r1.ebuild 3444 RMD160 ff6f52db18185eb2414ec293d7967490a278e62e SHA1 6352c3291413a7ca7ec48186c17de89246f5005f SHA256 636cf72355a7165c2f47d448d95cbe39ffecc720335327a7e8a8e5eb7435db73
-MISC ChangeLog 4791 RMD160 9448373b6acd0688cd9cc9b14ce3a9c4eeb9d500 SHA1 bdf6d24c2f3461a7de9bad8ff188f2c3d2f73c8e SHA256 da42991b9b9128c267bfebb8cdfbf30b5858158893311c122f3b6f3d37150d6b
-MISC metadata.xml 550 RMD160 b35b723becaa39dee17032302d479668a37e5ca9 SHA1 b8fd648a442d8b0c4a452bd1956b2983ce3e9bc0 SHA256 183771c406473976c7b2e16fae6309a0af81b9a809a6170d382171c025003617
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7o3YQACgkQaC/OocHi7JZ5ewEAnhSDbyxH+/g3eSMwi3pr3h4t
-fadPpBQ5rPn9JIWniiMBAKDTVTP9Zu94+2tsK73ODK+xwMZeESZGAYmekh6XZLWW
-=HG0I
------END PGP SIGNATURE-----
+AUX ut2004-ded.confd 228 SHA256 f585ee80c116f56ef1cca1429dfb143e8bde736e6b6db7d059fbc6b3685bb065 SHA512 f304c134139a29e43f6a297969462d8ca667071be898bf0b5495785eba7b0042e7103b5df2dc2c1fa333f4c16f75efcfdcd8ddc2dc88bf46d93cf8a9739eb300 WHIRLPOOL f1026a43d6c428c4b1c445b048dcae39385f96ad92d00a1ff08429a162d7d4fc45652982e71abd24324bfa56a6e4bf3d9ddee02aeb3412fcd2cfe47a31327ea7
+AUX ut2004-ded.initd 679 SHA256 957ca9d1a4a0f8749fa254e5cd5ecd9a7ad682694a5c93956104e8eca6935cd2 SHA512 451d3822eaa3f6eda747b727ec98c748f9323f761c25f91b94711106321dd3afe4a936824577460c1385c0bf1ebaf178754fc16dcc1debcde718bb94defb106c WHIRLPOOL 335bb9b6ec5036986a7335c5dd8c9bac1732ab31c0e82467521e311ef0a0ab67b3c552a1ec95d0dc3d94ba712d4d3feb215883b187943a2c7d73705a681c563a
+DIST dedicatedserver3339-bonuspack.zip 914213907 SHA256 b8fc94fc843483b18c225e100736d10cb2690ba8666d6abbb274ea6ad718b18e
+DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 WHIRLPOOL 2e04124aa7eb4e2689b048aceeb8c085a5756bad4c0f084da764055ea7a403623107bc6bb29d00b9b93b45675f4475e145edb4e6a3faf208d9fe36f4a65c9e78
+DIST ut2004-v3369-3-linux-dedicated.7z 5013927 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf WHIRLPOOL ef459d7c053ac70be6313c65edaff095053cab840588d5762834b4402e299d8782401ebf1341ff61a150efed8420bf377b7a7ba10dbed6608d86791e2569e733
+EBUILD ut2004-ded-3369.3-r1.ebuild 3309 SHA256 3d33c3b1af503488a5e5b2a0870f0266a58f63ee414ce85dc77638392b242787 SHA512 b75ff15bf0a0f7ba5e38596f317bacd37e3acfb03b29c69d40eafe464c7d0be58790a727e3b47f5c1ad006860ead3746a1907b93a130cde0b3a08577e47fb643 WHIRLPOOL c5bf922922b43c573057ce0ec38614d9e874eb1673eed99c259f6fa30e505b16271a9c8aa9d739a3df35e42088f1a56177e9edb9ac6c917e0cf9a02e59f2de8f
+MISC ChangeLog 4889 SHA256 2239e0c1f902eda14a781c1b1efa0d2013bb545fa74e815fa1eb3ff5948c00f6 SHA512 4e30f5410ecf36953fded317744eac388013b18fbfedb8521fea16c916b9593b079a3e88b3d402e30c70cbeee41a02a839d9f55a7b452644be9cded3144bf906 WHIRLPOOL d15623a6eb3e6a201604ada1c43709c4a03df124cd8e06794e09fac48df76b7625b82781fd5c42a42b0407488a4a8ac4a6b37ba840dc97227f5b7cca8c0693dc
+MISC metadata.xml 550 SHA256 183771c406473976c7b2e16fae6309a0af81b9a809a6170d382171c025003617 SHA512 871d332d3d60b3eaddf5f086cd9a5ad14ff18cfe37603d6c775ca2d43997d4e0a0e94a899ab1fe4cd5cebf28c2975e0df4505ff0bc1cf3a7192a5cba1475a362 WHIRLPOOL 93ec71812ded20a0c0ae3d86aa8a6f357ad2d122eccebcdbde527efcf8fa6a06b03b36fa749db47ee7d60c55068276a350795e2dc7a80fd361cdb8621d0644bd
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
index 5729361377fe..7c2ee2430cb5 100644
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild,v 1.5 2011/12/14 17:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild,v 1.6 2015/03/30 18:15:37 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit games
 
 BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
@@ -62,22 +62,20 @@ src_install() {
 	games_make_wrapper ${PN} "./ucc-bin server" "${dir}"/System
 
 	insinto "${dir}"
-	doins -r * || die "doins failed"
-	fperms +x "${dir}"/System/ucc-bin || die "fperms failed"
+	doins -r *
+	fperms +x "${dir}"/System/ucc-bin
 
 	sed \
 		-e "s:@USER@:${GAMES_USER_DED}:" \
 		-e "s:@GROUP@:${GAMES_GROUP}:" \
 		-e "s:@HOME@:${GAMES_PREFIX}:" \
-		"${FILESDIR}"/${PN}.confd > "${T}"/${PN}.confd \
-		|| die "sed confd failed"
-	newconfd "${T}"/${PN}.confd ${PN} || die "newconfd failed"
+		"${FILESDIR}"/${PN}.confd > "${T}"/${PN}.confd || die
+	newconfd "${T}"/${PN}.confd ${PN}
 
 	sed \
 		-e "s:@DIR@:${GAMES_BINDIR}:g" \
-		"${FILESDIR}"/${PN}.initd > "${T}"/${PN}.initd \
-		|| die "sed initd failed"
-	newinitd "${T}"/${PN}.initd ${PN} || die "initd failed"
+		"${FILESDIR}"/${PN}.initd > "${T}"/${PN}.initd || die
+	newinitd "${T}"/${PN}.initd ${PN}
 
 	prepgamesdirs
 }