From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A18D21393DD for ; Fri, 4 Jul 2014 07:10:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE36AE07D6; Fri, 4 Jul 2014 07:10:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13639E0805 for ; Fri, 4 Jul 2014 07:10:18 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B9F033FDF1 for ; Fri, 4 Jul 2014 07:10:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id EE54A193E6 for ; Fri, 4 Jul 2014 07:10:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1404456436.4f3d0a0d1070ba993e5fab696b5cbc1d77e80817.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrpipe/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/nmrpipe/ChangeLog sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild X-VCS-Directories: sci-chemistry/nmrpipe/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4f3d0a0d1070ba993e5fab696b5cbc1d77e80817 X-VCS-Branch: master Date: Fri, 4 Jul 2014 07:10:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 58100096-9830-4fae-89fa-66bf47bea6a3 X-Archives-Hash: 7a5451c283a15d773dc4494320f567c5 commit: 4f3d0a0d1070ba993e5fab696b5cbc1d77e80817 Author: Justin Lecher gentoo org> AuthorDate: Fri Jul 4 06:47:16 2014 +0000 Commit: Justin Lecher gentoo 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 + nmrpipe-8.1.2013.218.23.09-r1.ebuild: + Fix emul-linux deps for modern multilib + 28 Oct 2013; Justin Lecher -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 )"