[gentoo-commits] proj/sci:master commit in: sci-biology/Atlas/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     91fe67bb6be48a87da506a96a06548cbc06fcaba
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Sep 23 17:29:12 2016 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Fri Sep 23 17:29:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=91fe67bb

sci-biology/Atlas: a lot more hackery to fix Makefile

Package-Manager: portage-2.3.0

 sci-biology/Atlas/Atlas-2005.ebuild | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/sci-biology/Atlas/Atlas-2005.ebuild b/sci-biology/Atlas/Atlas-2005.ebuild
index 4806d1c..318b493 100644
--- a/sci-biology/Atlas/Atlas-2005.ebuild
+++ b/sci-biology/Atlas/Atlas-2005.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,13 +22,20 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"/atlas-src/CBT
 
 src_prepare(){
-	sed -e "s/^CC =/CC = $(tc-getCC)/" -e "s/^GCC =/GCC = $(tc-getCXX)/" -i Makefile || die
-	sed -e "s/^GCC =/GCC = $(tc-getCXX)/" -i ../CBTApps/Makefile.in || die
+	sed -e "s/^CC = .*/CC = $(tc-getCC)/" -e "s/^GCC = .*/GCC = $(tc-getCXX)/" -i Makefile || die
+	sed -e "s/^CC = .*/CC = $(tc-getCC)/" -e "s/^GCC = .*/GCC = $(tc-getCXX)/" -i ../CBTApps/Makefile.in || die
+	sed -e "s@^# CBT_DEVEL_USER = .*@CBT_DEVEL_USER = ${EPREFIX}/@" -i Makefile || die
+	sed -e "s@^# CBT_DEVEL_USER = .*@CBT_DEVEL_USER = ${EPREFIX}/@" -i Makefile.in || die
+	sed -e "s#^CBT_INSTALL_LIB = /home/hgsc/lib/#CBT_INSTALL_LIB = ${EPREFIX}/usr/lib/#" -i Makefile || die
+	sed -e "s#^CBT_INSTALL_LIB = /home/hgsc/lib/#CBT_INSTALL_LIB = ${EPREFIX}/usr/lib/#" -i Makefile.in || die
+	sed -e "s#^BOOST_DIR = .*#BOOST_DIR = ${EPREFIX}/usr/lib/#" -i Makefile || die
+	sed -e "s#^BOOST_DIR = .*#BOOST_DIR = ${EPREFIX}/usr/lib/#" -i Makefile.in || die
+	sed -e "s#^CXX = .*#CXX = $(tc-getCXX)#" -i gzstream/Makefile || die
 }
 
 src_compile(){
 	# install headers, bins and libs into CBT_DEVEL_USER, then compile apps
-	emake CBT_DEVEL_DIR="${S}" CBT_INSTALL_DIR="${D}"
+	emake CBT_DEVEL_DIR="${WORKDIR}/atlas-src/CBT" CBT_INSTALL_DIR="${D}"/"${EPREFIX}"
 	cd ../CBTApps || die
-	emake CBT_DEVEL_DIR="${S}" CBT_INSTALL_DIR="${D}"
+	emake CBT_DEVEL_DIR="${WORKDIR}/atlas-src/CBTApps" CBT_INSTALL_DIR="${D}"/"${EPREFIX}"
 }