diff options
author | Justin Lecher <jlec@gentoo.org> | 2014-07-04 08:47:16 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2014-07-04 08:47:16 +0200 |
commit | 4f3d0a0d1070ba993e5fab696b5cbc1d77e80817 (patch) | |
tree | 79c635b1c803647d417bf04318873dc774be09c4 | |
parent | sci-chemistry/unio: Fix emul-linux deps for modern multilib (diff) | |
download | sci-4f3d0a0d1070ba993e5fab696b5cbc1d77e80817.tar.gz sci-4f3d0a0d1070ba993e5fab696b5cbc1d77e80817.tar.bz2 sci-4f3d0a0d1070ba993e5fab696b5cbc1d77e80817.zip |
sci-chemistry/nmrpipe: Fix emul-linux deps for modern multilib
Package-Manager: portage-2.2.10
RepoMan-Options: --force
-rw-r--r-- | sci-chemistry/nmrpipe/ChangeLog | 6 | ||||
-rw-r--r-- | 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 3af5fe517..d94799f5b 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 <jlec@gentoo.org> + nmrpipe-8.1.2013.218.23.09-r1.ebuild: + Fix emul-linux deps for modern multilib + 28 Oct 2013; Justin Lecher <jlec@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 4be5ae22e..9bf3a23a3 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 )" |