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

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

4 files changed, 51 insertions, 33 deletions

diff --git a/games-rpg/sacred-gold/ChangeLog b/games-rpg/sacred-gold/ChangeLog
index ee5ae2f1e9ed..ea3606bcae01 100644
--- a/games-rpg/sacred-gold/ChangeLog
+++ b/games-rpg/sacred-gold/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/sacred-gold
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/ChangeLog,v 1.6 2014/04/16 17:08:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/ChangeLog,v 1.7 2014/10/15 08:28:29 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> sacred-gold-1.0.01.ebuild,
+  sacred-gold-1.0.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   16 Apr 2014; Ulrich Müller <ulm@gentoo.org> sacred-gold-1.0.ebuild,
   sacred-gold-1.0.01.ebuild:
@@ -26,4 +30,3 @@
 
   29 Jul 2009; Denis Dupeyron <calchan@gentoo.org> +sacred-gold-1.0.ebuild:
   Initial commit. Enjoy.
-
diff --git a/games-rpg/sacred-gold/Manifest b/games-rpg/sacred-gold/Manifest
index f93cb49acd20..25bb70f3833f 100644
--- a/games-rpg/sacred-gold/Manifest
+++ b/games-rpg/sacred-gold/Manifest
@@ -2,21 +2,14 @@
 Hash: SHA256
 
 DIST sacred-1.0-1.0.01-x86.run 1515954 SHA256 6355482463095e2cde2beaa912b5eb36969589a279131951fef3ac0efd1f587d
-EBUILD sacred-gold-1.0.01.ebuild 1556 SHA256 bfb884fbaccf416ac1470179f2c0fe610241cfbf68a12d2e18fdc267eee47773 SHA512 f7b7c17a3b6f4d3b45d62c0e7621c100f1be0a5343660e0e6ed31262e73a1c5754e2bdd4d0958f1472ba7745d6bfe88031c035bdd9f4b499cbfd24a37ca0c849 WHIRLPOOL 1763769fe57b89a62f1eb4eaf29117f424f62a1a2680e82b9aed3f7a204ce18fc6b13a6dd3c1cc1ed1477bf9c413de39e5e5f6506f879ecc52b132602a3522ac
-EBUILD sacred-gold-1.0.ebuild 1229 SHA256 76a76d1b3f75cad89937be7fa7875e76997786f52955d65cddc8db5f51dfc32f SHA512 48d7883b1312a5080f2dee5737dfe575360214143d6ba010dcd5926c667efdd83a0f3ebf2a5d66eeade8d3d436f872c47b35c83a05212c86fdbedebd73347c9b WHIRLPOOL eee20f37915dc09cdb960ac9c33748eb7372294c9c3e7d4ac5ff26681f59688defa7fc0122e21e3a718a6ecd1f277ed3c9312b844b2d9b687755756e46e5d480
-MISC ChangeLog 1028 SHA256 1b9d3ebd4941d925c331d6e2048f23152ed2e6cc16c6014791ac12d1a2e9300f SHA512 dd511a3f1c4f5a91f6c1466c16d1831e7a5f7962dd1ebc7f2df0f3e81bb8f20b0ceefb05ca4f97679490c20eec6975e7145c531e07191e127efc267de3f85a14 WHIRLPOOL 6ab83923d5c00724bcbeb91adec53a6424261d5c0b424aeff488f40d78d93aed35872b31a827216b74bf0c6aae831e5f2aeea64f1c04fddf0831ea36707cf5e9
+EBUILD sacred-gold-1.0.01.ebuild 1719 SHA256 6f13f65c5db278e887cfdc864c2c3bbaef32adb92d48a5dde69c969fd5848aad SHA512 7defc42f46f27a20633767dab0e9d0203404cc9eb4a0579818ad57c4e59ffbc4f010525f331e038645ae6154046376c178af0eef5f1a518096b5d055baea7c41 WHIRLPOOL c6f3112d88a55a3724c143f5a557a01a358161e4673fee8fe02f46a7940525b44ee80af92d0707d4e7e4e71f43f8fdf73eb319a6215e40757c8dc891f1174126
+EBUILD sacred-gold-1.0.ebuild 1386 SHA256 f6baf7ad175c3c1974b11b4e6343f7245958f85f8094921f7363e373df9f5c5f SHA512 4af2f6381050f14b9aa274551c1d31a6b85daa4cafcadc44bac87487c96c58cd6074673223a3b7ef9663e056c722c713f9faf38c4e4e51b4a316e24c22671521 WHIRLPOOL 92e35ace96f41e98d6cb56897518420a7f37ab0e94a738e3130611eab443bfed7af5a40e9a94561fa0a7d0e3e850934cd4154f2e006a3039097e01bd5a1d64da
+MISC ChangeLog 1184 SHA256 d69a6f8087971c3f80d30b8c5b641df6be03d6ecb5dbc22cce2c63594aa715fa SHA512 3646b9ffa8ed8c9eb6d9b88afeb44dde941f6a2fbaf548c7dd9e1551bf592ac33f48f91b9d57b1118ce3c19f7e96aa03e19178ced5b969f138a19e2dffd8cc45 WHIRLPOOL a6edb1b16fe0ca483162519c99ee1d6b8566fa794b79e6ce4a78f2b940442fbfe3d80b6f94ff4cdc41161d8eaf5fba196830d67baef61f3fb2346fcd5460fff1
 MISC metadata.xml 251 SHA256 0b118075eddfc9415e146feff0c47824812fd35541e331d54e5443f7a4e27eb4 SHA512 f07ab19251bd2a732ac9816d3615ccdecc192f585302ac31c45edf878750ff5d077701d892c8077ecf5af2eb4574e24cf056d9613187e4e5c7b44388ad4bcdd8 WHIRLPOOL 3dbaa0d26e21e8440766025d8f2107085813b06dc2832a5ea931ab288baa101c605b226388487b8c41af210d18b60e2a35e7343d291908c82e4cda4f3239a096
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTTrj6AAoJEJQzkH1pP7W4WA8L+weRlAAMhO2ZW9vZvDbcdseD
-YTaT7oCcK/S6d5/J5x5oFIUPgFcZG076cNtkmTHeFo7/ddXyrEMhQXcrk5OzngL6
-GM0dyGj7aUrYrZgZ6M1hQwRYS7o+vNTOhPQpQuRQSHagIvrGMpzWVyHcwyXzFzPX
-kuEdnihtiirgk4IC9R+sI5fdsTuvniI79Em56pie3oqreyf1ah/VhKefdMA8NRx6
-16Uk331Vxu3PxWk+2TwafmN2kh/oAEkmXMgswbVRffPYGMymqklYWKCAviHHrCWh
-FtQgFE4HUvoYPQzmcgj9P/VD50lyqWts5HH+IJ1pCcuQ1pMrkPmwzJO9zisEWFJ0
-x5UZFCpj1sXEyDlbMD75rYUkRl3Fuv37g0q6Y7tork4Waag894XJN5p8ivjFl0y5
-4gYois5sgKxytHKlWHxxu8QXsEAd3o8yCuWC2BvTXL5LDVRD13EcCothRp64+5Rw
-Ei0uH+an4iEiq3jxjgNMURMdS71G7N7gE0DNT2lSkw==
-=awOa
+iEYEAREIAAYFAlQ+MC4ACgkQCaWpQKGI+9RSlQCeKvWixF3FkmdKf6WDL/GFWlfw
+ipEAn1YgB7V5pN4dKkAF7Jbnn549XdEh
+=f6dr
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
index 93d9d0f9dba5..a2f2165bd204 100644
--- a/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
+++ b/games-rpg/sacred-gold/sacred-gold-1.0.01.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-rpg/sacred-gold/sacred-gold-1.0.01.ebuild,v 1.4 2014/04/16 17:08:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild,v 1.5 2014/10/15 08:28:29 pacho Exp $
+
+EAPI=5
 
 inherit versionator eutils cdrom unpacker games
 
