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

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

3 files changed, 35 insertions, 30 deletions

diff --git a/games-rpg/nwmouse/ChangeLog b/games-rpg/nwmouse/ChangeLog
index e72a9e5ba2c9..1f29765ef9ac 100644
--- a/games-rpg/nwmouse/ChangeLog
+++ b/games-rpg/nwmouse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/nwmouse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwmouse/ChangeLog,v 1.14 2014/05/25 11:21:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwmouse/ChangeLog,v 1.15 2014/10/15 10:01:31 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> nwmouse-20090906.183839.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   25 May 2014; Ulrich Müller <ulm@gentoo.org> nwmouse-20090906.183839.ebuild:
   Fix LICENSE, bug 505732.
@@ -55,4 +58,3 @@
   26 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +nwmouse-0.1.ebuild:
   Initial import.  Ebuild by me.  Closing bug #109619.
-
diff --git a/games-rpg/nwmouse/Manifest b/games-rpg/nwmouse/Manifest
index 4e7810566fbe..0d5d5691e182 100644
--- a/games-rpg/nwmouse/Manifest
+++ b/games-rpg/nwmouse/Manifest
@@ -2,20 +2,13 @@
 Hash: SHA256
 
 DIST nwmouse-20090906.183839.tar.bz2 86611 SHA256 a0f0f5b897a1281d4c2a2e416404aa9387ad5b69dcd0445393ca8f341b5b4d88 SHA512 a9e9cd31e572ce3722bdd30002616600b7c36931001b7dbae7ee9b0dca5f6fd57e8771d31e70f0f3ea28e454f43fbe2a490d54409de4b24762a8802a286ddbbf WHIRLPOOL b2d5d0321b7167c52842e137650c2feaced477df8d4e40e2e9d21d94566dc98d058d2a56f34dea5ced5dc582fdbe3df196bb7a0c3151b7c54f9eeb6561d4e21e
