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

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

6 files changed, 68 insertions, 39 deletions

diff --git a/games-fps/ut2003-demo/ChangeLog b/games-fps/ut2003-demo/ChangeLog
index 16bef38ea9e7..aa4f6396b3fe 100644
--- a/games-fps/ut2003-demo/ChangeLog
+++ b/games-fps/ut2003-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2003-demo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.31 2013/11/14 22:00:43 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.32 2014/10/15 11:29:02 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> ut2003-demo-2206-r3.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   14 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
   ut2003-demo-2206-r3.ebuild:
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index 84cca8cef7a8..efc315ac56b3 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX benchmark 1180 SHA256 33c890051ecab7a2d136d413c18d20078675ff0e215eb9df7b7ac6380e2db0fc SHA512 4da05b170e3b8a983d264c83e094a8084a9a9b9b58c6f7fce30ea7273f625f8e6c03794a519cdaab5cfba64fb4b5047ab73eb3190c6a076a5fde4eb0399c1785 WHIRLPOOL b928b19c75fb7fadf720bc1b8a6bbbf370d688df968ba6328f44c5d273e6659f4471543022e8888dbe37fa2e1701e3dcb217b8a4e8645632a1984c2133055973
 AUX results.py 1461 SHA256 3c492242e044921fa33e0628eb497be23c0584a0eef3f8eb1b4505ef168c92f7 SHA512 6b0e21638acda24e37105b33aaa979e18acbdd75f061a16a7a8d5109404bc1478988cad142167afe27a7ce5901e492178d2eda04c293d027048f6d873a56873a WHIRLPOOL 3a14ae12b5c1d0a26954d0a286881810a9369b1bb8202621dba46f36548e43e85e0b9b93bcb5a9a0104615cf1e89fbc9eadff1f1f7856a92c9f2ffd3b02d0938
 AUX results.sh 2107 SHA256 cc7c7fa724961d297d656e70f429d82efc1f004d0a82973f1c949882546a6eb6 SHA512 749ccf70249d848605437da43f99f0fc881ee58edc85535d6ee0bf2bf57c5642a985979d5bc048a64363f711af35cafcd53d438974a13e62f705551ba6ec3d51 WHIRLPOOL 590c571316f561db5015b25fafd8f848017e99e5d06a94fb41e06dcacc1960137b374d88a785366e0df0387f3b016bd4dea859548314f6f12b77eee8933db75a
 AUX ut2003-demo 692 SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f0949921d92474b SHA512 50b927c70865ca808cd060fc1a3e1bc7549f85acdeb18e90343108823db858e3580db5e584cad2e41358e205e4b5375c4deba6990aff4227a9b7e5333dcf51a8 WHIRLPOOL 13fe3c1a21be05df45ae5a231cddd80f1dc0b7c6a4b53379f542fb3edc60b04e4e93b24318273663cbb2024561ce55026e0bbb2303c1f5db5b75ec50cb33ed13
-DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813
-DIST ut2003-demo-misc.tar.bz2 31851 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced
-DIST ut2003demo-lnx-2206.sh.bin 137253079 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173
-EBUILD ut2003-demo-2206-r3.ebuild 3822 SHA256 1c74956712799a5f96eda4512035d1c2518583c532bf133ea7b79e383e9b2398 SHA512 a9907451af6d3cc123314f25084c3e68c35ac6ed1c6cec2d5830b7a4a9d30139344006d9e7cf1be89ca1ca6d11db72fab527d6105a37956c2ade122be20cc784 WHIRLPOOL 4cccbef4bdefce6e44eba2448bc7b7e32fecc58c6c2051400b0ad37a07a1161d72e017c65704c1c5b0ac1217e8b20b39ca5af624bb262495c85329cf2e52707b
-MISC ChangeLog 8016 SHA256 24a54b09785d5723607f9b6e8ddc65db0e47f51e46673616836bcf3a473ec23a SHA512 41d5088125cd5f45a62878d3e73e23b8963332f41db2d3ff4c98d0a4b91283ce4a0ab8c80410251e1e653e571aa8f2970382e593db0617f9a8963ad0146fca86 WHIRLPOOL 78c61c4ad70abac56ad03ccc94bf7858efd904f0295155d29260df01287e4760040e2a999b45d92fca5a297e62ba07b0ec0ff94ccf033835016bc966c6d5119a
+DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
+DIST ut2003-demo-misc.tar.bz2 31851 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0 WHIRLPOOL 5597c0c4444de2e50cf87c23cbe4c863258da761645d41f4693a7aa774bb68cb8f8a4bf5c8b3b4e8a670f7c8ce616728d1223dd18b20c59fde60462e413db9f0
+DIST ut2003demo-lnx-2206.sh.bin 137253079 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173 SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be WHIRLPOOL b4bd520a60385d803d7d44247a48ca80a1116d9a3b9ea9f1dcdf2d1114bcc42e8705f00e228fe50fedc95d1d1c130ceaceb0c54210f51fb03da0672d13c35758
+EBUILD ut2003-demo-2206-r3.ebuild 3953 SHA256 c428ed5c68716ca21d5becb50ba7b92c7596088e84fd846c6b2df3a881368c6b SHA512 d38a922d9b856d324dff08743fede7320a44b021cc390ef882baa332f9a7610394bc5b31eb63fe0619a720956eec745dd37b52eadcdbcf614f3a27b2686080d0 WHIRLPOOL 37f952ec4c140d69584ee6ca95796bb84419cfbdcb5107f38d86b2840ae4bc5b9c35226e3fd64161ba5a6c64a35af4eea867e1f945d4cd2e447c05db9e27a9ef
+MISC ChangeLog 8142 SHA256 0029dabdc646284dfaf065f900dc1c58284a23eccff1bb461c569365776d5c33 SHA512 5d709fe2a2b5a48fd9be1d6349d4b6887a44f99193170cc8b8101f03692d9443de6fc22a3173da2b90f8e170161b75e9b278dfcaed176080a9b3dc329258befe WHIRLPOOL 1a3776abfaad92b7acb70d6780470c6f892c5ca48528fde4bde7808216b7a06148fba7a36d845944b9314002f53297ef274c5d0b11254cee7f236d316f600e8d
 MISC metadata.xml 511 SHA256 2881e8831da5fa288ce13e4b425e921e01896b4a9bac421f612971f20712e9a4 SHA512 7afba1391583dab3c7d1e992811fac287ba52016e971884738abbad84986c035bad24c0adb244b1a6bb71fa7591a832ef16541800b773435f25190104c8fa0d7 WHIRLPOOL ab8ffdcfa073bcb9b6de9655122659f2ee5647f18cb5d9d23dc730625b06e065211ea6d0b78f20e409ad50d4a1269d8c5a005e681ea9180a034c6ce1e4531fe3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQ+Wn8ACgkQCaWpQKGI+9T/wwCfYxi37XPw4vdBNlJbsTR3NuRu
+3lsAnRudBLFqUzBZHW3SW6h3qsY+qkz4
+=dGL7
+-----END PGP SIGNATURE-----
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index f798e9349211..cd2615ca3b44 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.26 2013/11/14 22:00:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.27 2014/10/15 11:29:02 pacho Exp $
+
+EAPI=5
 
 inherit eutils unpacker games
 
@@ -17,14 +19,21 @@ IUSE=""
 RESTRICT="strip"
 
 DEPEND="app-arch/unzip"
