| 1 |
jlec 12/04/03 19:07:07 |
| 2 |
|
| 3 |
Modified: ChangeLog ccp4-apps-6.1.3-r10.ebuild |
| 4 |
Log: |
| 5 |
sci-chemistry/ccp4-apps: fix for some unknown issue resulting in #406337, thanks Andreas Schürch for the initial idea of the fix |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.34 sci-chemistry/ccp4-apps/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.34&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.34&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?r1=1.33&r2=1.34 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v |
| 19 |
retrieving revision 1.33 |
| 20 |
retrieving revision 1.34 |
| 21 |
diff -u -r1.33 -r1.34 |
| 22 |
--- ChangeLog 16 Oct 2011 12:27:52 -0000 1.33 |
| 23 |
+++ ChangeLog 3 Apr 2012 19:07:06 -0000 1.34 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-chemistry/ccp4-apps |
| 26 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.33 2011/10/16 12:27:52 ssuominen Exp $ |
| 28 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.34 2012/04/03 19:07:06 jlec Exp $ |
| 30 |
+ |
| 31 |
+ 03 Apr 2012; Justin Lecher <jlec@g.o> ccp4-apps-6.1.3-r10.ebuild: |
| 32 |
+ fix for some unknown issue resulting in #406337, thanks Andreas Schürch for |
| 33 |
+ the initial idea of the fix |
| 34 |
|
| 35 |
16 Oct 2011; Samuli Suominen <ssuominen@g.o> |
| 36 |
ccp4-apps-6.1.3-r10.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.7 sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild?rev=1.7&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild?rev=1.7&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild?r1=1.6&r2=1.7 |
| 45 |
|
| 46 |
Index: ccp4-apps-6.1.3-r10.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v |
| 49 |
retrieving revision 1.6 |
| 50 |
retrieving revision 1.7 |
| 51 |
diff -u -r1.6 -r1.7 |
| 52 |
--- ccp4-apps-6.1.3-r10.ebuild 16 Oct 2011 12:27:52 -0000 1.6 |
| 53 |
+++ ccp4-apps-6.1.3-r10.ebuild 3 Apr 2012 19:07:06 -0000 1.7 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
-# Copyright 1999-2011 Gentoo Foundation |
| 56 |
+# Copyright 1999-2012 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $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 $ |
| 59 |
+# $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 $ |
| 60 |
|
| 61 |
EAPI=3 |
| 62 |
|
| 63 |
@@ -169,8 +169,16 @@ |
| 64 |
-e 's: -rpath $CLIB::g' \ |
| 65 |
-e 's: -I${srcdir}/include/cpp_c_headers::g' \ |
| 66 |
-e 's:sleep 1:sleep .2:g' \ |
| 67 |
+ -e 's:\\$(XCIF_LIB):-L$srcdir/lib/ccif -lccif:g' \ |
| 68 |
+ -e 's:\\$(XLAPACK_LIB):${XLAPACK_LIB}:g' \ |
| 69 |
+ -e 's:\\$(CXX_LIBS):\${CXX_LIBS}:g' \ |
| 70 |
+ -e 's:\\$(XLDFLAGS):\${XLDFLAGS}:g' \ |
| 71 |
-i configure || die |
| 72 |
|
| 73 |
+ sed \ |
| 74 |
+ -e '/o crunch2/s:$: ${XLAPACK_LIB}:g' \ |
| 75 |
+ -i src/Makefile* || die |
| 76 |
+ |
| 77 |
find "${S}" -name "Makefile.*" \ |
| 78 |
-exec sed -e 's|_FLAGS-|_FLAGS:-|g' -e "s:\(eval \$([[:alnum:]]*)\):\1 \$(GENTOOLDFLAGS):g" -i '{}' \; |
Archives