aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-07-31 12:09:45 +0200
committerJustin Lecher <jlec@gentoo.org>2015-07-31 12:09:54 +0200
commitdeee8cbf581b9e0d9a1431407fe76734ce95f8f7 (patch)
tree1dbb4bbb270f21b50363fe5573a610aabdd42f1b
parentsci-mathematics/scilab: Fix the conditions under which batik is a dependency. (diff)
downloadsci-deee8cbf.tar.gz
sci-deee8cbf.tar.bz2
sci-deee8cbf.zip
sci-chemistry/nmrpipe: Fix for non-multilib on prefix
Package-Manager: portage-2.2.20
-rw-r--r--sci-chemistry/nmrpipe/ChangeLog4
-rw-r--r--sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild2
2 files changed, 5 insertions, 1 deletions
diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 329425ea6..0a1a840d6 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Jul 2015; Justin Lecher <jlec@gentoo.org>
+ nmrpipe-8.1.2013.218.23.09-r1.ebuild:
+ sci-chemistry/nmrpipe: Fix for non-multilib on prefix
+
13 Apr 2015; Justin Lecher <jlec@gentoo.org>
nmrpipe-8.1.2013.218.23.09-r1.ebuild:
sci-chemistry/nmrpipe: Drop emul package support
diff --git a/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild b/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild
index 938dc8dd2..fa8e17afb 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
sys-libs/ncurses
x11-apps/xset
|| ( x11-libs/xview x11-libs/xview-bin )
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ !prefix? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] )
prefix? ( dev-util/patchelf )"
S="${WORKDIR}"