-RDEPEND="virtual/opengl
-	~virtual/libstdc++-3.3
+RDEPEND="
 	sys-devel/bc
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXext )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs )"
+	virtual/libstdc++:3.3
+	|| (
+		(
+			virtual/opengl[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}
 
@@ -78,9 +87,9 @@ src_install() {
 	# Wrapper and benchmark-scripts
 	dogamesbin "${FILESDIR}"/ut2003-demo || die "dogamesbin failed"
 	exeinto "${dir}"/Benchmark
-	doexe "${FILESDIR}/"{benchmark,results.sh} || die "doexe failed"
-	dosed "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		"${GAMES_BINDIR}"/${PN} "${dir}"/Benchmark/benchmark \
+	doexe "${FILESDIR}/"{benchmark,results.sh}
+	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
+		"${ED}/${GAMES_BINDIR}/${PN}" "${ED}/${dir}"/Benchmark/benchmark \
 		|| die "sed GAMES_PREFIX_OPT"
 
 	# Here we apply DrSiN's crash patch
diff --git a/games-fps/ut2003/ChangeLog b/games-fps/ut2003/ChangeLog
index 1615f01f4810..6d4793ea83c9 100644
--- a/games-fps/ut2003/ChangeLog
+++ b/games-fps/ut2003/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2003
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.49 2014/09/07 19:42:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.50 2014/10/15 11:34:01 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> ut2003-2225-r4.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org> ut2003-2225-r4.ebuild:
   QA: Remove unnecessary dependency on emul-linux-x86-compat, bug 522130.
@@ -191,4 +194,3 @@
   21 Jul 2003; Chris Gianelloni <wolf31o2@gentoo.org> ut2003-2225.ebuild,
   files/ucc, files/ut2003:
   Initial import to portage.  Ebuild submitted by me.
-
diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
index ae2d05480d57..9def897b7dfe 100644
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@@ -2,20 +2,13 @@
 Hash: SHA256
 
 DIST ut2003lnx_patch2225.tar.tar 10039316 SHA256 0c2d851e39b4491698f6fb3aefb9bf83340de85085f3b670d93a8cba29aefec3 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d WHIRLPOOL dcdd705e9a69612d4672b38a00080063fca7a80123f7152fee8490018c080e0dbdbf7a74acf316f194d182acda2e6f092d1edcab56f4bc073df1f99e9b4832b0
-EBUILD ut2003-2225-r4.ebuild 2792 SHA256 0f13f796dac5723cb7c9566c56bd8d96579adcca82d999dc4321c0eb7a87640a SHA512 1f2f241e473849882d9aef03ee5515aad19cd7d747feb4b729a2d7a1f400a9a0187e450086ba157d89ab9015c0f41760b29e9a3b4a866899d70da788d905a648 WHIRLPOOL 2d49d23746367b68da9fb703dd0b8dca0d714eac64f8c9d8738ab67ef13b2d54d4130bacf863c205525551a9f77b9eb5e0f300f3b0746bd23dcd8ad9a8aa8107
-MISC ChangeLog 7845 SHA256 edfd70cbc0c27aa80dd987040d8492a33052e0e550fd34290b5d415ff3aabc75 SHA512 981f1ae03938940b50b68fd790b4338d28e8c4b84f20a957b6a27fd8f7cde1b297be39e59255db3064ee9bf08f7b64b81c2a44861adf6ca7f398624fb1235a19 WHIRLPOOL 3c90dc989d25fe7b45dd1d6c5c988b0ee84a8063452b0ed476cdbd0c5c7bc8f98eeee5645e112ba0221560e105384cef95ab74e00e5cd897a8bd744207a1e85d
+EBUILD ut2003-2225-r4.ebuild 2854 SHA256 9d6efcd6dfda9102e0f9650fc5e7cab94bcaa3e676d1f5ab2df741f6b0bddbdf SHA512 a522cb84628ae3a77c8b770a2201a23bed6b1099c4485968a2b4ef7dd73dc8e83e5973045011f8b452c8fc5fb0f9095a10ab10b2a31e9ce54adfc6bab41e72b7 WHIRLPOOL 0b1a1a9f8968e49f4a33e3196bb757722f6f7905d142c0823f782f2f155829aaa36d3925fec54ee8b3b964a5faa5f58c3ae9c0f314d4a11dc5b62a08861dab13
+MISC ChangeLog 7971 SHA256 20c8524ab8cbbf5ac6c99f6a17f41988df1dd209dc0bee08a7408f2e93570e3e SHA512 8ee10e04edf662539391a02ec422a5506903c25dcf84bb3742530b690389ce9f2d343f84bbb0d2de7ed77751d91a2861b08cbaadd91e460482781a49087b502d WHIRLPOOL ccc84d5bac70d175f8ffee2cec66e11bb60a1c42770a26741e5cacc70704c637f4ef7e6e1e78707358824a3df47c30df9cb0d805f48a4472a3dd62ec15554bda
 MISC metadata.xml 680 SHA256 d579438bd0fa2677691b542c2aebd87502cccb277a61c4fcad8b895cbeec28a6 SHA512 b1ceebd53c9f4f8508e2dbf53abf975cfd3adaa548637ea935da1fb5201aea7fecb911298ccede75e2b762bf13aab9036d4d8cd252c12965e011a4f72c86dcd9 WHIRLPOOL ea079c31dabbdab692d744d9d593ccf3fb9217cdc42055525ec34ddeb858b23613a9a510da3789b29916abcb758f7c64c5c1bc953e4ca8b3b642227d313d6d61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUDLVpAAoJEJQzkH1pP7W4JJgL/RrBQ7h8fa8I6wcv5NUZuDu9
-zCKxHdR2BgDav8YQLT+5gt30wN4b0y0kTC94mLMAHmVX5AiDscI3ptpJWrwhsjUP
-XF5TRZNfPd74lerYLT6QfQkEvUNjd8+ftDpKgScbQplP3r6hKdcmEfljX7BSHMxV
-jb8Lkn/g9RlllkEuzBl4ks5nlcbr/HzTKieZdsloU4grxTV0KVlfJVmuJtZqaAp1
-KuVLtwvfNArXTAqsUqBzkBq/wwjx5clkllJuLRQ1A9gJuxXSJp4qKoidxEgl3u3Y
-FYmOhKbytfEM0xL0AsndO6w3YPk6Dg65PcZdCNmj96dsdqIyjiX1nkDtD8IiB6xF
-HDlgQ9ZyC2K0ogIumblGE1+opJ3sinmx5saKkxksGoEvILc32jzip9dCJ0hKMiJC
-Jlxr/kDUYoLu+m1an/V5mr8rIm9X5x9/ewJ8lMwxgKeSo87W4BrebacFUJ/44be8
-qfo5DHyVcE7fduzICfCQFjXs0p7ccmUAm3PgIuzJZw==
-=kpgT
+iEYEAREIAAYFAlQ+W6oACgkQCaWpQKGI+9SS0ACeJ0RiB2KkLQt7Va8c4q5Lzza6
+FgEAniCtjRzqVajq+xxQJeO85ghXMtK5
+=UO46
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index 1f2772678b6d..33a0ce6b9b02 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.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/ut2003/ut2003-2225-r4.ebuild,v 1.16 2014/09/07 19:42:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.17 2014/10/15 11:34:01 pacho Exp $
+
+EAPI=5
 
 inherit eutils games
 
@@ -14,10 +16,21 @@ KEYWORDS="amd64 x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
-RDEPEND="dedicated? ( games-server/ut2003-ded )
-	!dedicated? ( virtual/opengl )
+RDEPEND="
 	games-fps/ut2003-data
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+	dedicated? ( games-server/ut2003-ded )
+	!dedicated? (
+		|| (
+			(
+				 virtual/opengl[abi_x86_32(-)]
+			)
+			amd64? (
+				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			)
+		)
+	)
+"
+DEPEND=""
 
 S=${WORKDIR}
 
@@ -25,8 +38,7 @@ dir="${GAMES_PREFIX_OPT}/${PN}"
 Ddir="${D}/${dir}"
 
 src_unpack() {
-	unpack ut2003lnx_patch${PV}.tar.tar \
-		|| die "unpacking patch"
+	unpack ut2003lnx_patch${PV}.tar.tar
 }
 
 src_install() {