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

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

4 files changed, 56 insertions, 39 deletions

diff --git a/games-fps/unreal-tournament-goty/ChangeLog b/games-fps/unreal-tournament-goty/ChangeLog
index 9dc035d305d4..e2144548bb4f 100644
--- a/games-fps/unreal-tournament-goty/ChangeLog
+++ b/games-fps/unreal-tournament-goty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/unreal-tournament-goty
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.16 2014/05/01 13:58:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.17 2014/10/15 11:42:52 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> unreal-tournament-goty-436.ebuild,
+  unreal-tournament-goty-451.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   01 May 2014; Ulrich Müller <ulm@gentoo.org>
   unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild:
diff --git a/games-fps/unreal-tournament-goty/Manifest b/games-fps/unreal-tournament-goty/Manifest
index 2e85efa5a6f2..66a308f0d5a2 100644
--- a/games-fps/unreal-tournament-goty/Manifest
+++ b/games-fps/unreal-tournament-goty/Manifest
@@ -4,21 +4,14 @@ Hash: SHA256
 DIST IpDrv-436-Linux-08-20-02.zip 105435 SHA256 a7fb348dd04bd2057f307c5d95c2904a8b9c790d5b80648507549900dc4c76ef SHA512 5f10152b87cf702225fe50d213f3fbd4865cb2f190e0c2c87c996420c115e5f84de7748af635705b8a2ea789bfeaaab4b927364563a4b83f973dcb5af866ccd7 WHIRLPOOL d6be1afe7aa828607c09479a7bc230f61ef34f586eea0d250e06b9f64d613edd250b2ee5d44bf45509d98a51cf2e454c6b4285f1f9db85bba21cc4e51b292d61
 DIST UTPGPatch451.tar.bz2 3064473 SHA256 31a07fb289841ceba36ca707fafd8180f48e462a53a62a2b34d5bc0f61c2481d SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423 WHIRLPOOL 22de40b50f6302f6a1ff5080f823e3e5e14057bc7729fb809b42981bbd188e47a138058740d4df251c8b7dafd4c74121d7d0d08c85a2746c40e3fd432bd087e3
 DIST ut-install-436-GOTY.run 6340417 SHA256 1626fc3c56ae5c9261b1e1f62fc5a893a83ec4727e2b0be81916b3d9ae90bfc4 SHA512 daa2da9f21f1b6e057e19d72d9c1b2446a250b30eb80b24d6a059a5d1eec24a9326d4e6af0401ba4ade3610fbf3a44c1fe44c26b7ae0eb4b7301a20f9574859c WHIRLPOOL 9d6b3799972d54e3cccff5f7d64ab1cc0954ab0e6472245b2416c09b6629eb17b54c7562a81dd06f49f01b314e677b05295e4ab3c78a662a72295a78ef166206
-EBUILD unreal-tournament-goty-436.ebuild 4932 SHA256 ca75fe7e5cefaaca76691112aa550a4edb90b12fcea75e59b8978053ffd98183 SHA512 039344d3c1970203841d7f26c30059530088a439dac3608214b63c9f0497ec85e3b1d3b4a77979042b07f08f251c82df4aa677cd56f9c767530094e86b51191f WHIRLPOOL c376929f8fe96782290c3f60471662453967cb6ab60e8a9e8f3c2f714cd6b8dce6fbffc6537e425c162d7d2b261413b0245704d038ff2d1fa7d27a3813c9a36b
-EBUILD unreal-tournament-goty-451.ebuild 5231 SHA256 871ca98f55ba4c2d13572d1e7f702e4040deb22eab0d63d1e08d020da0801edb SHA512 d86ee68af67577099e63e149fe2936390d4a55c003389bbbe2b70f3deda8bd1229d6708514560365fa38fb7a8e7405c4691c9ff0c91247cdd9bb625b51de6754 WHIRLPOOL 9f18810f85ee0f9fc037c0214f32361429a62d13f1d0236d80fb97854160134757b113c78a9ef5a9d2166a434383eee0eb6763e1d1ea7a9b235f6417e2b7c14e
-MISC ChangeLog 2870 SHA256 57b63e9f80a17696cd8771300ae37881ad3bdce0d6457afbccf5b02fb350fb29 SHA512 2a0acaef9bc985b93413712724db81449e8ff240586449499562489edc6f0b899a2d711dc18d588957d3589d12e25efd219689f4b20abccbfe34e71018dad744 WHIRLPOOL 3ba4fe08d908fea5a41dfdfa7fe7e4072ad397c83723cb1611bc32048b4cc386dccc39d093dfc465e4be6299774549c301bfc033e70869ed3f2c757391f92125
+EBUILD unreal-tournament-goty-436.ebuild 5201 SHA256 3c0bfad766c539a39bb63b93305d98e213d37ee7fae1acf98098d54ec13913c0 SHA512 13c967288b107eb064c62fcb3e47a9a78489b3423e239e09bdc43321fd5a746cf4e538554ef5ff2bc7183340408eea869871d359a2c0acccdc212a0d66e63ec9 WHIRLPOOL d7552e7f77b92f409d4d19e407d978efd9a4f9842bd0f38ffcb24b93271c1a61f60608643031396cc7d2f29c5ae54bbf212434dd8a11935f4cf19dd59ae1d26f
+EBUILD unreal-tournament-goty-451.ebuild 5393 SHA256 0ee106bd73107b5ac81dbca500524bc37b68d8120e5ffcbb9088c81fec21b628 SHA512 377a135cbd7a85d10ee27b7b5e4b4213bf4ef76cb204123d54f814cd0e7785a073579e06733c4feb5e7209b49876918f38d9ee8df5eeb305e5f2aa624a78b020 WHIRLPOOL 258272cba1495575b98870cd04e2b13416c113e52b64518c1a169ab4e909f2144fcc33110958a00f572e71da6c87b2da09edf5e07a1dbdff1e0afd7d6a0d805d
+MISC ChangeLog 3046 SHA256 061fdcfe59a466a40d3d0e79458f29d511a42b939fccffbc269bd520642f4c13 SHA512 8404a1f43bbedebd5aba3e65410233a3692773bf151dc9eabab678dff1fadf3d344de2225617e2d6e432532661e00f1ff852c0b654e2eb63003050fb3d7a14ab WHIRLPOOL ffb38a131a6468143144b7878b517c1ef850cbac24b713345b093f3940f321febabe269cb274c3af3c9f0a601e41cb935c4cf2c2c8031a77b5f158ae576d1f2a
 MISC metadata.xml 1706 SHA256 0eaa952b3f25a558c66e2eb9a85eca064aaa45835211057feea8cb727f964d6d SHA512 08f7b09fd4c50301a2d574c6a9724e6ae1ec93e494aa2c7f3845fae97b3d79f2ca12960167352575ddafe32703016a3a3c2f064b575f15abf2bbdf8b028c1c06 WHIRLPOOL fbf48c7ddd49e20d14a2b9490c3eb1c7857b23e045e7331ec03d95881826b2aabf5f06fab00e3a0a414fbe0d3bd7358446d7a0b660f2a280567fb978f652397c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTYlMpAAoJEJQzkH1pP7W4nmwL/1voVd5MPvfbEWMNDPvLTzzQ
