summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-04-03 19:07:06 +0000
committerJustin Lecher <jlec@gentoo.org>2012-04-03 19:07:06 +0000
commitbc58338f13ec6304422be56a536aee4536b15b04 (patch)
tree7fc7bb7e8bd88dc4968ebb928bcfad3c87d2202e /sci-chemistry/ccp4-apps
parentMore USE=-readline fixes. (diff)
downloadgentoo-2-bc58338f13ec6304422be56a536aee4536b15b04.tar.gz
gentoo-2-bc58338f13ec6304422be56a536aee4536b15b04.tar.bz2
gentoo-2-bc58338f13ec6304422be56a536aee4536b15b04.zip
sci-chemistry/ccp4-apps: fix for some unknown issue resulting in #406337, thanks Andreas Schürch for the initial idea of the fix
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/ccp4-apps')
-rw-r--r--sci-chemistry/ccp4-apps/ChangeLog8
-rw-r--r--sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild12
2 files changed, 16 insertions, 4 deletions
diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog
index 03a2bf3317c7..d28babcaa2b8 100644
--- a/sci-chemistry/ccp4-apps/ChangeLog
+++ b/sci-chemistry/ccp4-apps/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/ccp4-apps
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.33 2011/10/16 12:27:52 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.34 2012/04/03 19:07:06 jlec Exp $
+
+ 03 Apr 2012; Justin Lecher <jlec@gentoo.org> ccp4-apps-6.1.3-r10.ebuild:
+ fix for some unknown issue resulting in #406337, thanks Andreas Schürch for
+ the initial idea of the fix
16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
ccp4-apps-6.1.3-r10.ebuild:
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild
index bd374dc3fb0b..647dbb8ceaea 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.6 2011/10/16 12:27:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.7 2012/04/03 19:07:06 jlec Exp $
EAPI=3
@@ -169,8 +169,16 @@ src_prepare() {
-e 's: -rpath $CLIB::g' \
-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-e 's:sleep 1:sleep .2:g' \
+ -e 's:\\$(XCIF_LIB):-L$srcdir/lib/ccif -lccif:g' \
+ -e 's:\\$(XLAPACK_LIB):${XLAPACK_LIB}:g' \
+ -e 's:\\$(CXX_LIBS):\${CXX_LIBS}:g' \
+ -e 's:\\$(XLDFLAGS):\${XLDFLAGS}:g' \
-i configure || die
+ sed \
+ -e '/o crunch2/s:$: ${XLAPACK_LIB}:g' \
+ -i src/Makefile* || die
+
find "${S}" -name "Makefile.*" \
-exec sed -e 's|_FLAGS-|_FLAGS:-|g' -e "s:\(eval \$([[:alnum:]]*)\):\1 \$(GENTOOLDFLAGS):g" -i '{}' \;