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, 50 insertions, 30 deletions

diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index fd2243e025ca..3004af6797d7 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/dominions2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.11 2014/05/04 18:40:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.12 2014/10/13 16:22:19 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgorny@gentoo.org> dominions2-2.16.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   04 May 2014; Ulrich Müller <ulm@gentoo.org> dominions2-2.16.ebuild:
   Change LICENSE to all-rights-reserved, add bindist restriction, bug 505758.
@@ -41,4 +44,3 @@
   +dominions2-2.16.ebuild:
   Initial import. Ebuild by Alex Linke <incubation.11@freenet.de> and modified
   by me. Tested on amd64 and x86. Closing bug #36706.
-
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
index 5e2947f35830..2253bbb4e845 100644
--- a/games-strategy/dominions2/Manifest
+++ b/games-strategy/dominions2/Manifest
@@ -6,20 +6,25 @@ DIST dominions2.png 1135 SHA256 530479327df7f2940a28eabb09217350fcc6009d0e81a907
 DIST dompatch216_linux_ppc.tgz 1982323 SHA256 224e1cd46d8078798f185ca956a137fdf3b76b339f49cc5b2f3304d553ea0ad9 SHA512 6b1ff8b5a041c42193b8f369ee0ff242048fd589ffd9b610628a7bf7a0d159fe6e590b04b914ecbf3b94ef2b94a66a062be84d595777127d8f11311fa92c3ae9 WHIRLPOOL 8f2f35576026a7e88b90c912ee60cd2e39ffbfb7db228b0c5589d58f9988b3e9dfbc96551822649a03cbabf8efd7ff9697dfceb4f5ed8818a2bc07b6c318165c
 DIST dompatch216_linux_x86.tgz 1892714 SHA256 19efb6b3db9fdfdf752ac53dd4352df990b95f84a37cfc61f729ce77ae142dc1 SHA512 9bb2a024235585181f91d8414c07ce8c490fed5ddab9d25817b7ea01618f0f2cf8714fb39a4406abe88e25b354f14ba1ef2db79c39d4c30b4e399d1b60477c2d WHIRLPOOL 8fcdcc98e43d8392dd38b6bb1300a08eeff4782dd567d47b5471d4363a492b1eb90d6f3c589a8a768100df92d820da8cd3d9d1360cfebc671268663bf232a27b
 DIST manual_addenda.pdf 192454 SHA256 ecbed702d1dae4ef2a08a33d03fb4b92aec8cd39df48ac085ed2748dcd159ab4 SHA512 ec582e9685edf7164ba8e7c6c99880b30c8a6737d2d339eec2642196abd175857bfef2e1ea3da3ccb0110d441c477c8fad64d47fbb8b1aa39b405484eb548443 WHIRLPOOL de3a675380ab67329cb94b8d0c9669c57a855bf3f36f04dcd6d3c7b596dcef0c79f5943ffd9c8aaf3b83bc729368f0d463059934d720a216962a0f6770cf2424