-fIDkHFkb/+0o+OHgW8BzeMRLYI1HeVzoA6O2oCeQXtbXotuwa0G6CV6qwWiBmNgj
-4ctzHS2SJj9eVKoQA3McZgGmtbSR4mOngoC1PFp1/kVMG8ziN4c4NJOA8u1Sexeu
-/M6lmgOMIEBEOcLLq6FQCdVpYvAhw3EQNBUsQfeGFergGmzcxE8uD/DQK3nLgltN
-Lb6Xsr9nhkXQBtDxlocCvWbapITWhOahxLuGEKwEolAa/1X++ta6L4YX2TlDT+Lx
-OCvRo1fNcqU+KrEdm+BDvDeChLFQrSS2OXE2tuamB67HQgehsfP+Bt5ASNdj1gvF
-24A3up3P586IxsYUjksSlHfTovCRAIm0iusYwXMhUXEMn04pu4bn1KNYm3aJ2qHU
-6SSsgCBxGVakm7p7b9cLATm2tfJ153x0y+U0UDrc5viX13iPCFGy+M75+F+u58qV
-raGqwvChjsbWsHL/tpcRUbFwO10IqHK6oM0dmCSY3A==
-=f9N0
+iEYEAREIAAYFAlQ+Xb0ACgkQCaWpQKGI+9RahwCfYzoE+NxPlp6TJKar8tAfUMZy
+sGEAn3X2GKY/OdOZRkBYy186OIG7zzXq
+=ev3y
 -----END PGP SIGNATURE-----
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index 299873ab9a64..42131767ffef 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.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-goty/unreal-tournament-goty-436.ebuild,v 1.16 2014/05/01 13:58:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.17 2014/10/15 11:42:52 pacho Exp $
+
+EAPI=5
 
 inherit eutils unpacker cdrom games
 
@@ -16,12 +18,23 @@ IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
 DEPEND="!games-fps/unreal-tournament
-	app-arch/unzip"
-RDEPEND="opengl? ( virtual/opengl )
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp"
+	app-arch/unzip
+"
+RDEPEND="
+	|| (
+		(
+			opengl? ( virtual/opengl[abi_x86_32(-)] )
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+		)
+		amd64? (
+			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}
 
@@ -49,7 +62,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
 
 	# export some symlinks so ppl can run
 	dodir "${GAMES_BINDIR}"
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index e920c0bcb970..00cf615c7b5b 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-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-goty/unreal-tournament-goty-451.ebuild,v 1.19 2014/05/01 13:58:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.20 2014/10/15 11:42:52 pacho Exp $
+
+EAPI=5
 
 inherit eutils unpacker cdrom games
 
@@ -15,19 +17,24 @@ KEYWORDS="~amd64 x86"
 IUSE="3dfx S3TC nls 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 )"
-DEPEND="${RDEPEND}
-	!games-fps/unreal-tournament
-	app-arch/unzip"
+RDEPEND="
+	|| (
+		(
+			opengl? ( virtual/opengl[abi_x86_32(-)] )
+			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+		)
+		amd64? (
+			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
+DEPEND=""
 
 S=${WORKDIR}
 
@@ -57,7 +64,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
 
 	# export some symlinks so ppl can run
 	dodir "${GAMES_BINDIR}"
@@ -148,7 +155,7 @@ src_install() {
 	# finally, unleash the UTPG patch
 	cp -rf UTPG/* "${Ddir}"/ || die "cp failed"
 	# 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
 
 	# install a few random files
 	insinto "${dir}"