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, 53 insertions, 45 deletions

diff --git a/games-action/rune/ChangeLog b/games-action/rune/ChangeLog
index 09e223f2db39..3e1f924315c1 100644
--- a/games-action/rune/ChangeLog
+++ b/games-action/rune/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/rune
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.21 2014/09/07 09:14:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.22 2014/10/13 10:36:57 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgorny@gentoo.org> rune-1.07-r2.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org> rune-1.07-r2.ebuild:
   QA: Remove unnecessary dependency on emul-linux-x86-compat, bug 522152.
@@ -84,4 +87,3 @@
   +rune-1.07.ebuild:
   Initial import. Original ebuild by Patrick Zimmermann <patrick@zakweb.de>
   and modified by me. Closing bug #41732.
-
diff --git a/games-action/rune/Manifest b/games-action/rune/Manifest
index 5458ffc4a547..7c56c65d1e53 100644
--- a/games-action/rune/Manifest
+++ b/games-action/rune/Manifest
@@ -2,20 +2,25 @@
 Hash: SHA256
 
 DIST rune-all-0.2.tar.bz2 6507237 SHA256 432a21d03e3728000c484eec9a5f2a27837c58265d89bf3674716354dbed1632 SHA512 5c86306c84a6b606e13c3b1eebf676479cfe8d1112a2c5b31d6332fc7305fea74485d9a4b89286db38b968f473a40d7b5e500c17aaa8b2010edb17cc95b1695b WHIRLPOOL 75a357df7c4c231e060973fb3816782b0dcbceedc6dc18f2e35ae115e79dcd9fe74eec04e74fdf1772c695161cb63d39d27e146a554ca7473e8f88755c1d6919
-EBUILD rune-1.07-r2.ebuild 4403 SHA256 7c0574c08524244ca9f2854edbb993ca3bcb86787b11ab460f0cad4d9e0ec09f SHA512 c31d9738b26d47a16213f3091ffa406aa32abc653fe4e80291a3d5054fa644e92b6616ea1ce62090642f9506b02070c16d45ad2c4dc70b7d77934e937a44229e WHIRLPOOL 49b6ee49ba5d249ac334b05e42a07bccb0ff099af492bebe2750d35cf8ee863bd5a8018061ab774ea554db42d71736e12a69beca63ac57d65db0234d752b9b87
-MISC ChangeLog 3742 SHA256 4dd48efc67f8c775bd3a8ccd6f7686ee27921b9dc1a381a9647d0bc753d28750 SHA512 a4e94351068833863bea2069476a6581cf917ba78d903b26d05884a5ca1dc93af1903cfa7f84c48045bc40efacbce29f443e544d797f568475eaa834d99a0ec9 WHIRLPOOL 79ab65d9a7e9ae9ad2521728addf2933d9461956276ec9d9780aa36c1e4db3449ac62db89009a88e528468272fdc5e5f01e9b7b90504f1f4887e5fd09bf900d5
+EBUILD rune-1.07-r2.ebuild 3965 SHA256 37b9a747bc831b040f9703f2a8d7252dab32368f0ba1c50eb7735646a54c0ea3 SHA512 d46fc08564cb2e867cd7af45ab0641bb466a704b6ecc5979a46333affcbad4787ddc5a33814b8fd2aa0171afa14211c5382b9c854b7a7628375dea0a59f47adc WHIRLPOOL 8f731054c3e68b78ad780bb686f0cdab6320651f58bf909cb3ea25dbdffc17e069a63272049178fc7e8f0f9c69e524ea932afb270f81ffe64e12fc7608b61f14
+MISC ChangeLog 3871 SHA256 fe1dcb8e5ee899ac80486a282ff7d265f9447d979480b08f127bc0d9c871fdb2 SHA512 9505d9e15b29ea602ae40a15c15d6ca9e3654300a7f0c2cd54fa552b35340398f4c4a93c6493db952edc5926e5fe95d18d58d9736991b55b012a18dc1cc5df00 WHIRLPOOL c8b7866f1dbe0de577dc796b9c65e91f5d65ed3e98ed43eefe834e6a5c000fa524f97bba0e9ffa5f690f008ee8ce3927902e16835774232ea688d58e5f3a6048
 MISC metadata.xml 2027 SHA256 73f8e1917e8b3e9812e9ef971a432eec472ac15e246929df9b7821a2158b4390 SHA512 1ed781634cd323c4c398f9788df16db5ce5e073b34f6f8a58dde86557d7e1e42c7876efb4304d57e154f44682ebcf4952e3614a958a15dbd7758d8805d38ba10 WHIRLPOOL c9f6a8fc400654f56211967acb9a7ac249fc04a4359baf82198530918f4895195267d74d0dfd444e62f69d0939decc70e9cb6a24abca793b0b7653391bad29b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUDCIbAAoJEJQzkH1pP7W4dmEL/2JJufIuZ45ximwipdFQ01MP
