Support multilib providers for deps. Bump to EAPI=5.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 34 insertions, 28 deletions

diff --git a/games-fps/unreal-tournament/ChangeLog b/games-fps/unreal-tournament/ChangeLog
index 4314dd7b8526..c2091abed59d 100644
--- a/games-fps/unreal-tournament/ChangeLog
+++ b/games-fps/unreal-tournament/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/unreal-tournament
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.23 2014/05/01 14:41:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.24 2014/10/15 11:47:05 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> unreal-tournament-451.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   01 May 2014; Ulrich Müller <ulm@gentoo.org> unreal-tournament-451.ebuild:
   Fix LICENSE, add mirror and bindist restrictions, bug 506952.
diff --git a/games-fps/unreal-tournament/Manifest b/games-fps/unreal-tournament/Manifest
index 4f3227d91f79..6039c2e63a17 100644
--- a/games-fps/unreal-tournament/Manifest
+++ b/games-fps/unreal-tournament/Manifest
@@ -3,20 +3,13 @@ Hash: SHA256
 
 DIST UTPGPatch451.tar.bz2 3064473 SHA256 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423 WHIRLPOOL 22de40b50f6302f6a1ff5080f823e3e5e14057bc7729fb809b42981bbd188e47a138058740d4df251c8b7dafd4c74121d7d0d08c85a2746c40e3fd432bd087e3
 DIST ut-install-436.run 6225010 SHA256 4008c7501a530c1fb5b8143b8e92baee59ef769c0bffa26c09e9bbb2673bc377 SHA512 cfdeb9f345daef4b81acadfa24d711477ba208dffd50716087d034df2dc1eb0ac5bb03570f4f1701b3c4d46b8f954e6d23dde36fc20dafdc114e68730a1fc932 WHIRLPOOL a203436b225747ed06af76e100f07d0a0580df11a4c3a01a431b3e2a48e660717743960cd814ffd2ed5d13624aa1ce7a111c4aa76122593e57469df59e2da26a
-EBUILD unreal-tournament-451.ebuild 3794 SHA256 3b80a609043da351ad0b137a792ec4e48e04c7053ad6b0017e7b7426fac72be3 SHA512 72233d5b7f8a65c397fbe4d4d9a7e32a8803c666bd61acc47a9b0b273e9cf9195f08ab3d9b023c69d9d19be7bc5ba81751150d3f4dc7804207c5c2be2190eba5 WHIRLPOOL 090a65b1c1235bc69c80d29e67d2b9d245dcb63b9054f7288866e21be7d235fcf562efea0bb320b38b146e8291d8e7d9ecf08227b918ee603f6239c354818faf
-MISC ChangeLog 3995 SHA256 48e4166e9ff4abedf27df1637085df5d0e7f2520fb5aee6f6bc818891c66921d SHA512 43ae369f65fc718343d5b8d27326d409f97808975413e1a4624e9a459a2d0836eacdd4d80b13c0bee98319439a940769d35841d4d304d20341c24bb21813b9dc WHIRLPOOL 902748de221e199c7113a9019bd5f53505f0e3b53b317381f83899e31e325298a29ee540d886958800eec1c485982ad34c97c50c338d66cc1e50d89443a87c78
+EBUILD unreal-tournament-451.ebuild 4020 SHA256 21b7849c79476945340bbf337fc1c10864c9ff27b6a94b88416988b5d4134ee0 SHA512 35ba6edb3e727d23a79492899c1c7c0b16bf79674aac381507ce1929f0b88e7105018b40cfbaebb6cd881c3e27809b2a7c048f3b4352b67f26e94b92469c888a WHIRLPOOL 9160e7293474505001348820e40ea3bd8be7a27207077423ba1c0abbcf7ff7f966cbc9c13c51bf2df7c769ce0e9bd7b202f92f58c5f2fb362c4450aa145569c3
+MISC ChangeLog 4129 SHA256 d903fe02f84548b179bf59e13a967f38cf42cb1fbed6dfcbf1e72f1d3bbcf2d0 SHA512 bef18e47f7eae11bdaa6e0f1a0a1957cba5c1d86fa4b444038e8f0bea042783d8473912177cc8bb7feb076dd42d402262ed16417f04edbc95d5969b4ad5ce473 WHIRLPOOL 45973295a8e4d18c6fdc7e2c04f76772fc5866fbc3e32bb384646ceedb0909f3ee23df8687ba96d0911062956f506be9c771a88f5fab55dcdeeb7142a4e0cdc9
 MISC metadata.xml 1566 SHA256 a3e70b56f973953c49c104a7d0936f597a8a250d731725769b7bc3d60ce219f9 SHA512 f1243f7b401d8d66a14b0a3a694430040f97a9fec2708da3424b1b5abbd9a4c8c2735747772108dab4be0992d522f7dde88555af0c2e266b5ac6d73f7b303596 WHIRLPOOL 4df6b65bdb33b301d2cdb97cda1ed81a5112ee665b04cdf4d3614731488a41930d9b9e9cd9166bf7bba8b8c1458f3c5110f05d5f2fef0f95a5a9d7172f86400b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTYl1DAAoJEJQzkH1pP7W4imsMAK5xhmt0KFXIXymn+FBSKsXs