@@ -17,11 +19,20 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
-RDEPEND="virtual/opengl
-	x86? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+RDEPEND="
+	|| (
+		(
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 DEPEND=""
 
 S=${WORKDIR}
@@ -35,12 +46,12 @@ src_unpack() {
 	cp -f "${CDROM_ROOT}"/README* . || die
 	cp -f "${CDROM_ROOT}"/manual.pdf . || die
 
-	mkdir -p patch
-	cd patch
+	mkdir -p "patch"
+	cd "patch"
 	unpack_makeself ${MY_P}-x86.run
 	bin/Linux/x86/loki_patch patch.dat "${S}" || die "loki_patch failed"
 	cd "${S}"
-	rm -rf patch
+	rm -rf "patch"
 
 	mv lib/lib{1,2}/* lib
 	rmdir lib/lib{1,2}
@@ -53,7 +64,7 @@ src_install() {
 	mv * "${D}/${dir}" || die
 
 	games_make_wrapper ${PN} ./sacred "${dir}" "${dir}"/lib
-	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm || die
+	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Sacred - Gold" ${PN}
 
 	prepgamesdirs
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
index 2d9d9a32fcc5..09820c586c29 100644
--- a/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
+++ b/games-rpg/sacred-gold/sacred-gold-1.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-rpg/sacred-gold/sacred-gold-1.0.ebuild,v 1.3 2014/04/16 17:08:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/sacred-gold/sacred-gold-1.0.ebuild,v 1.4 2014/10/15 08:28:29 pacho Exp $
+
+EAPI=5
 
 inherit eutils cdrom games
 
@@ -14,11 +16,20 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist strip"
 
-RDEPEND="virtual/opengl
-	x86? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+RDEPEND="
+	|| (
+		(
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 DEPEND=""
 
 S=${WORKDIR}
@@ -42,7 +53,7 @@ src_install() {
 	mv * "${D}/${dir}" || die
 
 	games_make_wrapper ${PN} ./sacred "${dir}" "${dir}"/lib
-	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm || die
+	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Sacred - Gold" ${PN}
 
 	prepgamesdirs