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, 32 insertions, 25 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 4e0757368433..1c76f0376210 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-plugins/nspluginwrapper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.28 2012/08/04 09:44:23 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.29 2014/10/15 15:09:20 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> nspluginwrapper-1.4.4-r3.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   04 Aug 2012; Agostino Sarubbo <ago@gentoo.org>
   nspluginwrapper-1.4.4-r3.ebuild:
@@ -330,4 +333,3 @@
   <herbs@gentoo.org>, also had contributions from Ahmed Ammar
   <b33fc0d3@gmail.com> and Matsuu Takuto matsuu@gentoo.org. Closes bug
   #138454.
-
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index 2f5ca2228aa5..bdc13cbf337f 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nspluginwrapper-1.3.0-gdk-native-windows.patch 526 SHA256 b616b16549fb1c61a43504da4b81b14ea2649239ff9ef5e7bfb3c58471f6fd1a SHA512 3e3e0156ff613e52ca62e43dc14f1335dbf99c3409354fd6c0281574cbb90667fbb3abe2c5df38132fddf7ae5e7b1986ffee78ca5c26880fcc8cd7008b2902a0 WHIRLPOOL 9bf00cd8153dc81fbc353cdcc0b599874e5b57c2b321f7e6aa804de8c42c2bfd42b68fd376bbfc5a94bfaeea9a6704712e8c143e954f99122ecfd07430877f76
 AUX nspluginwrapper-1.4.4-compile-on-hardened.patch 604 SHA256 614e9a0f9f3c6632192c08ccd138c6d97b50cc85b48a6b2017e97595faf56534 SHA512 d154a0f16f53e466b0c69771830e0721f32e984a1dd70299b69b5e678ba4e600032a5b40e90fec50c179e111e7e657fce3115e6fd720386d3ec01d4402d2b05d WHIRLPOOL 50f70345ae44c459f703c1aa72b31a2bf793028b02007d8e0989de496b574ab7e988464d9211ceac07d462461557838e16a0344fb10482f3359070ad95aed9c5
@@ -11,18 +11,14 @@ AUX nspluginwrapper-1.4.4-parallel-make.patch 4018 SHA256 f071aafad78e919133e568
 DIST nspluginwrapper-1.4.4.tar.gz 412513 SHA256 f2ed94d42dbbb5370b000a3f30d2b601eb2b09d5742b2842cd0d70e862fab2bb SHA512 41126d98284cae6d25d23233b08ccca0dea841d457d4e41210282c6ab4c0fbf020f2ab4173ce39db8a47a1db20840bcc856f9c7309aa2e6ef2a777e3f2ebf503 WHIRLPOOL 537325919cbba8ce456c30a466f6e2c9fe546da829538afc7807f4201a06ebd7d89f9671b46fac09944a76d8064289530790ccf1ff2b6e5d596b2116447c991e
 EBUILD nspluginwrapper-1.4.4-r1.ebuild 2738 SHA256 fe944f05cfd7d8d18c10065529c7b50b778acfc9a69b1efdfb575b3833b6392e SHA512 684b815cb266659620483cc0226860a1375f791b0ca7d9f68ce137e3d97a97fcfacea1009baa5020d691bc79cdbdf6e8b5c4bbe2b3cca06f2f7ce4926e074807 WHIRLPOOL 2a9e876a4b4f1fa3f2f7df515e9be47463779a3a77db8dd7c967262af688fa4a78f0afe92cce0049079c359fc39d21d324d67e3e179c39d0f60ded501cd1ff6b
 EBUILD nspluginwrapper-1.4.4-r2.ebuild 3033 SHA256 69c3795534b27da6eb6e836f24a973d3b8d3f4d8cd78341971b64ea0491db5ae SHA512 3aa4cea7c6464e6a88216182cc32c3ca4a7f28afdfe4433221f7867965c36e3932ee3fca41a00f23a1a5906aeaab1c7a40304f75ebe24718c6cea34cdd762b88 WHIRLPOOL 4f79c2c968a50eee36fc0ba997b7b7c448ca3486c84edbb8bcc060c4d795e12e6c3978b0cae0c55a8d01d128db51325b243762cc9f1d94891fcdd3082d9054d1