-EBUILD nwmouse-20090906.183839.ebuild 1816 SHA256 e2624fbb9103af0eda6fd6d976031baa8e9927b6ba1bff77c079697c8f29be7c SHA512 af5a4f7f414c9f57077bfba0bc60eccc91b60629e256f5b9f8db0e6949af647fd6a427e21e08052c94b19c4b83941753b8c222bf3bc674ca431979c1456cbf2d WHIRLPOOL af5788662940903837e1b583123a3f25fe95517fa2c9fee020613bbc679cb4effe3557734046c3273fd4dcc96fab8733a4516532dd8c488eee7177996f369ff0
-MISC ChangeLog 2042 SHA256 22c9b30280dbf9b3237ef053266501602fa6e6721ab55ebeb43423c6700ea871 SHA512 413b57701c51bacc9d76c65e8c7101fa7418db1d5a9fe9c76089c19346f0c8f11f2ebeb833cbd53f1a262e00578dbeb3a6bbd3af8e84bf25351be313a6c2563f WHIRLPOOL 6e158280364f84981b036b69bd3c2be6b1646ae9ea48dd313dfd2889d5d3281ef8c9af3411fd6680892cf0e0cdb9b2d908f0ff6f1fa6db2b0a2ed7b08f9a1454
+EBUILD nwmouse-20090906.183839.ebuild 1957 SHA256 0f70144b1905e456d2ef4d1f8234cb9a803892a40a8da8ebba49a0d323a60742 SHA512 34a7617b21d04e3e5378b5a05fa8e0cb8e8cf6f4ecf1d1cddea57e00b38a04663a2bccd84c9d320505366de8356b53c9b51ee67ba65d6636c04aa11b38fdd019 WHIRLPOOL 191107c85c9bfd9a99757ed33ac7f22c7b705dc5478f4de7a65251cf83eb85fb68d34c44058db0000d1234450020b5687a7a2333019609101a9fdc0548092827
+MISC ChangeLog 2177 SHA256 e795dd757faea8d8864edd4fc5bddda92010716cdfea27e8bbe99ee9a7034ba9 SHA512 b2769e6f633468913bdcaaa8615d6ee12546fc7ac46bd39b62a93b7548ed0e9925b062ee9d62206e72b9871f946708e12a580dad5dccb51bd52e189b0a58cf4e WHIRLPOOL 0e6f027fbf48c9b194d5c6b0aa9d742699785ed98e545d38ad3f0362f1ac399ef18a250fcb10b2103cf2a471e8b2cab38be5dcd51e649a0ac164a7c7005ab368
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTgdJ4AAoJEJQzkH1pP7W4wQkL+wSv56BXVjrhg8hm4djurXRx
-nDePrWBt35NFgtZ8s+Jqsvhs+niDOpluYggky728fMA2pAo5RScTgDoEsr/tAP7f
-nMqHEXtl6UmdLIRLssre352shioDPCtKiLQZEVnyO3VLthFwbV8u3hZEXF439jOO
-dMDbxEdxzGOZtNaQ6Mjhz+nQldikANWKqNwIGjBd6Yq8cBJ8KqgjHUCU+oRLQnoX
-GFdrBnQ2iXxnO598Vc/2LTObRPQ02PFY1YrpXXuoGmNqVZJ+G0VM/HmF3DA6vgg8
-LaVrkexqQstpFvwtkTea4AL9o43tMLJt1xy8Xz/E5oEgUwKtr0RXmVkC7lcKtGkb
-OoakSLtpBWYmyI/cR6wsqehmkyK/ykI+G0eVrvQO+6fjBZg3MaRQUOfpxAJV/n8g
-EsvdcvSQNUeQ9k1F6TqaEEUnTHZbG4wqcxwjAf6OstdqYqpymJ637gWUUUbqg6CL
-CNcF69RdTfz9wlJlQ/ZToi6rQH3PxbKU0X9LgF5h5g==
-=q83P
+iEYEAREIAAYFAlQ+RfwACgkQCaWpQKGI+9RzmACdHdVQ3mByRBHmIuHf8m9oT0BD
++/4An2WxSC+fPQcEpCupx+h+XCwF//aY
+=9Ckv
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/nwmouse/nwmouse-20090906.183839.ebuild b/games-rpg/nwmouse/nwmouse-20090906.183839.ebuild
index 2b96655d56e7..d36a2115d1fa 100644
--- a/games-rpg/nwmouse/nwmouse-20090906.183839.ebuild
+++ b/games-rpg/nwmouse/nwmouse-20090906.183839.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/nwmouse/nwmouse-20090906.183839.ebuild,v 1.5 2014/05/25 11:21:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwmouse/nwmouse-20090906.183839.ebuild,v 1.6 2014/10/15 10:01:31 pacho Exp $
+
+EAPI=5
 
 inherit games
 
@@ -15,18 +17,26 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="strip"
 
-RDEPEND="sys-libs/glibc
-	dev-libs/elfutils
-	games-rpg/nwn-data
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-sdl )
+RDEPEND="
 	>=games-rpg/nwn-1.68-r4
-	x86? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libX11
-		media-libs/libsdl )"
+	games-rpg/nwn-data
+	sys-libs/glibc
+	|| (
+		(
+			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
+			>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXcursor[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
+DEPEND=""
 
 # I've looked at this stuff, and I can't find the problem myself, so I'm just
 # removing the warnings.  If someone feels like finding the patch, that would be
@@ -43,11 +53,11 @@ pkg_setup() {
 src_install() {
 	# libelf moved to games-rpg/nwn, see bug #210562
 	exeinto "${dir}"
-	doexe "${PN}.so" || die "Installation failed"
+	doexe "${PN}.so"
 	exeinto "${dir}/${PN}/libdis"
-	doexe "libdisasm.so" || die "Installation failed"
+	doexe "libdisasm.so"
 	insinto "${dir}/${PN}/cursors"
-	doins -r cursors/* || die "Installation failed"
+	doins -r cursors/*
 	prepgamesdirs
 }