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

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 46 insertions, 26 deletions

diff --git a/games-rpg/rain-slick/ChangeLog b/games-rpg/rain-slick/ChangeLog
index d8aab4a157d8..f71875ec1550 100644
--- a/games-rpg/rain-slick/ChangeLog
+++ b/games-rpg/rain-slick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/rain-slick
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/ChangeLog,v 1.14 2013/04/27 17:26:33 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/ChangeLog,v 1.15 2014/10/15 08:39:11 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> rain-slick-1.5.ebuild,
+  rain-slick-2.3.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   27 Apr 2013; Ulrich Müller <ulm@gentoo.org> rain-slick-1.5.ebuild,
   rain-slick-2.3.ebuild:
diff --git a/games-rpg/rain-slick/rain-slick-1.5.ebuild b/games-rpg/rain-slick/rain-slick-1.5.ebuild
index 199574fec98d..2ebf806b3823 100644
--- a/games-rpg/rain-slick/rain-slick-1.5.ebuild
+++ b/games-rpg/rain-slick/rain-slick-1.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/rain-slick-1.5.ebuild,v 1.5 2013/04/27 17:26:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/rain-slick-1.5.ebuild,v 1.6 2014/10/15 08:39:11 pacho Exp $
+
+EAPI=5
 
 inherit eutils games
 
@@ -18,14 +20,20 @@ IUSE=""
 RESTRICT="bindist mirror strip"
 
 RDEPEND="sys-libs/glibc
-	virtual/opengl
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXext
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs
-	)"
+	|| (
+		(
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXrandr[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}/rainslickep${EP}
 
@@ -33,8 +41,8 @@ src_install() {
 	local dir="${GAMES_PREFIX_OPT}/${PN}/ep${EP}"
 	dodir "${dir}"
 	cp -pPR * "${D}/${dir}/" || die
-	games_make_wrapper RainSlickEp${EP} "${dir}/RainSlickEp${EP}" || die
-	newicon rainslick.png ${PN}-${EP}.png || die
+	games_make_wrapper RainSlickEp${EP} "${dir}/RainSlickEp${EP}"
+	newicon rainslick.png ${PN}-${EP}.png
 	make_desktop_entry RainSlickEp${EP} "Rain-Slick Precipice of Darkness (Ep${EP})" ${PN}-${EP}
 	prepgamesdirs
 }
diff --git a/games-rpg/rain-slick/rain-slick-2.3.ebuild b/games-rpg/rain-slick/rain-slick-2.3.ebuild
index 9e247123a1bc..3834a91c98fb 100644
--- a/games-rpg/rain-slick/rain-slick-2.3.ebuild
+++ b/games-rpg/rain-slick/rain-slick-2.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/rain-slick-2.3.ebuild,v 1.7 2013/04/27 17:26:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/rain-slick/rain-slick-2.3.ebuild,v 1.8 2014/10/15 08:39:11 pacho Exp $
+
+EAPI=5
 
 inherit eutils games
 
@@ -18,14 +20,20 @@ IUSE=""
 RESTRICT="bindist mirror strip"
 
 RDEPEND="sys-libs/glibc
-	virtual/opengl
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXext
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs
-	)"
+	|| (
+		(
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXrandr[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=""
 
 dir="${GAMES_PREFIX_OPT}/${PN}/ep${EP}"
 QA_PREBUILT="${dir:1}/RainSlickEp2_bin
@@ -36,8 +44,8 @@ S=${WORKDIR}/RainSlickEp${EP}
 src_install() {
 	dodir "${dir}"
 	cp -pPR * "${D}/${dir}/" || die
-	games_make_wrapper RainSlickEp${EP} "${dir}/RainSlickEp${EP}" || die
-	newicon rainslick.png ${PN}-${EP}.png || die
+	games_make_wrapper RainSlickEp${EP} "${dir}/RainSlickEp${EP}"
+	newicon rainslick.png ${PN}-${EP}.png
 	make_desktop_entry RainSlickEp${EP} "Rain-Slick Precipice of Darkness (Ep${EP})" ${PN}-${EP}
 	prepgamesdirs
 }