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, 40 insertions, 26 deletions

diff --git a/games-strategy/darwinia-demo/ChangeLog b/games-strategy/darwinia-demo/ChangeLog
index fcfba08ea08b..0dd5a7b2f6bf 100644
--- a/games-strategy/darwinia-demo/ChangeLog
+++ b/games-strategy/darwinia-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/darwinia-demo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.16 2014/09/07 15:38:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.17 2014/10/13 16:32:12 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgorny@gentoo.org> darwinia-demo-1.3.0.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org> darwinia-demo-1.3.0.ebuild:
   Replace emul-linux-x86-compat dependency by virtual/libstdc++, bug 522218.
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
index 7c6e9aa97cf5..92b57f076088 100644
--- a/games-strategy/darwinia-demo/Manifest
+++ b/games-strategy/darwinia-demo/Manifest
@@ -2,20 +2,25 @@
 Hash: SHA256
 
 DIST darwinia-demo2-1.3.0.sh 22470072 SHA256 2a51ca4e881f7aafe237fedf2e45ea84b48f02488482f55fb3af605a37833d85
-EBUILD darwinia-demo-1.3.0.ebuild 1356 SHA256 0e17b6d578c57223b54e95f5255ed820af832302dafd4ba80aa17cb0ed557912 SHA512 fb7ed381967c0d55bcc9038416cf56ca18280211081cc514b1c13b705244dc2d05b862fb9c55d8cb96fd32ef70b5b3396eaac3a8e8c04af71c3d1496b7f071f5 WHIRLPOOL fb608d954f09fec2da6987fb7378d4e1f163f4443a9fc3292ea1afa2b34eff3a78a604855e3e6cb2e3e9481d7b23c70fb586856efd8af5ebaf5d4c1e5a76a8e5
-MISC ChangeLog 2607 SHA256 cf38b6a69ed2c1adb8f842535b1d76fd03bf52dc591f281dd23cb74571e6c61a SHA512 8a6d5192f6b335db4b93b76be33874d17730ed4416e05644c84d65b470c9d586207211188da04625071de30bf04ca10b6c739f40ca73ce8af517bd2d19cb2ff0 WHIRLPOOL 098e755f354758387b6e29e772b23bbe67d878891eb61c43ffff541d34fd63f590dff85b628207d6879cfb1accf3d912100fcc5de6a97272933398f70eb42503
+EBUILD darwinia-demo-1.3.0.ebuild 1374 SHA256 bb0c256dccb9a2b381f1efa5d0fe27945a00f0dd03f2bc164a3f01dae841321d SHA512 19c146cc43cee251bd395eb0ad37117b8ed3c3fcf562c2c06d7ecca539d5b35f45f428bc5a0f1db0841dd5014e1a0d35c88d579f085c70d00e26263b65f52f37 WHIRLPOOL 8166d6ab9c3e53988d34d23c628b26bee82fbd6b0b2af52b9ca7736190c50eb6be9eaf3c65ab0d99819f369f8180903358743436f965571e3e5e7d75ef9735b4
+MISC ChangeLog 2744 SHA256 40ad23af57ab9537fc6bc0b1f4079283b76e3048f457256bedb3227d2e2aa35a SHA512 7cb81c5b35b353330d32b14c0bb3b56cb3bc75c9e68df88d0dfc7f25fd7187f9ecea76374601893b57b4a9042a87741d50ebfa023d4d5b473171601550da0669 WHIRLPOOL db6d3a7375d486685b00161eb7cf857e7864fb485300a7013b01cdc850a053312191ab315c29c5c460057aefefca585e1b89fc15cde207bff73339d41ad4db57
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUDHwVAAoJEJQzkH1pP7W4UBML/irgd5Z+BEHWMVCWWRfhK24l
-bdms2kBrTJXkPlBHHEkuAy4R0zG1HItHJsbVPGmML1KNXkzAHf/ebzgVjifFdUJa
-G1XeFGunRIRv+66EwHJdLMj9tstpMgwYEjHreDyJV2rY+y4BVje/TrkD0mKDmB6l
-SyxFoyumcjO786yta0NbiJAOETrxwclQXZBRlvTTvWKejcrcwGC7U91DGZyCjKd0
-we9NYDBdXj5gnCjV5FvmY8umzjQRbkG96HlNeA5T4WFurYUwbkoIbKznFvAk5oKl
-ww3BkoaGN2L4iTkMtt7yQOUGffAX+OQi9FXHbA4QGcuslBIAQDwr0LOPUjdhDdIR
-AYLX6WydIocZIwaN3hoUmieESj+D6bmNrPjRKN7hdLJVhuU9gOWLsOnoc+KlMZHN
-0vakTkMr+0tqaQE+S07nptMBOgVNfK2fNoxmCiPrxdV7DPeOgDfsofnyrCvIcrrN
-mGO1exaw+Mas2jVZctdly9HRVQRNIAPKzsNf220PCQ==
-=wl3A
+iQJ8BAEBCABmBQJUO/6OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmMMQAMCDlRN/SjJtWtggN5AEDKIE
+okwapO8NgUBgbwpoOn+BYuqTHrieBH2Sf2fF2drWqGoS3O9yg+rQYsRxI+AfhVLC
+i0OyME3rGzNRZTiiLm7CYZ3rns6jNg47sy/ikSWTEwLvzOfxrSWC6dmeNbEnEf+C
+wFMiCKFbdmiBZZk7tuaEATLj70gYfqNc6Fyji5t8Cx2v3Qq6EpIj6oChCKLg6Tca
+bOAbwt6CDVmXGJqiHEhNu/9OB+nuAT8KaoAf0j83gFdyE+N9hTefLKCok9kHw+IQ
+ynI0jN6T6ya+a3YOEjo411fr8ZB8+/tdPeCT4jFfUMqQGuGkX07w603HrSu1fkhI
+7j++nTrtQdBYW3M32e3F25cmwXMZy2wPKn+myfFoaJzr1eTyUNWB5LYHJaw3ikfo
++uhN4LLfESO4hRf2oIeGUMC8A4/0hqS1dQjw+9skwFUl8c6b5yMrnJ4AtODdkB+d
+FjME0inXbsmECgS0wUcbmTkiSepDGQ2H33Iw1fC326qd+JuOnM4YjFpmbAIWapi5
+waBJuUmJtFZg34fJlCZnfbLCJI3Qhhc7ly3QnPbNY29EnUDbXkFr4XtsjVuGkHJD
+F7ckQWAGNrsQX9di6CE8Nmp/KrdcL0z2atrNydQ0a4Ovc99V68QNlLnQhxYuPPky
+bVTjDZhTKIie/1KhHrNU
+=IFD1
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
index 5740e1620e04..7d95219445f7 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0.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-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild,v 1.13 2014/09/07 15:38:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild,v 1.14 2014/10/13 16:32:12 mgorny Exp $
+
+EAPI=5
 
 inherit eutils unpacker games
 
@@ -16,14 +18,18 @@ RESTRICT="mirror strip"
 
 RDEPEND="
 	~virtual/libstdc++-3.3
-	x86? (
-		virtual/opengl
-		virtual/glu
-		media-libs/libsdl
-		media-libs/libvorbis )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-medialibs )"
+	|| (
+		(
+			media-libs/libsdl[abi_x86_32(-)]
+			media-libs/libvorbis[abi_x86_32(-)]
+			virtual/glu[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)"
 
 S=${WORKDIR}
 
@@ -37,14 +43,14 @@ src_install() {
 	exeinto "${dir}/lib"
 	insinto "${dir}/lib"
 
-	doexe lib/{darwinia.bin.x86,open-www.sh} || die "copying executables"
-	doins lib/{sounds,main,language}.dat || die "copying data files"
+	doexe lib/{darwinia.bin.x86,open-www.sh}
+	doins lib/{sounds,main,language}.dat
 
 	insinto "${dir}"
-	dodoc README || die "copying docs"
+	dodoc README
 
 	exeinto "${dir}"
-	doexe bin/Linux/x86/darwinia || die "doexe failed"
+	doexe bin/Linux/x86/darwinia
 
 	games_make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
 	newicon darwinian.png ${PN}.png