diff options
| -rw-r--r-- | sci-chemistry/icm-browser/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild | 58 |
2 files changed, 48 insertions, 16 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/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 |