-EBUILD nspluginwrapper-1.4.4-r3.ebuild 3128 SHA256 03f35996c10bc12f5f98adb623c88c0dca4281cdc71305edb8f9017241db7bfb SHA512 81377a64d6ad411230c1b4326c33ccaaa9826668ac67ac7ad01f48b90aac5662cb0252aa42e2c9bb96a8b2a6d78940615ae5cb7dec5f3bcc4b0751e70db9fd65 WHIRLPOOL bc816739ef357fe935e4f16351b1c01dab29202c406631dd2acfb4198143b7881d286b71d7bd4c94f43d417b4930c369156e928e3319b389af91259ae4896b96
+EBUILD nspluginwrapper-1.4.4-r3.ebuild 3274 SHA256 393adf1a5234006defd40943200186271c8d9a64db06a9eadfe5e1905899c849 SHA512 519cd5720ed74182fda8fabf5d231a68b2a3e5adf7a1995fb0563d9df61654266b5ae3644b3138eb67524ea577b617a9352b44a9abd884f15433a66f7238e6b4 WHIRLPOOL f15e1f1f1840246e9f6460d5cfd1d3af07a59b5add80d513e1133f5442e5d99a3ef1bdf76f201c2d5297a636516ccbf1f9cec7eeedd147754ee555f965f7b206
 EBUILD nspluginwrapper-1.4.4.ebuild 2637 SHA256 03912b6aac2b3b5b396a07bae8d5f92df976011127bffd334b1bddb3ee0ec7ae SHA512 351b7915ba154f4d0818bb4526964c208dd9feeed09c3a18174fcbadc7ccb33c04f9881071334728276d638d4a9dd135c5ac5321836eed1a13ddbb9cbb94d14c WHIRLPOOL d0b9103b24012ea739f27893bc5407c0d9f4646cbeaa6813125c5c862f184164ef041204e2b228e3ac4cc8c1aa5990d7474838d27ab5f6d208d681650e9dadd1
-MISC ChangeLog 13213 SHA256 0e7c1bff0f8079032a5be2556ddf453414470d67672c5c5d062bbcde2fa14b1c SHA512 aac22850b42ebaadcd9d6163e58ac367dcc02f77d6b00b8b9926a743763da3515f93d49c0cfcd944b7a233a060d9433bb05d9917e1153921c470c586a9a204af WHIRLPOOL 151b644ed3e1320bcf2472b87e7ca09fbff4692b90c11e41ee0e91f7ec23241eaf337927ebc73c3046112379bb291e1c0a6c64defc6baaccbfe3d3a0dcf7d6d6
+MISC ChangeLog 13349 SHA256 19fef7df7e7a10e3f468a8b3b72da55162bc14717471823b64288e4c22a81be4 SHA512 297b1b726c5650694a27c1a83455e4162b2a2ca5c57ba0b1b3c96b5a0c34e1b7f3964676b88aad15adb8a224e95730d8929a482b6e48c96bb3ada4d42d904666 WHIRLPOOL d05765bf512a6294d7efb65d67bfbf3b49eb224e2cbe638deb2f83bd2c5e4252fdb6d00b40ef89208082ca2c6b0d488e4ba84128de9a3abd9d06549c7e6b2b00
 MISC metadata.xml 253 SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 SHA512 a454fe34c8afc4aa984f3bc85615b147f0801afc470720b86396e4a939a2ce37dfcec55be09252ce115166993835b9aaca049e1988c632c4f3ddd9b4809afaf1 WHIRLPOOL 7465cc1859e31e46e7fb8f724dbad81b55aea98afe3268ed98faa0d35614341b6ebd6bcd778347d3711b17efe37a45c43871fde5e2f6083f4ba76e9a2c4b7432
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCgAGBQJQHO78AAoJEOTDgjZ80txdTVkIAJsbYiaRUWZOzpkPVXuJcIPl
-0DY/xSsjlJiwa8IMSiqa7/WmrvgG5iJNkxK7yVTKt/7i/M0ItZV/5vdkCWVHDWbo
-vtCs7r3xNGr5lJTgIISuEQciI6UQh5kY9+8RMcR8reOkG8upETVqwhKpRFdootGL
-obGE9eoXOGkm3aBonkAZA1vtZb/vEDyJ5badN9WCeu8UYyDOMPOMHL9WhGnUobQ1
-k/XS52jdLpwGglF3X/gAljjBVYcS4zz5XMCeGcz8Vmtuv7rFAZC8E5Kn0pHZ/7J5
-8jTDuC+C8ckaISufAKzIasp0W5uC83+fIaDdPoDI8YDa1xdJcGaVZsUFsFhEn9s=
-=FeJC
+iEYEAREIAAYFAlQ+jiEACgkQCaWpQKGI+9SRggCdHrpJIQua23F49mJwOg1xbeka
+wPEAnA4VoXCbLXss1NukNS16aYhdjItZ
+=D909
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
index afe8c809c91b..2a13006a276d 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.3 2012/08/04 09:44:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.4 2014/10/15 15:09:20 pacho Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils multilib nsplugins flag-o-matic toolchain-funcs
 
@@ -17,9 +17,19 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2:2
 	net-misc/curl
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-gtklibs
-	>=sys-apps/util-linux-2.13"
+	>=sys-apps/util-linux-2.13
+	|| (
+		(
+			>=dev-libs/glib-2.34.3[abi_x86_32(-)]
+			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+		)
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -72,16 +82,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed"
+	emake LDFLAGS_32="$(get_abi_CFLAGS x86) ${LDFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
-	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" \
-		|| die "dosym failed"
+	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
 
-	keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}" || die "keepdir failed"
+	keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}"
 
 	dodoc NEWS README TODO
 }