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

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 46d5f56d5925..66aecd956c91 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.60 2014/05/15 16:41:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.61 2014/10/13 10:56:12 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgorny@gentoo.org> zsnes-1.51-r4.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> zsnes-1.51-r4.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index acf9df9c942b..f9f27fa782cc 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -12,20 +12,25 @@ AUX zsnes-1.51-libao-thread.patch 663 SHA256 71be0bbb8b683edc7c7780b68a43e54be7a
 AUX zsnes-1.51-libpng.patch 854 SHA256 8fa8614c9dd4360c05fb4c581a8c8aba89195dc4da0c087daa18845b7ab499be SHA512 210dcba006bdf6c18bb55e106e8bb2fcb9691deb89874fd4f9e034f2aaf9e8e96543b2177d31b94c121a811b80de6352b7b420fa8d0760055dc1d4df43bbaa68 WHIRLPOOL c1e1a97a9ec17a1934c493194028c640a7318eb60f9da564c9da34c6925a3deb65fb403adcd8ae6834a6b9afc76d85852c3c0168f3bea14f519d8c52232a8187
 AUX zsnes-1.51-libpng15.patch 510 SHA256 c9636e76441ae1624c8ddc92e47facc20b43871fb0f55fd50d526b10944c6560 SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532 WHIRLPOOL 4c8e6565a8b1d2d040f545f57dda751bcf387828c3153cf71459bdd72252ac62d66317dd3fef51cba10cfce372391aba7d4bfb5e2fdce7782484fce2a4b7c6c2
 DIST zsnes151src.tar.bz2 1071712 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866 SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353 WHIRLPOOL a023003bcad23dc1da20338dc6adaf6a4061f70f9968a436c5ffeb3263ead85786909b1c2225c0762cd8f0f0a0757c52773326ad2c800f38fcc714f40e4b2162