-wsGYrgeZ178+v+quWkqWImDbqRI65YXY6kt8Z14o0q+YZ79252sD4M7ZXis/8bUZ
-6ZTQWu5eOyT2yyahcE8YlTbmhQ8VZfLy+h9IMbcJRyM5rTBVtR9cRPKixxxPA/o5
-BYrvqo1QImBXHE+q5r1rn2qhv+3n0NCDC+gtPQziVQHOS7khUGtvaLMbXhQBdSw7
-Ca+lLDYSRJnRfv9oIHPh6COssNh2c/GFuNspn//IB+sCaLTademMniJA/E4TabzU
-/YMZCItj1U84eb6p2HDh/ouIxQKYhOdLtPxzxXu4pteDV++52hSlSNXv7BncMmxZ
-+ioEP2gVCN0tpuWzbxcUt6oiEf0vzgsz6zSGWBoj0F9O/ZnJ3I1vGXT/+IX7pUiR
-Aqnb+dlP/ApqNR3Eo8x1ORHxLnvgjfsylu8kTD9dop7m8ui8re1W/4JgIQTSG2QK
-85feeI02F+Ksh7EfPIfaU5xvm+mAdgvKulZ3SLMVRA==
-=TdgW
+iEYEAREIAAYFAlQ+XroACgkQCaWpQKGI+9SkWACfR+vsHYbnyfaSTdKhTtPHjrdO
+8JAAnAuJIMccIDHJ62/n+R4MkIf7I6kj
+=3/7L
 -----END PGP SIGNATURE-----
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index cc1d479e95a0..38658374c107 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.30 2014/05/01 14:41:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.31 2014/10/15 11:47:05 pacho Exp $
+
+EAPI=5
 
 inherit eutils unpacker cdrom games
 
@@ -15,18 +17,26 @@ KEYWORDS="-* amd64 x86"
 IUSE="3dfx opengl"
 RESTRICT="mirror bindist"
 
-RDEPEND="!amd64? (
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	=media-libs/libsdl-1.2*
-	opengl? ( virtual/opengl ) )
-	amd64? ( app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs )"
+RDEPEND="
+	|| (
+		(
+			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			opengl? ( virtual/opengl[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+		)
+	)
+"
 DEPEND="${RDEPEND}
-	!games-fps/unreal-tournament-goty"
+	!games-fps/unreal-tournament-goty
+"
 
 S=${WORKDIR}
 
@@ -64,7 +74,7 @@ src_install() {
 	# the most important things, ucc & ut :)
 	exeinto "${dir}"
 	doexe bin/x86/{ucc,ut} || die "install ucc/ut"
-	dosed "s:\`FindPath \$0\`:${dir}:" "${dir}"/ucc
+	sed -i -e "s:\`FindPath \$0\`:${dir}:" "${ED}/${dir}"/ucc || die
 
 	# install a few random files
 	insinto "${dir}"
@@ -82,7 +92,7 @@ src_install() {
 	# finally, unleash the UTPG patch
 	cp -rf UTPG/* "${Ddir}/"
 	# fix a small bug until next official release
-	dosed "/^LoadClassMismatch/s:%s.%s:%s:" "${dir}"/System/Core.int
+	sed -i -e "/^LoadClassMismatch/s:%s.%s:%s:" "${ED}/${dir}"/System/Core.int || die
 
 	# now we uncompress the maps (GOTY edition installs maps as .uz)
 	einfo "Uncompressing Maps ... this may take some time"