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

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 46 insertions, 24 deletions

diff --git a/games-simulation/bcs-demo/ChangeLog b/games-simulation/bcs-demo/ChangeLog
index 01851c967896..019272e0dea4 100644
--- a/games-simulation/bcs-demo/ChangeLog
+++ b/games-simulation/bcs-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/bcs-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/ChangeLog,v 1.11 2012/12/31 14:42:06 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/ChangeLog,v 1.12 2014/10/13 21:09:36 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgorny@gentoo.org> bcs-demo-1.3.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   31 Dec 2012; Tupone Alfredo <tupone@gentoo.org> bcs-demo-1.3.ebuild:
   Use QA_PREBUILT. Bug #431116 by Diego Elio Pettenò
diff --git a/games-simulation/bcs-demo/Manifest b/games-simulation/bcs-demo/Manifest
index ebcf9a173f8b..0b7d3487a55a 100644
--- a/games-simulation/bcs-demo/Manifest
+++ b/games-simulation/bcs-demo/Manifest
@@ -3,13 +3,25 @@ Hash: SHA256
 
 DIST bcsdemo_v1_3.sh.bin 5965217 SHA256 1e23f1fd2ec95e27c56037761c25e3af1ef1f23365540434b12e8b31527dbad7 SHA512 b3916ac72d21e80a09b80a406ea18ab4365d9c1b8139eec848f2e5d697d3d5afb6f27de5dac31c6b6fd860e3b406a3eae8a28aac0e00134629dbd5906bde816d WHIRLPOOL 25d2b12b9bdf6acd6695ae78f72e7712b1c0df4b99fb54c6c4621f1005d9375d265a1451955819c0d58630568533919439000f94c3adbd51ac68f6e0c7f205af
 DIST openal-alan-hack-0.0.1.tar.gz 86168 SHA256 86e09a5d43461031094c1a09382b369c6f8e231e644dde9d98b7b35fb2e0767a SHA512 1794461cb917dcf2130977bd0ac9f09bf93cd235dd742d29e50a3e2666e6db60865bacd1927fc4607a4b308dcdf421fa2a186ad2a06eea778069ce712a89d943 WHIRLPOOL 4daec7dcabacde0494ba9b4f3cf245201d6e755fd432a8edc6a73105688a1e87ac1f33334afc546617bfb45b6560cc67e150873c982b7d2b38a79ecec203e056
-EBUILD bcs-demo-1.3.ebuild 1614 SHA256 69fca5949da8442aac98009d3c5b6540421d2aa96a7c006ad3d18bb0bef3971a SHA512 fb1e76c3db620b334c25e8a6ace37765c3fec33d01887e0ecf21e644622cabfde09a0c4f816e7ac2d5feedc26d4f117ffa8f282a9fdafc57ae132c79ab39d5f1 WHIRLPOOL edc694943bf34f9f52e20caae62edf7d47961869241ad2681299a6ebfccf4e93b5fe6c2a22bcf0c8021eaeee58ccff30d2ff0cd4b82fc13966c1a724098ffb4c
-MISC ChangeLog 1998 SHA256 b80d6d476378f6472abdea29aa0a3b5cee5302e3e0b699fabbbb30cac5fedd79 SHA512 71a99739c57fd0de15de0f18fc601d488bc4314a69344929179c3a3932d481398ef01fbf5d0ed84041d140c2f6da71297e392647a7116a3645f0de2754e0a209 WHIRLPOOL 0776ca7c8abb3e323ac3a4a03b9307d3965d2190f72394591e171574d764568f9fa56e6ece26dcd1d89469de6f78464f7fb8092b0a146bb77747466ec2c291d2
+EBUILD bcs-demo-1.3.ebuild 1790 SHA256 04dae03f6afb94c3fffaee91cdc078df8d9c43d22d9f4552d911b818b1642173 SHA512 8cf8cfc20de5667e6d74513321bfa510298913412ffe51e4d687367f91ad46ece99f2d42e06b4cd4a9f3badd2e9feefbabef4308744f5bacd9efa36d3586055d WHIRLPOOL c1afbc86b74b89243f5414084d614fc080269ce0b8336e406d575e0f742112da2814254a1bac8fa4aba0d26e90a394d04169ab4255bb5b5d8c40ac1c82376cc9
+MISC ChangeLog 2125 SHA256 9198051fad131b7ea959b3310acf2cb2f3ee3348649413e66fd4890adf6796ac SHA512 8ff4943f974fccf5e8e9b6d39f920323933d25dfa6f455f33c7eaf47e04ad121b8aead861c08720594db72c6b56f50b7c07f010b146939d3d5316ce519ee607f WHIRLPOOL f225d7533df26e878e3c4a808d4a699356f8ced13c893f3f2ea1e7486ebb1d552d81dc01c730cc0b9b04aeb7b1497834af3f3ef8ba1a3467b17a50df670decdd
 MISC metadata.xml 1382 SHA256 fa1e807c2f064f620bf19349e1bae37598551369895e391a506e93528547f2c1 SHA512 d2a36a756a23c3a0d884abb651e3a366a7ab27cccf63217156fb5bfb2e20ba1d9346e5a211ecffabc1f674ba2742b39f6ab5cc08794c7bf7295de301c10adafa WHIRLPOOL 0bdc49fbb363c82b235587a6b223ffb45e13462c5dc9532179e11ea45ad5855b6ead59c839dfdfb2be85bb1d789c5ffbfa319a837d11bd34cd24afa456dcd20f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlDhpEQACgkQIY77eQFFFC0dIQCffnYo06YlbUVEpzyEhMSL34OC
