summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-04-21 19:55:14 +0000
committerMichał Górny <mgorny@gentoo.org>2013-04-21 19:55:14 +0000
commita2b3eac18039b13bfef2987dd9189a58da4a17ea (patch)
tree2e359df95d9821d3a110df8f51fa7a8c3b632143 /sci-chemistry/cara-bin
parentSupport multilib libraries alternatively to emul-linux-x86-xlibs. (diff)
downloadgentoo-2-a2b3eac18039b13bfef2987dd9189a58da4a17ea.tar.gz
gentoo-2-a2b3eac18039b13bfef2987dd9189a58da4a17ea.tar.bz2
gentoo-2-a2b3eac18039b13bfef2987dd9189a58da4a17ea.zip
Support multilib libraries alternatively to emul-linux-x86-xlibs.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sci-chemistry/cara-bin')
-rw-r--r--sci-chemistry/cara-bin/ChangeLog8
-rw-r--r--sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild20
2 files changed, 22 insertions, 6 deletions
diff --git a/sci-chemistry/cara-bin/ChangeLog b/sci-chemistry/cara-bin/ChangeLog
index e6cfd64e8c44..bb2c0c1e1825 100644
--- a/sci-chemistry/cara-bin/ChangeLog
+++ b/sci-chemistry/cara-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/cara-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.6 2012/09/10 16:20:51 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.7 2013/04/21 19:55:14 mgorny Exp $
+
+ 21 Apr 2013; Michał Górny <mgorny@gentoo.org> cara-bin-1.8.4.ebuild:
+ Support multilib libraries alternatively to emul-linux-x86-xlibs.
10 Sep 2012; Justin Lecher <jlec@gentoo.org> cara-bin-1.8.4.ebuild:
Add QA_PREBUILT beause we are binary
@@ -21,4 +24,3 @@
07 Mar 2010; Justin Lecher <jlec@gentoo.org>
+cara-bin-1.8.4.ebuild, +metadata.xml:
New addition for NMR assignment software, bug 209124
-
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
index 2b5724f068e9..bd4f7a38cdea 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/09/10 16:20:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.6 2013/04/21 19:55:14 mgorny Exp $
EAPI=4
@@ -20,7 +20,21 @@ IUSE="lua"
RDEPEND="
amd64? (
- app-emulation/emul-linux-x86-xlibs
+ || (
+ (
+ media-libs/fontconfig[abi_x86_32]
+ media-libs/freetype[abi_x86_32]
+ x11-libs/libICE[abi_x86_32]
+ x11-libs/libSM[abi_x86_32]
+ x11-libs/libX11[abi_x86_32]
+ x11-libs/libXcursor[abi_x86_32]
+ x11-libs/libXext[abi_x86_32]
+ x11-libs/libXi[abi_x86_32]
+ x11-libs/libXrandr[abi_x86_32]
+ x11-libs/libXrender[abi_x86_32]
+ )
+ app-emulation/emul-linux-x86-xlibs
+ )
app-emulation/emul-linux-x86-compat )
x86? (
media-libs/fontconfig