diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-07-31 10:18:19 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-07-31 10:18:19 +0000 |
| commit | 949866abea7dfcf004a01ac703f7570a341a683d (patch) | |
| tree | 636abbb7a35a65c38a2e24ed20483309a4ec3a89 /sci-chemistry | |
| parent | Install complete set of manpages if USE=minimal. (diff) | |
| download | gentoo-2-949866abea7dfcf004a01ac703f7570a341a683d.tar.gz gentoo-2-949866abea7dfcf004a01ac703f7570a341a683d.tar.bz2 gentoo-2-949866abea7dfcf004a01ac703f7570a341a683d.zip | |
Fix for non-multilib on prefix
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/cara-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild | 24 | ||||
| -rw-r--r-- | sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild | 53 |
3 files changed, 18 insertions, 65 deletions
diff --git a/sci-chemistry/cara-bin/ChangeLog b/sci-chemistry/cara-bin/ChangeLog index 66c62d3f1da7..5ced8147bd5e 100644 --- a/sci-chemistry/cara-bin/ChangeLog +++ b/sci-chemistry/cara-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/cara-bin # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.12 2015/06/14 18:56:26 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.13 2015/07/31 10:18:19 jlec Exp $ + + 31 Jul 2015; Justin Lecher <jlec@gentoo.org> -cara-bin-1.8.4.ebuild, + cara-bin-1.8.4-r1.ebuild: + Fix for non-multilib on prefix 14 Jun 2015; Ulrich Müller <ulm@gentoo.org> cara-bin-1.8.4.ebuild, cara-bin-1.8.4-r1.ebuild: diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild index 96c12c9fb5e3..aca0481e96fa 100644 --- a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild +++ b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.3 2015/06/14 18:56:26 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.4 2015/07/31 10:18:19 jlec Exp $ EAPI=5 @@ -19,16 +19,18 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="lua" RDEPEND=" - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXext-1.3.2[abi_x86_32(-)] - >=x11-libs/libXi-1.7.2[abi_x86_32(-)] - >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] + !prefix? ( + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] + >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] + >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] + >=x11-libs/libX11-1.6.2[abi_x86_32(-)] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] + ) virtual/libstdc++ lua? ( dev-lang/lua )" DEPEND="" diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild deleted file mode 100644 index 0c17b30f2fcc..000000000000 --- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.10 2015/06/14 18:56:26 ulm Exp $ - -EAPI=5 - -MY_PN="${PN%%-bin}" -MY_P="${MY_PN}_${PV}" - -DESCRIPTION="Analysis of NMR spectra and Computer Aided Resonance Assignment" -SRC_URI=" - http://www.cara.nmr-software.org/downloads/${MY_P}_linux.gz - http://dev.gentoo.org/~jlec/distfiles//Start1.2.cara.xz" -HOMEPAGE="http://www.nmr.ch" - -LICENSE="CARA" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="lua" - -RDEPEND=" - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXext-1.3.2[abi_x86_32(-)] - >=x11-libs/libXi-1.7.2[abi_x86_32(-)] - >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - virtual/libstdc++ - lua? ( dev-lang/lua )" -DEPEND="" - -RESTRICT="mirror" - -QA_PREBUILT="opt/cara/*" - -S="${WORKDIR}" - -src_install() { - exeinto /opt/cara - doexe ${MY_P}_linux - dosym ${MY_P}_linux /opt/cara/cara - dodoc Start1.2.cara - - cat >>"${T}"/20cara<<- EOF - PATH="${EPREFIX}/opt/cara/" - EOF - - doenvd "${T}"/20cara -} |