-v3MAoM1iIIPva4qaIVjbwZf5TYtJGx70
-=k8tb
+iQJ8BAEBCABmBQJUPD+SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2G0QAMBwL8NKtGcNkrKx9/yY47Um
+rP8GIzOhmyq9te8VseSRFlXPHyDQeXs71rtKVQQR1WyEBEjfCSr+J33hs+JZR5n1
+kj7pIVKWJ1lkf5aeFLUAIzeYj5/DqKVmT9CBA98QEXaxlsXfmrUL17CeMEy049Gm
+AFmaR1BgP3PdnWZGbRBN+lwcSYrkt0MYYVJ42rvlubyK2lHQTCscZ590r3tiJP8z
+8/LiXddVpmYoHgHxq82Acyx3KTqIIhqqbwIZNIkpsMQJnulr6o0KzInVAOf9vzfT
+KNufU63GaIg3yP9J8rb/FnufZiA1ButDsqUUTZR2TlOHp1+tNzTUgdCVQhOvAXAK
+GM1+lZYrxd5jvqCI2o92aZhtnSXsX5bDR+6t38W4Bml8CXEBePcsFtbVQ7ogE9mm
+bPzfnMQ66MYRaiKaiA5J8oqvPkWuEaSSi+V1qW2UkmdQEW5/quE5f+nXY5IIvZgJ
+LF7uejoGxVhK/w8K2y2vqtXs3fHE4UT8dMnq/8piCUluNIX+01j8C6rXn6d09eGW
+1OMYuk5xMlWRw7lC8aMatwj7Il14wBjtYcylPQ/qdXSbzruoVFEWVBapAYAl4bSO
+ov8gkDFazb9qp+LFiOqwskMVLUSxUHzWrAapLg6UNRhOyrdy5ZICQXCri0bFZV/+
+h9jxhOU/MdhtneLcMsTK
+=rkY4
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
index 29de914d0fc6..10c069d49b4c 100644
--- a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
+++ b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/bcs-demo-1.3.ebuild,v 1.11 2012/12/31 14:42:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/bcs-demo/bcs-demo-1.3.ebuild,v 1.12 2014/10/13 21:09:36 mgorny Exp $
+
+EAPI=5
 
 inherit unpacker games
 
@@ -16,16 +18,21 @@ IUSE=""
 RESTRICT="strip"
 
 RDEPEND="sys-libs/glibc
-	virtual/opengl
-	x86? (
-		media-libs/libsdl
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-sdl )"
+	|| (
+		(
+			media-libs/libsdl[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+		)
+		amd64? (
+			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(-)]
+		)
+	)"
 
 S=${WORKDIR}
 
@@ -45,18 +52,18 @@ src_install() {
 	rm -f "${Ddir}"/bcs-linux-openal-fixer.sh
 
 	exeinto "${dir}"
-#	doexe bin/Linux/x86/rungame.sh || die
+#	doexe bin/Linux/x86/rungame.sh
 #	exeinto ${dir}/lib
 	mv "${Ddir}"/bcs "${Ddir}"/bcs-bin
-	newexe libopenal.so.0.0.6 libopenal.so.0 || die
+	newexe libopenal.so.0.0.6 libopenal.so.0
 	echo '#!/bin/bash' >> "${Ddir}"/bcs
 	echo 'LD_PRELOAD="./libopenal.so.0" ./bcs-bin' >> "${Ddir}"/bcs
 	fperms 750 "${dir}"/bcs
 	games_make_wrapper bcs-demo ./bcs "${dir}" "${dir}"
 
 	insinto "${dir}"
-	doins *.cfg || die
-	dodoc readme* || die
+	doins *.cfg
+	dodoc readme*
 
 	prepgamesdirs
 }