-EBUILD zsnes-1.51-r4.ebuild 3072 SHA256 c54c7c03f0c4321d8907a7f2d63dd5e429a16ee265e1ec64e3b26379004aaa45 SHA512 008013d506c9100e513bc894baeaa74fe34af9656063e35c815647204e51ae62add4d8e924be2d7698ceb2e7d62c5b314356cf14d228aaf80c4f18508a915780 WHIRLPOOL aeef7e08e5d57b2480abe7ad5f5530a714f39292d314a69e7c1ee2da20154818ff20ab5fa941564d6e5e37f345048fb2acd46757414ce23cc95381ba54efd88f
-MISC ChangeLog 11378 SHA256 471261dd0daea762df1ddc862d32ef943bf655f2ea76b3ff4f0e04c730231669 SHA512 40d6fcdd65d9db2c72756dd8589822445c67c2f304b767d7ab151d8fed114c90368a6bef426749887c9462bd7a763953eefb29280f66bdfd0eb3e8a96c80afde WHIRLPOOL 12d99ce526c79abff16908467ff60301a77af652bd9abe3d713ba2759983dd9740a6f5e84205b56acf08dd2f17f350ba98d1a1aaaf922165ff45a089cbd72ec7
+EBUILD zsnes-1.51-r4.ebuild 3323 SHA256 b99a0b7b785bed18553a00ffa93aa1e11521f293d6d27a600a6bb6080c1624dd SHA512 869ee17acb7c6074edccfff52e9242dc7d1a22f7842190c8e15bed12fec8bee048c1d9ea370d587404e36bb541344352bb7c7d8bdd93e6aae8681a71dcf08d2f WHIRLPOOL 5ff2a2a1e6a3b0a31f8f52659a806192f500e83fc688f18f8f8da877c1aa4d46a6e03ecfa6a74a28025f30b64545ce0bcd8fab78882758c6b4c6d39ebda8607c
+MISC ChangeLog 11509 SHA256 61391ffb5e56b87c5ee8aa365d8365b85a6bc3cbeebe2284247e83f0a7038822 SHA512 3b1fe7a3184f6c860529bab417aaad64efaf17678048117419e48a705861441357e5fd6a9f1fe960ce3b3d070ae958782394ef22fc4335a907d183786a2e323f WHIRLPOOL 498fcc101b32c7e76502e97071f69c6da84b42868013e7e17ef14acebec08ca0506257b64bdbad37f02ff261aab9b949f752db048e956b435ec7cb060d48c151
 MISC metadata.xml 306 SHA256 67e643f6b0bee32d98be4296b49cf224a5952bf2da313f5b5ad0a6332de3a25d SHA512 b5bb78b2f848e12190f8cff96dd28234e23052146e459ecc24f0b689ef280901dd78924e626272149ba037f7f5c10bd4a11eea20386071a08152f5bce3efed28 WHIRLPOOL 149151d273edbb4b2be323ee09dbe2b179b8c7e2ffc4fd492165f3478eb70519c97764d39925067934d252ec96cd1eadbf163ca4d17f0ded4136dc499cc36050
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTdO48AAoJEJQzkH1pP7W4UPsL/iBRLebV+IbOcXtLMjU/tVJg
-ZMpkk7ta74xuJxHAlUSvfIRMfWNQiN9HAfSMXs3NwxoMDn/QeJJok3Pzp9sPqwY1
-Jh1XC/eo7T1wQQC24jtvxpMMLnc5WZwjveYJlUKwjpZotVeDfnbsjBDcnIFA2ODA
-QSt0iVC+cGpCZKLXwD3Z8YIatDkmux2cb/VwyEb6IRX0ALZIZumS5LQpZyGrW35H
-Cwc1pAHSnrfAVAadZihFut/o3hxcn4sY6VTSSFpLewop7EozGTm+1yMI26Y2EYyX
-KyivQwUnNSqxLJPrpE1NGl/YkRqVUdL8PqXwYYz39LujnUYPJ4QO9g7oy/9MCO2F
-BD1cSli4Kswe7ibdM0jW1ETAOzv9W5xEB2FmoOGNIraWlEFtoYfM1nEcGgJ5LurR
-MAlPq4SdHxUUcxEp9B5kuSdrOVFL0AUcAQlFrQhNZweiaBZjkvymzj2Zs7Au1z/s
-COKdZUjZB9OHDYqgyIldFw++BByBfQUoUn5XIipnEA==
-=jHYv
+iQJ8BAEBCABmBQJUO6/NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmgUP/j6bpawZ3l/IfLvwnMGA5Qv0
+xe0TokhczwPSf6ugnpMNFIftYEcRp5W3nWMPClyEGdNf05MiznRprU3WnHehdOnf
+cZRtEBCOmesuA8tClnSSIjuLtu4IwN4dKUAybt9JOOFQQ7DtK3C6mra4McYDVwvn
+e+TjoFAkB8b5PrUq/xpbOUwdYxZrdZ8LthgD9zzS4c051qgoP5UnxzaVRiLchS1T
+gFZcGIxYNJvr307MNdqz1BiMztuYApQW0vygNHOTM9u3wDu6jwQE62moop3KaXL5
+vAmqx9lRSsn7ZufamUHoJxdRHl5MpEeeUTpZjcq83Xduv2kvq/KcfkC36zvP72Wm
+ZvDCF2LAeuq5yt1gMOTbYkVbSqBs0hgY8ypTKl6vV3mAAHBFWKbaXbMmLWRESdsw
+3V3GsirSuwB6NTDPoHW6tRf35cmI/AhqAj3jO2MK0N485VcW3Ive1BxkQxn/LPkr
+6fslmWdRYySxyyKtISc6y8grd1GJYHECsXdk3UiMqqHanMQCtgOmtBrxgPW8Mbwa
+HIQ14xKpNUE3XK4Jb1KRDqmmiwc6hnQ+6XaRSHrXYOVLMAceuztYIDdqITnRKbrj
+Wu1Lp3VI+O/0rIiEO2wM554OrOiMKZ+UKp7z34ve7modBkVjhBXa2Eif3Kzm+3p6
+RiLhPVUf/OVOOCgflLMp
+=Ru46
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/zsnes-1.51-r4.ebuild b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
index b9484c6726f9..e49270b67c09 100644
--- a/games-emulation/zsnes/zsnes-1.51-r4.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r4.ebuild,v 1.7 2014/05/15 16:41:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r4.ebuild,v 1.8 2014/10/13 10:56:12 mgorny Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils autotools flag-o-matic toolchain-funcs multilib pax-utils games
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
@@ -14,13 +14,23 @@ SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="ao custom-cflags +debug opengl pax_kernel png"
 
-RDEPEND="media-libs/libsdl[sound,video]
-	>=sys-libs/zlib-1.2.3-r1
-	amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 )
-	ao? ( media-libs/libao )
-	debug? ( sys-libs/ncurses )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )"
+RDEPEND="
+	|| (
+		(
+			media-libs/libsdl[sound,video,abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
+			ao? ( media-libs/libao[abi_x86_32(-)] )
+			debug? ( sys-libs/ncurses[abi_x86_32(-)] )
+			opengl? ( virtual/opengl[abi_x86_32(-)] )
+			png? ( media-libs/libpng[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+			ao? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+			opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+			>=app-emulation/emul-linux-x86-sdl-10.1[-abi_x86_32(-)]
+		)
+	)"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	amd64? ( >=sys-apps/portage-2.1 )"
@@ -85,12 +95,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake makefile.dep || die "emake makefile.dep failed"
-	emake || die "emake failed"
+	emake makefile.dep
+	emake
 }
 
 src_install() {
-	dogamesbin zsnes || die "dogamesbin failed"
+	dogamesbin zsnes
 	if use pax_kernel; then
 		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
 	fi