Fix for recent fortran compilers, #272577

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/ortep3/ChangeLog b/sci-chemistry/ortep3/ChangeLog
index c6b5267416357473be50c581f98a57c7673175b0..597176e3a680b82f342090be7657387183fc3fae 100644 (file)
--- a/sci-chemistry/ortep3/ChangeLog
+++ b/sci-chemistry/ortep3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/ortep3
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ChangeLog,v 1.6 2007/07/22 07:20:46 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ChangeLog,v 1.7 2010/06/24 16:13:55 jlec Exp $
+
+*ortep3-1.0.3-r1 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> -ortep3-1.0.3.ebuild,
+  +ortep3-1.0.3-r1.ebuild:
+  Fix for recent fortran compilers, #272577
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ortep3-1.0.3.ebuild:
   Drop virtual/x11 references.

diff --git a/sci-chemistry/ortep3/Manifest b/sci-chemistry/ortep3/Manifest
index 6d6e92fa7eeefd9af451b554e8c509f597df7b7c..94b96f8af2460e5d358f7f4856c50d828b2e545b 100644 (file)
--- a/sci-chemistry/ortep3/Manifest
+++ b/sci-chemistry/ortep3/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ortep.f 177237 RMD160 95c1ef8d5f57622b6d93f2f8164c18ef609cf1a3 SHA1 a38634760b4d6435f4972d6e34f189d8cabf2deb SHA256 622cdd2801d3959c08f71514de865cc18511fd8522b0b229467d0387047fc374
-EBUILD ortep3-1.0.3.ebuild 788 RMD160 d32652e0e394ccb6f11dc455302da1c740608908 SHA1 26ba431f6f4b6ff815fddf4473f5e29dcaf629c6 SHA256 d88fb48bcbc3e3c91f778672831aef761d9a8523fde72b96f741f7edac599886
-MISC ChangeLog 1007 RMD160 afd07b4a8d4608efe24f7042574e257201aaac10 SHA1 d5ef2e5b75277b06d3c3386bfc9ee023251a224a SHA256 e8baae8877e23fc1473c0c5e618cd93259e74bb899ba2393ae7f73cce22700b5
+EBUILD ortep3-1.0.3-r1.ebuild 817 RMD160 d9f0dcd63542656b7b18982cd2e21ba2132b5fbd SHA1 e7f5a16408c2e94ba6a44865e7ae42e16cbdd85b SHA256 ac908b26eb8bf1f5a11b84c81e1693ae1ca0e1403203d5b29412ef5faa8b7de1
+MISC ChangeLog 1175 RMD160 edffaa9d1b096b25ee604e620c1929af6aea0abd SHA1 91c1c55f97eed7eb0ec9104fcaf93d6358d63295 SHA256 48b638eea63e58338c1534e3b166095448d74b936b436226c9d9ee67869c437d
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjhEkACgkQgAnW8HDreRbArACdGdAAUsGdLqf5G/L3z2VPcb2T
+lZMAoMBdvW7JnOTCdwnPYE2GO/NcKyAP
+=Xnxx
+-----END PGP SIGNATURE-----

diff --git a/sci-chemistry/ortep3/ortep3-1.0.3.ebuild b/sci-chemistry/ortep3/ortep3-1.0.3-r1.ebuild
similarity index 69%
rename from sci-chemistry/ortep3/ortep3-1.0.3.ebuild
rename to sci-chemistry/ortep3/ortep3-1.0.3-r1.ebuild
index f6200a098d1dd76f31a5d9b2b998772c2486f50e..eb3969da108651aaea0cc362ebb518f467232d93 100644 (file)
--- a/sci-chemistry/ortep3/ortep3-1.0.3.ebuild
+++ b/sci-chemistry/ortep3/ortep3-1.0.3-r1.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ortep3-1.0.3.ebuild,v 1.2 2007/07/22 07:20:46 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ortep3-1.0.3-r1.ebuild,v 1.1 2010/06/24 16:13:55 jlec Exp $
 
 inherit fortran
 
-FORTRAN="g77"
+FORTRAN="gfortran ifc"
+
 DESCRIPTION="Thermal ellipsoid plot program for crystal structure illustrations"
 HOMEPAGE="http://www.ornl.gov/sci/ortep/"
 SRC_URI="ftp://ftp.ornl.gov/pub/ortep/src/ortep.f"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RDEPEND="sci-libs/pgplot
+
+RDEPEND="
+       sci-libs/pgplot
        x11-libs/libX11"
 DEPEND="${RDEPEND}"
+
 S=${WORKDIR}
 
 src_unpack() {
@@ -22,11 +27,11 @@ src_unpack() {
 }
 
 src_compile() {
-       COMMAND="${FORTRANC} -o ortep3 ${FFLAGS:- -O2} ortep.f -lpgplot -lX11"
+       COMMAND="${FORTRANC} ${FFLAGS:- -O2} ${LDFLAGS} -o ${PN} ortep.f -lpgplot -lX11"
        echo ${COMMAND}
        ${COMMAND} || die "Compilation failed"
 }
 
 src_install() {
-       dobin ortep3
+       dobin ${PN} || die
 }