[gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/

["Justin Lecher" <jlec@gentoo.org>]

commit:     c9e6af8690a48c72dace0bc5556ec1380da1d73a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 12:31:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
+  sci-chemistry/phenix-bin: Fix for latest linux kernel
+
   22 Jun 2015; Justin Lecher <jlec@gentoo.org> -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