-azNa393df+uDudlUDhLD+yHWzipU1aZH73V4Cb++QiaE0ULi6NWpWh4GJNd9diQf
-/XGUqoChbd7RGMb05WJw3rOQYT2pIWgoNpBlWH4Ry0HXPt7piLhM5hlj1Fia8oh9
-l5VUWjk+Bap6s5J9HNPc6enbPDrKglZ9nkebwJpiMdQqoQsLID1WHGj2CAm89fPl
-wYEnfTgz9cWLwII4QtObpj9ADbWgkSp6nNlBm7NgsSK8VXAOXbegHDVXI8b5CiZM
-vNLEi24TWRs/bl5EUqOgNbWNQNA4sWDVidQCQYVNSf8+KiMDYrGc+QDbMZAtaPi/
-k/iB2ESNw5zqMoUaAXPlzhtgxNArFnTveeWMQKVctUlhaXF7DxLoaO53z2nL6+w9
-3iFTGQR1t4toGLt6/VEdY4gxSf12Y25URHzxQ7zFxoIXzHhFcr/iXpr6Mlwco4iu
-Pkxf3kVmuqgHGGPYNmC8JLSpqSUwLBZf9Jil5Z1Q6Q==
-=VoMP
+iQJ8BAEBCABmBQJUO6tKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrnwP/Av+JA0+LqMYyA5drE63ym2v
+mtl+vWXExBerEnkTdwADu2DdK9ai6KMC+JEpZK2IGMC3sIeKJ6u7IyPHSKDSaKRQ
+fZiVMD8qCHkyHL4+vTyEpIyGBvwnKZHCcYTS6rwqkSEK4DfSJNv3AzcSCS6XSMBF
+pnmeiHL47yjQzOfMmVu6Zr4RoKDMR1HaG7yfwfKg79jXpVZVGruDhPSapCPplTYV
+e00PZhHKFfUOUQAHk21fIN3EwDaKzyTdd5yOH87GxdvSxjIZF4Hj/3DxdM1V4xC7
+ZR5Gtuc3u40VrTiTEBvcz79rDREu3EWPXkttBo09QH21rJtPi3msQP8YxlWwXUMv
+OmOZz38TIs2HngzrFzZ3jiJ71Z/alLXxGkW+DJPWZjsEZg0P27SQx7+YPSkg2ZR9
+uuorZ4xaYRDyrmi6va2FK9I3UlIg0i+tP8SIvjKROctn6uqbdSpDQxs23h+5X1hr
+hnYGp0evT7Q+89zUdvI8XLopu+4XRyRYbfs2lFeD2hgNJ75Y6M9vVbiFbBIx8pFc
+z5ki2/vLySLLQKR+Y/rRcx+WSVZJJ08Q+zLH3rIaG1flKsi+tla+X71256Q3o1Gx
+a0p9s6wIRrep+nQ0971039FpAWcvudAUdxRugMBXCBG8o0q1YW20g6Dz7bjQ9GlS
+ZjmR3taFqmnxIKsV+GFx
+=lDv+
 -----END PGP SIGNATURE-----
diff --git a/games-action/rune/rune-1.07-r2.ebuild b/games-action/rune/rune-1.07-r2.ebuild
index 4604bdc48621..471a4414e451 100644
--- a/games-action/rune/rune-1.07-r2.ebuild
+++ b/games-action/rune/rune-1.07-r2.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-action/rune/rune-1.07-r2.ebuild,v 1.12 2014/09/07 09:14:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild,v 1.13 2014/10/13 10:36:57 mgorny Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils cdrom games
 
 DESCRIPTION="Viking hack and slay game"
@@ -15,15 +15,20 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="strip"
 
