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

diff --git a/sci-chemistry/icm-browser/ChangeLog b/sci-chemistry/icm-browser/ChangeLog
index f46674a28ff0..814750cb0e74 100644
--- a/sci-chemistry/icm-browser/ChangeLog
+++ b/sci-chemistry/icm-browser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/icm-browser
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm-browser/ChangeLog,v 1.6 2014/09/07 15:44:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm-browser/ChangeLog,v 1.7 2014/10/16 09:28:56 pacho Exp $
+
+  16 Oct 2014; Pacho Ramos <pacho@gentoo.org> icm-browser-3.6.1i.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org> icm-browser-3.6.1i.ebuild:
   Replace emul-linux-x86-compat dependency by virtual/libstdc++, bug 522218.
@@ -30,4 +33,3 @@
   05 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> +files/90icm-browser,
   +icm-browser-3.6.1g.ebuild, +files/icm-browser.png, +metadata.xml:
   Initial import
-
diff --git a/sci-chemistry/icm-browser/Manifest b/sci-chemistry/icm-browser/Manifest
index 9dc4eebd5922..ac83fd2d35ca 100644
--- a/sci-chemistry/icm-browser/Manifest
+++ b/sci-chemistry/icm-browser/Manifest
@@ -4,20 +4,13 @@ Hash: SHA256
 AUX 90icm-browser 35 SHA256 355a2ed50f0e56fba89e9cb983aab13e154262d3e8ecb7d60d05889111b1c21d SHA512 d0b9174e5afbd689c7820744ec8ecacc8b5de157146ad1dce17e10f04c26b0e9fb812060f7194230b874b08fd9cad97a0fedcea22cceae8c6a538dfdf41c5004 WHIRLPOOL baf3da8f30eed7c5668c55481f657389bd17812b291ce483bb60b2430ff09a4144bb0cc5cf0490ac11b9833965291a698920bfa89bcb3a6b2daa7955a7de1f2b
 AUX icm-browser.xpm 12527 SHA256 52481698098ecbd37225d52dd51a09bc88f53acf5d7779e37fd82628f1972e82 SHA512 0d410df13106e5a7a20c6e394a5c174cc9a226ffe76e0868305c88f286224244861aad40ce7e6a882a11dbcd43528c75c18b19ffb485149fcb34f7536948c884 WHIRLPOOL e75a0c6f71a932b9ba6e9ae6bab028145594b48749b582eaa4fe2903b80b5bc70b5fb84965f97118df1393b5609b5e63ba1e7882f3e6da6a9299d60d616281a5
 DIST icm-browser-3.6-1i.i386.rpm 81669297 SHA256 6be8fdea54b5c744d6f8d164caead7dc49325428e07de6be458d655d8de5aef5
