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 2C8321395E4 for ; Mon, 3 Aug 2015 12:31:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35C89E07A0; Mon, 3 Aug 2015 12:31:26 +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 CF919E07A0 for ; Mon, 3 Aug 2015 12:31:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF475340676 for ; Mon, 3 Aug 2015 12:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 502A0121 for ; Mon, 3 Aug 2015 12:31:22 +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: <1438605076.c9e6af8690a48c72dace0bc5556ec1380da1d73a.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/phenix-bin/ChangeLog sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild X-VCS-Directories: sci-chemistry/phenix-bin/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c9e6af8690a48c72dace0bc5556ec1380da1d73a X-VCS-Branch: master Date: Mon, 3 Aug 2015 12:31:22 +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: 0224aa26-dcf1-44f3-8d85-5bda24b051aa X-Archives-Hash: 3351125fb900f69bf5f48f176579f8fe commit: c9e6af8690a48c72dace0bc5556ec1380da1d73a Author: Justin Lecher gentoo org> AuthorDate: Mon Aug 3 12:31:16 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Aug 3 12:31:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c9e6af86 sci-chemistry/phenix-bin: Fix for latest linux kernel Package-Manager: portage-2.2.20 sci-chemistry/phenix-bin/ChangeLog | 3 +++ sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog index ca3642f..bd837b5 100644 --- a/sci-chemistry/phenix-bin/ChangeLog +++ b/sci-chemistry/phenix-bin/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Aug 2015; Justin Lecher phenix-bin-1.9.1692.ebuild: + sci-chemistry/phenix-bin: Fix for latest linux kernel + 22 Jun 2015; Justin Lecher -phenix-bin-1.8.2.1309.ebuild, -phenix-bin-1.8.4.1496.ebuild: sci-chemistry/phenix-bin: Drop old diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild index 83d3d38..bb42371 100644 --- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild +++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 ) WX_GTK_VER=2.8 -inherit python-single-r1 versionator wxwidgets +inherit multilib python-single-r1 versionator wxwidgets MY_PV="$(replace_version_separator 2 -)" MY_P="phenix-installer-${MY_PV}" @@ -82,7 +82,15 @@ pkg_nofetch() { } src_prepare() { - ./install --prefix="${S}/foo" + cat > "${S}/bin/machine_type" <<-EOF + #!${EPREFIX}/bin/sh + echo intel-linux-2.6-x86_64 + exit 0 + EOF +} + +src_compile() { + ./install --prefix="${S}/foo" || die } src_install() { @@ -99,13 +107,13 @@ src_install() { || die dodir /opt - mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" + mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" || die cat >> phenix <<- EOF #!${EPREFIX}/bin/bash source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh" - export LD_LIBRARY_PATH="${EPREFIX}"/usr/$(get_libdir) + export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)" exec phenix EOF dobin phenix