-EBUILD dominions2-2.16.ebuild 2916 SHA256 bccd19720f8f8285ec7c9390d61ab2be196012712afdb322303acb25c151ad43 SHA512 be4f50d85f58357c71b71d04b9a4893aac3fa718e60f5de2c479a8fa4335d962dd3f2eb2966a16836a6ceb20c9023368fe63f30baf0a7dad7c37aeba96ca9294 WHIRLPOOL bd0f32f914799abc1746a1131d9baae1ad6c4b644b2982ae6c42edcd0834bfb1ad2a532e37c565edbaa117d275277df5bf6b258e001e588a1828b8cfb5817bc4
-MISC ChangeLog 1713 SHA256 4d677ac4393f720d8a9f16af46accb2fbfb5e23cfced96d9135b398bd002529d SHA512 1925c0281f213b6732d0d1520cbf9ddefe54a3895a33bf3eb40c9b3c45d84d52532aa444bff6bc5b351fb3a6bdeb71597d601ba63f3227e6c28930d7a3abce0a WHIRLPOOL 4170586bd9bd20703a61138aeea14f6b024730837d8d37f2a359d3b0b668415774a60e1f1d2943a8b0bf9a923dc6e40298dbadd01aac650ff9ec0f3a20345c13
+EBUILD dominions2-2.16.ebuild 2969 SHA256 427f3e2b01c3d443993011978c6a7f702fe083fd9f927f253724bd324aaa414e SHA512 1c21a6b0c6600a7c5f9c55bb3bd66214bf30706f28b0bda7470bbaf74293d45fdbfc1efdbb5b6143fe2f7c1ec0b478e3f37d82205d9c85a632fe5689b7861d17 WHIRLPOOL 52cb72971632cf5c43156a550cb919e14d7086cc000c4cdf487578a51628a668c660f600922472b6b58d4d08f8fe1ef6419cb76c914def1c04facecea432da35
+MISC ChangeLog 1845 SHA256 8d7581bdf85a046b44198fbccf438b3b3a5471d5ba5189941bcf4f3497f913b5 SHA512 589799084d6ab35cdb092d6c8c0cab2b2d1970307be52d6e061d81b8d3e478a2e4038fb88e2300bd62ff7529d927281228b318feedc11aaaf4e9cb377e1c2b1e WHIRLPOOL 8c9918d21d5447be35c11d23a68ccfe08ab5588d2b5448f06d757aaca4f2d87bfd2f224c743e3d7471e095418bb1ca2e27cb3fca014a0e6458b6068adb20bf55
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTZomdAAoJEJQzkH1pP7W4tGIL/2vZ/exkcJ2RZEeXG7XiSQo0
-PXJzApP7XPP+ZnryywYqXUxJ0BShIkzz3otGMoH0iXY7ZRGxjXd3d+zREUZR0yNk
-DW2fK9wt3QdqkKrKmm7bdtUoSEx01gSjr+3oLkyj6mfISGWx0XqhbQGn2gofASVo
-GpqA1/TaSpJZUJXOmX2THi02bYyGWc02656/vFeDcbyQ2qugITrC3UnDbvdtZszp
-2c0nyEbv4LvytUafXY10gMmoLRNqtrR97Zm/0IuDeLeF/mExbi7LHPPBkEoetvSt
-yRCW6dit8WEM27SyuzPtRa2fG3cH3Y/zFpb7nqpEuiOtF8agyE4U6A0t1jTx7qmn
-vyhPT/RYr2f3hjzdO6RQN5Smetzd1YcZrs2N3Z8NtvO4gZRsEnOkoN+DOC4rMK+U
-wReNIyLHy3TVfH9EWaaLM61NjSMfgfCFs7W1kT7LL9MgfbyCP886Op0oAthVPflh
-w5/02bjea8MOE008OnGpfYodc0EEmPQ5QEPTSnJ0rw==
-=aEka
+iQJ8BAEBCABmBQJUO/w9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8EwQAKfeE6vllWsvPGGNZ2e13gl+
++tg+bSDicQh0yRORPGsERigt678YbV6ceoV8dNPwx6a3ekSQ2robQ5NkPGwldJRP
+IRj5j9DVTLwAxB1kUhfdnKiu1O+8uOeRFnDgbUCV7vq7wdWy4clPKAKAEoiV3zde
+sc8jK6LKmMSiRR/Ua8henPAVT+uPmIjvuTiKeGEVS5DgfWZWAetJ44H2wf6sJGgg
+gCzWwdWK3mNRqSlax3Kw9SljTJtgObqT+EdB69n3bJNkgS/YQUfvPm084i76aIEf
+W+ozwnvP4DcdYb9WWb/knLuMmcpFmIAvQiNkud1hx74XItHVXpUc1L0Or8PdZPeV
+17BmtjkcJBqsjlPruB0VfmkafDlvvKgpKyLdX6e4LC/YcD0i2fbupY2gXvhtlEmp
+7nz8F7mBCpfdU1LyvkJ5iy4j+n9+qr8ImX7WPiXgMaG39IG0EhF1va14vmDSbEky
+KPtz8xqSIoqjWNPOp+88tfSMHmv7kNt4V9NC5hsTRT9OmZeUFbhsxqOD5ENvl+JD
+Hh5Ktym2xPG0QBzSO5KwMNS54YuQWNVoU+hkNbtXGOZOa7zAGPdvfjvgOg7LGBvI
+f4fLxKFi8Uxi6tUeA7vkBtkJtyKMTL8NwXSGR3tzUJtZqqq1Ovp26A2hV1SjCJ/O
+1qyHEtc26KsDC6mDYZhN
+=fuh8
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index dbbebfec1ea1..16c18a500e28 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16.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/dominions2/dominions2-2.16.ebuild,v 1.11 2014/05/04 18:40:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.12 2014/10/13 16:22:19 mgorny Exp $
+
+EAPI=5
 
 inherit eutils cdrom games
 
@@ -24,12 +26,24 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 RESTRICT="bindist strip"
 
-DEPEND="virtual/opengl
-	virtual/glu
-	x86? ( media-libs/libsdl )
-	ppc? ( media-libs/libsdl )
-	amd64? ( app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-sdl )"
+DEPEND="
+	|| (
+		ppc? (
+			media-libs/libsdl
+			virtual/opengl
+			virtual/glu
+		)
+		!ppc? (
+			media-libs/libsdl[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+			virtual/glu[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(-)]
+		)
+	)"
 RDEPEND="${DEPEND}"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
@@ -54,23 +68,22 @@ src_install() {
 	exeinto "${dir}"
 	if use amd64 || use x86
 	then
-		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2*
 	elif use ppc
 	then
-		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2*
 	fi
 	insinto "${dir}"
-	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/* || \
-		die "doins failed"
-	dodoc "${CDROM_ROOT}"/doc/* || die "dodoc failed"
+	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/*
+	dodoc "${CDROM_ROOT}"/doc/*
 
 	# applying the official patches just means overwriting some important
 	# files with their more recent versions:
 	einfo "Applying patch for version ${PV}..."
-	dodoc "${S}"/patch/doc/* || die "dodoc failed"
-	doexe "${S}"/patch/dom2 || die "doexe failed"
+	dodoc "${S}"/patch/doc/*
+	doexe "${S}"/patch/dom2
 	rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die "rm failed"
-	doins -r "${S}"/patch/* || die "doins failed"
+	doins -r "${S}"/patch/*
 
 	if use doc; then
 		elog ""