commit: 4f3d0a0d1070ba993e5fab696b5cbc1d77e80817
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 4 06:47:16 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul 4 06:47:16 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4f3d0a0d
sci-chemistry/nmrpipe: Fix emul-linux deps for modern multilib
Package-Manager: portage-2.2.10
RepoMan-Options: --force
---
sci-chemistry/nmrpipe/ChangeLog | 6 +++++-
sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild | 14 +++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 3af5fe5..d94799f 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-chemistry/nmrpipe
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Jul 2014; Justin Lecher <j...@gentoo.org>
+ nmrpipe-8.1.2013.218.23.09-r1.ebuild:
+ Fix emul-linux deps for modern multilib
+
28 Oct 2013; Justin Lecher <j...@gentoo.org>
-nmrpipe-8.1.2013.218.23.09.ebuild, +nmrpipe-8.1.2013.218.23.09-r1.ebuild,
+files/extract.M:
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 4be5ae2..9bf3a23 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
@@ -39,18 +39,22 @@ RESTRICT="strip"
DEPEND="app-shells/tcsh"
RDEPEND="${DEPEND}
app-editors/nedit
- dev-lang/tk
dev-tcltk/blt
media-fonts/font-sun-misc
!sci-chemistry/sparta+
!sci-chemistry/talos+
sys-libs/ncurses
x11-apps/xset
- x11-libs/libX11
|| ( x11-libs/xview x11-libs/xview-bin )
- amd64? (
- app-emulation/emul-linux-x86-baselibs
- app-emulation/emul-linux-x86-xlibs
+ || (
+ (
+ dev-lang/tk[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ )
+ (
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ )
)
prefix? ( dev-util/patchelf )"
