Fix for bug #254491. Big Thanks to Permjacov E. A. and Rene Meier. Also removing mopac7-1.14.ebuild because of repoman warning: Upstream parallel compilation bug (ebuild calls emake -j1 on line: 55)

Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.28-gentoo x86_64

3 files changed, 27 insertions, 26 deletions

diff --git a/sci-chemistry/mopac7/ChangeLog b/sci-chemistry/mopac7/ChangeLog
index d1611ea25d2d..a0f6bf6b4af8 100644
--- a/sci-chemistry/mopac7/ChangeLog
+++ b/sci-chemistry/mopac7/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/mopac7
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.18 2008/11/28 22:57:04 patrick Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/ChangeLog,v 1.19 2009/01/18 18:24:26 je_fro Exp $
+
+  18 Jan 2009; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
+  Fix for bug #254491. Big Thanks to Permjacov E. A. and Rene Meier. Also
+  removing mopac7-1.14.ebuild because of repoman warning: Upstream parallel
+  compilation bug (ebuild calls emake -j1 on line: 55)
 
   28 Nov 2008; Patrick Lauer <patrick@gentoo.org> mopac7-1.14.ebuild:
   Adding econf call so it can actually work. No idea how this got through,
diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index d76d13b66ec8..7d4af176eed5 100644
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -4,6 +4,6 @@ DIST mopac7-1.14.tar.gz 757406 RMD160 b65a1c58bfa7739e11ea21f5593cbc3b0ffff2f2 S
 EBUILD mopac7-1.10-r1.ebuild 1558 RMD160 fe4628df7db86945db65637ae0829fb658e949b2 SHA1 40a92c5e209ed45c80cf6498e664e6dfb39898e6 SHA256 2b1caa1297c9e2b401fef0bcf41b6293c90c8861e2c57cb5ab5ca1a566e658d5
 EBUILD mopac7-1.13-r1.ebuild 1802 RMD160 7cd6998a9677e4391622584135ecd23547f293de SHA1 7598d39d41dfc316391c4b72f4fb4a5e56274e40 SHA256 348c31a5a37cba1c9c135241ec8cfd118715ef95576cd8953aad77d698ce95c6
 EBUILD mopac7-1.13.ebuild 1650 RMD160 ddc4a5836673492b94c0435dcba22bae9d4512e7 SHA1 2b4e49abcc0aeaf945f81367144b958d466cee0d SHA256 1f41349a4657b54166e9a73adf8ccf03c233b9ccc2e6e8fd2262e54ed5153b42
-EBUILD mopac7-1.14.ebuild 1863 RMD160 aac9f9ab814a64540f8744df6fd017dc13588c2e SHA1 c1d83e399702a3610ca316da711ac8810efada20 SHA256 81f3c9fbafed0172891fe58f196fa3f65e336ef5160f2e09baac79a4cdbf7256
-MISC ChangeLog 2846 RMD160 3be2d3466f75d643b6c078576b13d8e0d801b211 SHA1 5cd524a38e55bec37f1eb2cb08017c5696da0aff SHA256 19d0cf1dc6487775436ca4603d3495e25d8f87abd0404d453c559259dc974de0
+EBUILD mopac7-1.14-r1.ebuild 1793 RMD160 2948685b01840fddfc4205e8693192d13537a01d SHA1 571737ee8a08b9aec81ba36628187d81a09198b7 SHA256 9fc5c4dfdbd60bf96e3f1e839f7a7ffd0c4b6464f14801b1534e6cf8f9380896
+MISC ChangeLog 3110 RMD160 1177c17aec2943a3edd72179268f3269707c9d7c SHA1 9754ce9746a3f4438d04d1cbe1de8eb94c33e0f0 SHA256 f7ec0180a573b4136e9470e19629b76a9d12005967bbe1a35efdd87d7dfa5b38
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/mopac7/mopac7-1.14.ebuild b/sci-chemistry/mopac7/mopac7-1.14-r1.ebuild
index aa7375ab0a2b..fb75ed075dde 100644
--- a/sci-chemistry/mopac7/mopac7-1.14.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.14-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.14.ebuild,v 1.2 2008/11/28 22:57:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mopac7/mopac7-1.14-r1.ebuild,v 1.1 2009/01/18 18:24:26 je_fro Exp $
 
-WANT_AUTOMAKE="1.8"
-WANT_AUTOCONF="latest"
-
-inherit autotools
+inherit autotools fortran
 
 DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
 HOMEPAGE="http://sourceforge.net/projects/mopac7/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
+
 LICENSE="mopac7"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND=">=dev-libs/libf2c-20070912"
+RDEPEND=""
 DEPEND="${RDEPEND}"
 
+FORTRAN="gfortran"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -25,40 +24,37 @@ src_unpack() {
 	# Install the executable
 	sed -i \
 		-e "s:noinst_PROGRAMS = mopac7:bin_PROGRAMS = mopac7:g" \
-		Makefile.am \
+		fortran/Makefile.am \
 		|| die "sed failed: install mopac7"
 	# Install the script to run the executable
 	sed -i \
-		-e "s:EXTRA_DIST = run_mopac7:if HAVE_F2C\nbin_SCRIPTS = run_mopac7\nendif:g" \
+		-e "s:EXTRA_DIST = autogen.sh run_mopac7:bin_SCRIPTS = run_mopac7:g" \
 		Makefile.am \
 		|| die "sed failed: install run_mopac7"
 
 	# Fix parallel build by adding internal dependency on libmopac7.la from
 	# executable
 	sed -i \
-		-e "s:mopac7_LDFLAGS = -lmopac7 -lf2c -lm:mopac7_LDFLAGS = -lf2c -lm:g" \
+		-e "s:mopac7_LDFLAGS = -lmopac7 -lm:mopac7_LDFLAGS = -lm:g" \
 		-e "s:\(mopac7_LDFLAGS.*\):\1\nmopac7_LDADD = libmopac7.la:g" \
-		Makefile.am \
+		fortran/Makefile.am \
 		|| die "sed failed: fix dependencies"
 
-	# Switch to gfortran from g77.
-	sed -i \
-		-e "s:lg2c:lgfortran:" \
-		libmopac7.pc.in \
-		|| die "sed failed: fix to use gfortran in libmopac7.pc.in"
-
 	eautoreconf
 }
 
 src_compile() {
-	econf
-	emake -j1 || die "mopac7 failed to build."
-	}
+	#set -std=legacy -fno-automatic according to
+	#http://www.bioinformatics.org/pipermail/ghemical-devel/2008-August/000763.html
+	FFLAGS="${FFLAGS} -std=legacy -fno-automatic" econf
+	emake || die "mopac7 failed to build."
+}
+
 
 src_install() {
 	# A correct fix would have a run_mopac7.in with @bindir@ that gets
 	# replaced by configure, and run_mopac7 added to AC_OUTPUT in configure.ac
-	sed -i "s:./src/mopac7:mopac7:g" run_mopac7
+	sed -i "s:./fortran/mopac7:mopac7:g" run_mopac7
 
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS README ChangeLog