EAPI=5; update SRC_URI (bug #506112)

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

3 files changed, 24 insertions, 37 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index ecd38f1cba1d..d05bc1b21037 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.67 2011/12/14 17:28:54 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.68 2015/03/28 06:52:21 mr_bones_ Exp $
+
+  28 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> ut2004-3369.3-r1.ebuild:
+  EAPI=5; update SRC_URI (bug #506112)
 
   14 Dec 2011; Mike Frysinger <vapier@gentoo.org> ut2004-3369.3-r1.ebuild:
   The games.eclass has dropped GAMES_CHECK_LICENSE support (since portage now
@@ -300,4 +303,3 @@
   20 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +files/ut2004.xml, +ut2004-3204.ebuild:
   Initial import.  Ebuild by me.
-
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 20be3477bb5a..bf066d1fd70b 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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-3369.3-r1.ebuild 4287 RMD160 95dd25b33c8a0d8e396297b95c1a3d675a133e36 SHA1 302b648c57692cb68c565e249fcdff206fa434d9 SHA256 144b5f496883689e64375f05b9ffde205cf76dc920745f3d5d73bd843eb8e4b2
-MISC ChangeLog 12084 RMD160 0188daa821c7f490159bd06a8d101475f906a215 SHA1 7b8b58865633971e1553b4f63496397563b5db28 SHA256 b3aef7353194f903b918d1fbb7396396355c40fd1378694d2dbe436dc26513e5
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7o3NwACgkQaC/OocHi7JbaSAD/WKNcdkDFXaGWwl6t9pZBnykR
-d/HMcB4uouItrc044JMA/R/KxaJXtXnn2m2YAcDYrcuZC2ofEO1bLRNLymIp3XfM
-=Fv6O
------END PGP SIGNATURE-----
+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-3369.3-r1.ebuild 4073 SHA256 3d526edf81a143337d9a32456735f775f8781f39f304f04b3c227012eeba2b4f SHA512 aa176b8f7f8d9dca27adcb5e0c02ba9cbdf00bb9f3d3c298959b9b4b3b5f284f7ec7a5e17fb34d015e821f4b43783f9466a391787204c01a5d03452361403338 WHIRLPOOL 19f917028c05203d26dc95f21d3b9e89210e7d41452f662d10f7497c931ec7b58b7cf60ae974a99806b212575fbbc64c04a03c8fba4105dbef233a08c0e17622
+MISC ChangeLog 12206 SHA256 fc72c6d60c632dea85bfac3e1adb31728a1373189b413a26b2484ab7145ed821 SHA512 88334672a33ba8e8aae167cc82c954018e4bb0afc1efa8daa1302430a03b2120e68d7ef04ca5b0a1a2289fb53ceaba1d76c7dd78b9c230a4ee112565be2ee9a8 WHIRLPOOL 9f8bd763460ba10a86d2553c1014fc4190d791a56e351e2171125b2e62edc71b4603f4ccded8b11986782dc1b103218cddc1e89ea635bc9c7df13a8521ddcdb1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
index cf8267762ea3..577240de3a8d 100644
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
@@ -1,17 +1,16 @@
-# 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-fps/ut2004/ut2004-3369.3-r1.ebuild,v 1.2 2011/12/14 17:28:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369.3-r1.ebuild,v 1.3 2015/03/28 06:52:21 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils multilib games
 
 MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
 DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
 HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
-	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
+SRC_URI="
 	http://treefort.icculus.org/${PN}/${MY_P}
-	http://sonic-lux.net/data/mirror/ut2004/${MY_P}
+	http://storage.guntoo.de/downs/downloads/Patch/ut2004-v${PV/./-}-linux-dedicated.7z
 	mirror://gentoo/ut2004-v${PV/./-}-linux-dedicated.7z"
 
 LICENSE="ut2003"
@@ -41,21 +40,19 @@ S=${WORKDIR}/UT2004-Patch
 dir=${GAMES_PREFIX_OPT}/${PN}
 
 # The executable pages are required #114733
-QA_EXECSTACK_x86="${dir:1}/System/ut2004-bin
+QA_PREBUILT="${dir:1}/System/ut2004-bin
 	${dir:1}/System/ucc-bin"
 
 src_prepare() {
 	cd "${S}"/System
 
 	# These files are owned by ut2004-bonuspack-mega
-	rm -f Manifest.in{i,t} Packages.md5
-
-	rm -f ucc-bin*
+	rm -f Manifest.in{i,t} Packages.md5 ucc-bin* || die
 
 	if use amd64 ; then
 		mv -f ut2004-bin-linux-amd64 ut2004-bin || die
 	else
-		rm -f ut2004-bin-linux-amd64
+		rm -f ut2004-bin-linux-amd64 || die
 	fi
 
 	cd "${WORKDIR}"/ut2004-ucc-bin-09192008
@@ -66,22 +63,20 @@ src_prepare() {
 	fi
 
 	if use dedicated && ! use opengl ; then
-		rm -f "${S}"/System/ut2004-bin
+		rm -f "${S}"/System/ut2004-bin || die
 	fi
 }
 
 src_install() {
 	insinto "${dir}"
-	doins -r * || die "doins failed"
-	fperms +x "${dir}"/System/ucc-bin || die "fperms ucc-bin failed"
+	doins -r *
+	fperms +x "${dir}"/System/ucc-bin
 
 	if use opengl || ! use dedicated ; then
-		fperms +x "${dir}"/System/ut2004-bin || die "fperms ut2004-bin failed"
+		fperms +x "${dir}"/System/ut2004-bin
 
-		dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so \
-			|| die "dosym openal failed"
-		dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
-			|| die "dosym sdl failed"
+		dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
+		dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
 
 		games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
 		make_desktop_entry ut2004 "Unreal Tournament 2004"