-EBUILD icm-browser-3.6.1i.ebuild 1676 SHA256 6b9a15cf2d2572172ef30ff04752d559885bade015ffb45f38e13752cde5f90a SHA512 34d6fe4efe187926968305940e1f575c1150865969e87ca79f535aa852ea943dd7a3c1a89aceaa1c8085faf4249533f542cc68605308fc8ad40e5119f1024d38 WHIRLPOOL 103891064392d0a6c6edcbaedd3a2b83b0545f90e40ec433458ef08607158c90425602e22b2812f11e890f2ca31b447c33adbab2a92ba5ecec2500f15cd2573f
-MISC ChangeLog 1248 SHA256 1a243d35a9b2c58fe6335c9af073586c2368a692640fbd9106c59fb0e10b4ccc SHA512 c6aae1b324781b98633891b525550e11937386298e9c3f0b5b15f470b45f395a51b6e75aa56f94729c9be2451b1e928363567e47b0f8626dad303a4dd6a45fad WHIRLPOOL e546669db4ab1851a02baa6d088242042cc493696cd2454fb186657ba5d2c902008b2a7ccfadb2d50390d92a1c7ec47f9a1ac91de66d8d4fd6269f7a0fe1a913
+EBUILD icm-browser-3.6.1i.ebuild 2628 SHA256 fdcdf9c1659bbc83c537ccc019bf0e19e76cac4886b16b0414bccec7c1dd7dce SHA512 509a72f8427b0099fb6378083cec9dfff5283cac1e24acc30ee3b0bc50d942e5ae30d838314bbd72ec4c67bf32eb8b2d1c5d5c1c46ba0d21ad262108b43d3076 WHIRLPOOL e79ab6026b1dce5d55951fc752ae45b94ac4d8a844b4a8a99d318c45cd01618392d5a652b250964a3f403cc28c0dde5a68c2c6bc252b7562473cebdb8793378e
+MISC ChangeLog 1378 SHA256 b859b2995c9f8d7f8af42e722f08c1f97de403567a5aa3547348edb1078b9df0 SHA512 5e6246b592514a39c9dddcc55c1fde7e762dbcf9b840ae775d43821788f58c2dc2b83ab169c0f0a1b4d79a5bf034f911d7fe1af6a3a9b70c300bfd0530b3cc6d WHIRLPOOL 79d77e6eb7c2b0029adcfc41f5d93272a8d9c830a2b23d9f56b25f91e31cbad79cb362892e7f598f2b27fa5d31763e4998918b2907c79dc2ce49bdc85b6bc71c
 MISC metadata.xml 257 SHA256 344d9ca6a57b35b97682e144d205204c0b7da04a53ea67c7b3c89b8c8c8b5e5f SHA512 40c6a2c4a446aa1c370e1fb79780f2a9ca3525cfd16b9f7f9d16b954d8c97da2131c769db847e193ca08d18a9c71c9fd7cb85170d57ee991138057666e53f9cc WHIRLPOOL c706dcbf1d06cb7915f173a3fcf6c537ffcd9040b05dd9f0575192850d13034c55c9627f7205a79287818eeeaf704b9bb4dedf200bca5a4baec9d5e1dfc75460
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUDH1tAAoJEJQzkH1pP7W49YYL/RVCgtfisNLL24NpO7HXO1gq
-8vZWoZRlBQfy940aVQt93v6MKdgMDojc1sUZ9IMi84rZ4K1p+enCkJlhYL/vv0I7
-bxoe+xrwsBa9KlGnADhoJHAkcLMQg+2H4Tn+mjWNztH5aJxYuv7r60tHWCcDZpRI
-8nwVfsWwI9T39xeBTMQTG0TOPleiUhaeVRJZKTiXdtMDA8eDXPSR7zenc5D9J5UF
-SZue/jAYFjOhcxWmn/DusTAe4JuNrjLZnmitlLFufsOqh/Ysb0j7+e6/xx0nZUwv
-TiiOrGOvxYdpa3DxcWTC+45FIzEPsFKsS+qZcyYrEGqdih+VYVD1sESZ2ezwNm+V
-S9GzGf1dcvBnpCfsUetOPQWNcQR1XieJO07RbFrXouRIKZzgY+5DF4Rf1ANL5Fdp
-W3EhNcIAGLkNxbAAq6guZbkUkFFJZUUJogOSk7bGmyxhGd2MeH8jNvZO6J6tSFNo
-FhvD85MBx9MGs6Kqy9KhutEtYj5PCzbdg1VqJBMRzg==
-=0S5a
+iEYEAREIAAYFAlQ/j9kACgkQCaWpQKGI+9SDkgCfWA6o1qo2T8asnnOwQLiiG4Am
+MBAAn3jjYw2uQXw70qxZqFYr6GF6ytbA
+=xivX
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild b/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
index 51bc56f3e008..d4dae300eee6 100644
--- a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
+++ b/sci-chemistry/icm-browser/icm-browser-3.6.1i.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/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild,v 1.3 2014/09/07 15:44:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild,v 1.4 2014/10/16 09:28:56 pacho Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit rpm eutils versionator
 
@@ -18,12 +18,42 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch"
 
-DEPEND="!sci-chemistry/icm
+RDEPEND="!sci-chemistry/icm
 	virtual/libstdc++:3.3
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-	)"
-RDEPEND="${DEPEND}"
+	|| (
+		(
+			>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			media-libs/libmng[abi_x86_32(-)]
+			>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+			>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
+			>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
+			virtual/jpeg:62[abi_x86_32(-)]
+			virtual/krb5[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+			x11-libs/libICE[abi_x86_32(-)]
+			x11-libs/libSM[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdamage[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libXfixes[abi_x86_32(-)]
+			x11-libs/libXmu[abi_x86_32(-)]
+			x11-libs/libXrender[abi_x86_32(-)]
+			x11-libs/libXt[abi_x86_32(-)]
+			x11-libs/libXxf86vm[abi_x86_32(-)]
+			x11-libs/libdrm[abi_x86_32(-)]
+			x11-libs/libxcb[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
+DEPEND=""
 
 S="${WORKDIR}/usr/${PN}-pro-${MY_PV}"
 
@@ -42,14 +72,14 @@ src_install () {
 	dodir "${instdir}"
 	dodir "${instdir}/licenses"
 	cp -pPR * "${D}/${instdir}"
-	doenvd "${FILESDIR}/90icm-browser" || die
+	doenvd "${FILESDIR}/90icm-browser"
 	exeinto ${instdir}
-	doexe "${S}/icmbrowserpro" || die
-	doexe "${S}/lmhostid" || die
-	doexe "${S}/txdoc" || die
-	dosym "${instdir}/icmbrowserpro"  /opt/bin/icmbrowserpro || die
-	dosym "${instdir}/txdoc"  /opt/bin/txdoc || die
-	dosym "${instdir}/lmhostid"  /opt/bin/lmhostid || die
+	doexe "${S}/icmbrowserpro"
+	doexe "${S}/lmhostid"
+	doexe "${S}/txdoc"
+	dosym "${instdir}/icmbrowserpro"  /opt/bin/icmbrowserpro
+	dosym "${instdir}/txdoc"  /opt/bin/txdoc
+	dosym "${instdir}/lmhostid"  /opt/bin/lmhostid
 	# make desktop entry
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry "icmbrowserpro -g" "ICM Browser" ${PN} Chemistry