diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-02-13 20:07:43 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-02-13 20:07:43 +0000 |
| commit | 79761bf49fdee973850043ba4ba721525c2a7c41 (patch) | |
| tree | 192fabef6bd2e776531110b49be2af94a2b4ab39 /sci-chemistry/tinker | |
| parent | Updated sed handling and udev rules for syntax changes (see bug 301887). (diff) | |
| download | historical-79761bf49fdee973850043ba4ba721525c2a7c41.tar.gz historical-79761bf49fdee973850043ba4ba721525c2a7c41.tar.bz2 historical-79761bf49fdee973850043ba4ba721525c2a7c41.zip | |
Version Bump and old version removed, parallel build and die when build failed, bug 296888, 275533, 263006 & 241180
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/tinker')
| -rw-r--r-- | sci-chemistry/tinker/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-chemistry/tinker/Manifest | 10 | ||||
| -rw-r--r-- | sci-chemistry/tinker/tinker-5.1.ebuild | 38 |
3 files changed, 16 insertions, 37 deletions
diff --git a/sci-chemistry/tinker/ChangeLog b/sci-chemistry/tinker/ChangeLog index 84d281f631fd..376c63a1514a 100644 --- a/sci-chemistry/tinker/ChangeLog +++ b/sci-chemistry/tinker/ChangeLog @@ -1,12 +1,13 @@ # ChangeLog for sci-chemistry/tinker # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.13 2010/02/13 19:35:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.14 2010/02/13 20:07:43 jlec Exp $ *tinker-5.1 (13 Feb 2010) 13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> -tinker-4.2-r1.ebuild, +tinker-5.1.ebuild: - Version Bump and old version removed + Version Bump and old version removed, parallel build and die when build failed, + bug 296888, 275533, 263006 & 241180 14 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> tinker-4.2-r1.ebuild: diff --git a/sci-chemistry/tinker/Manifest b/sci-chemistry/tinker/Manifest index 99a0072cdc89..a6af051f56cb 100644 --- a/sci-chemistry/tinker/Manifest +++ b/sci-chemistry/tinker/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST tinker-5.1.tar.gz 12996698 RMD160 469364ec2612fee658256f41dc1f18a2f158badd SHA1 3d89dd6beb9fd8a03d0e7c76bc06b384e5e3abc7 SHA256 2c9d6bfe578e6d613d4820b4dda4812cf44ad9acfd101c9393f22b17e750cc1b -EBUILD tinker-5.1.ebuild 1893 RMD160 58c69523a92d7e9d98758284010f15306790a058 SHA1 7e1934ff8e4e54c390e446755f37d68a9c76a2fa SHA256 1746907e4c9de3d3481334882829e1a56d3932d27b8f84a8a6564029b798a98a -MISC ChangeLog 2210 RMD160 9bb245303fb2512ec0f71dcbcfadc01bfc8c6b5d SHA1 9026aa769d22ab30bac7b2540a1ab1ef0c81117b SHA256 1c32cd764040c2643bf695a79fb3b0e08651d5606730cafc242eac76c523e6e1 +EBUILD tinker-5.1.ebuild 1208 RMD160 e4fbcbe5f393b96ff5cea563a50643aab8816a88 SHA1 bc34b1a3d533d75d246f184b028477be274665e6 SHA256 ca988cf12ff952376e1d4ec2e21a9ef33afb005646a54d281719836a0faa9ee8 +MISC ChangeLog 2291 RMD160 b732b5427a7ea0b9c6c961f868fe5f3fe6e864ef SHA1 de4145f701abfa35ade1bb631d61fcb2056e3439 SHA256 cc7e07dbfb9dbe2eb0f5b5853ab0876566f948a74f57840af665fae2c7c508eb MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkt2/w8ACgkQgAnW8HDreRZPkwCgyUMK7ZcDzn/UDL/y4D6v8AvZ -DLUAnRLUuczl7xy91r03jaS5ibAtag4Q -=hr+t +iEYEARECAAYFAkt3BpUACgkQgAnW8HDreRbilQCeK9ZZ2Q3AyRoPX1oQHCYpKsxo +Kk4AoJ+lYVKg49Q236pXFRZy3dEjm7do +=Xl9m -----END PGP SIGNATURE----- diff --git a/sci-chemistry/tinker/tinker-5.1.ebuild b/sci-chemistry/tinker/tinker-5.1.ebuild index 54b88ccdadda..7515a54b7d3c 100644 --- a/sci-chemistry/tinker/tinker-5.1.ebuild +++ b/sci-chemistry/tinker/tinker-5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.ebuild,v 1.1 2010/02/13 19:35:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.ebuild,v 1.2 2010/02/13 20:07:43 jlec Exp $ EAPI="2" FORTRAN="gfortran ifc" @@ -22,35 +22,13 @@ RESTRICT="mirror" S="${WORKDIR}"/tinker/source src_compile() { - LINK="./link.make" - COMPILE="./compile.make" - LIBRARY="./library.make" - - # Need to make sure all of the appropriate config files are in place - # for the build. - # This should be easily customizable for other Fortran compilers, e.g. pg77. - if [[ ${FORTRANC} == "ifort" ]]; then - cp ../linux/intel/* . - else - cp ../linux/gfortran/* . - fi - - cp ../make/* . - - # Prep build scripts - sed -i -e "s:gfortran:${FORTRANC} ${LDFLAGS}:g" ${LINK} - sed -r -i -e "s:^${FORTRANC}.+$:echo &\n&:" ${LINK} - - # Default to -O2 if FFLAGS is unset - sed -i -e "s:-O:${FFLAGS:- -O2}:" ${COMPILE} - sed -r -i -e "s:^${FORTRANC}.+$:echo &\n&:" ${COMPILE} - - einfo "Compiling ..." - ${COMPILE} || die "compile failed" - einfo "Building libraries ..." - ${LIBRARY} || die "library creation failed" - einfo "Linking ..." - ${LINK} || die "link failed" + emake \ + -f ../make/Makefile \ + F77="${FORTRANC}" \ + F77FLAGS=-c \ + OPTFLAGS="${FFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + || die } src_install() { |