-RDEPEND="virtual/opengl
-		dev-util/xdelta:0
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=media-libs/libsdl-1.2.9-r1 )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-sdl )"
+RDEPEND="dev-util/xdelta:0
+	|| (
+		(
+			>=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			virtual/opengl[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(-)]
+		)
+	)"
 
 DEPEND=""
 
@@ -43,7 +48,7 @@ src_unpack() {
 	elif [[ ${CDROM_SET} -eq 1 ]]
 	then
 		# unpack the runelinuxfiles.tar.gz
-		unpack ${A} || die "Could not unpack rune-all-0.1.tar.bz2"
+		unpack ${A}
 	fi
 }
 
@@ -56,28 +61,25 @@ src_install() {
 	0)
 		for x in Help Maps Meshes Sounds System Textures Web
 		do
-			doins -r $x || die "copying $x"
+			doins -r $x
 		done
 
 		# copy linux specific files
-		doins -r "${CDROM_ROOT}"/System \
-			|| die "Could not copy Linux specific files"
+		doins -r "${CDROM_ROOT}"/System
 
 		# the most important things: rune and ucc :)
-		doexe "${CDROM_ROOT}"/bin/x86/rune \
-			|| die "Could not install rune executable"
-		fperms 750 "${dir}"/System/{ucc{,-bin},rune-bin} \
-			|| die "Could not make executables executable"
+		doexe "${CDROM_ROOT}"/bin/x86/rune
+		fperms 750 "${dir}"/System/{ucc{,-bin},rune-bin}
 
 		# installing documentation/icon
-		dodoc "${CDROM_ROOT}"/{README,CREDITS} || die "Could not dodoc README.linux"
-		newicon "${CDROM_ROOT}"/icon.xpm rune.xpm || die "Could not copy pixmap"
+		dodoc "${CDROM_ROOT}"/{README,CREDITS}
+		newicon "${CDROM_ROOT}"/icon.xpm rune.xpm
 	;;
 	1)
 		# copying Maps Sounds and Web
 		for x in Maps Sounds Web
 		do
-			doins -r "${CDROM_ROOT}"/$x || die "copying $x"
+			doins -r "${CDROM_ROOT}"/$x
 		done
 
 		# copying the texture files
@@ -89,21 +91,21 @@ src_install() {
 				|| die "modifying and copying $x"
 		done
 
-		doins -r "${S}"/System || die "Could not copy Linux specific files"
-		doins -r "${S}"/Help || die "Could not copy Help data"
+		doins -r "${S}"/System
+		doins -r "${S}"/Help
 		sed -e "s:.*\(\w+/\w+\)\w:\1:"
 		for x in $(ls "${S}"/patch/{System,Maps,Meshes} |sed -e \
 			"s:.*/\([^/]\+/[^/]\+\).patch$:\1:")
 		do
 			xdelta patch "${S}"/patch/${x}.patch "${CDROM_ROOT}"/${x} "${S}"/patch/${x}
-			doins "${S}"/patch/${x} || die "Could not copy Patch data"
+			doins "${S}"/patch/${x}
 		done
 
 		insinto "${dir}"/System
 
 		# copying system files from the Windows CD
 		for x in "${CDROM_ROOT}"/System/*.{int,u,url}; do
-			doins $x || die "copying $x"
+			doins $x
 		done
 
 		# modify the files
@@ -120,13 +122,12 @@ src_install() {
 		rm "${Ddir}"/System/{Setup.int,SGLDrv.int,MeTaLDrv.int,Manifest.int,D3DDrv.int,Galaxy.int,SoftDrv.int,WinDrv.int,Window.int} || die "Could not delete not needed System files"
 
 		# the most important things: rune and ucc :)
-		doexe "${S}"/bin/x86/rune || die "Could not install rune executable"
-		fperms 750 "${dir}"/System/{ucc,ucc-bin,rune-bin} \
-			|| die "Could not make executables executable"
+		doexe "${S}"/bin/x86/rune
+		fperms 750 "${dir}"/System/{ucc,ucc-bin,rune-bin}
 
 		# installing documentation/icon
-		dodoc "${S}"/{README,CREDITS} || die "Could not dodoc README.linux"
-		doicon "${S}"/rune.xpm rune.xpm || die "Could not copy pixmap"
+		dodoc "${S}"/{README,CREDITS}
+		doicon "${S}"/rune.xpm rune.xpm
 	;;
 	esac