commit:     26244911e77ec5ea22a46f1bfcf21eba0a5a93ab
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 08:00:04 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 08:00:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26244911

sci-chemistry/freeon: Fix compilation error

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604138

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../freeon/files/freeon-1.0.10-stop.patch          | 36 ++++++++++++++++++++++
 sci-chemistry/freeon/freeon-1.0.10.ebuild          | 16 +++++++---
 sci-chemistry/freeon/metadata.xml                  |  2 +-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/freeon/files/freeon-1.0.10-stop.patch 
b/sci-chemistry/freeon/files/freeon-1.0.10-stop.patch
new file mode 100644
index 00000000..a20d520
--- /dev/null
+++ b/sci-chemistry/freeon/files/freeon-1.0.10-stop.patch
@@ -0,0 +1,36 @@
+From 882b51fb718c2eed98ef3e8f3be0c5b7320024e1 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <j...@gentoo.org>
+Date: Mon, 2 Jan 2017 07:56:11 +0000
+Subject: [PATCH] Add missing blank after STOP
+
+The STOP statement requires preceding blank. Newer gcc
+will fail with
+
+     CASE DEFAULT; STOP'Err:WghtMtrx'
+                      1
+Error: Blank required in STOP statement near (1)
+
+See:
+https://bugs.gentoo.org/show_bug.cgi?id=604138
+
+Signed-off-by: Justin Lecher <j...@gentoo.org>
+---
+ FreeON/Optimizer.F90 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/FreeON/Optimizer.F90 b/FreeON/Optimizer.F90
+index 0ef22269..0bbd9008 100644
+--- a/FreeON/Optimizer.F90
++++ b/FreeON/Optimizer.F90
+@@ -3055,7 +3055,7 @@ CONTAINS
+     SELECT CASE(FromTo)
+     CASE('CToWC');IFromTo=0
+     CASE('WCToC');IFromTo=1
+-    CASE DEFAULT; STOP'Err:WghtMtrx'
++    CASE DEFAULT; STOP 'Err:WghtMtrx'
+     END SELECT
+     DO AtB=1,NAtoms
+        IF(IFromTo.EQ.0) THEN
+-- 
+2.11.0
+

diff --git a/sci-chemistry/freeon/freeon-1.0.10.ebuild 
b/sci-chemistry/freeon/freeon-1.0.10.ebuild
index f1a8d5c..e865bb4 100644
--- a/sci-chemistry/freeon/freeon-1.0.10.ebuild
+++ b/sci-chemistry/freeon/freeon-1.0.10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
 FORTRAN_STANDARD=90
 PYTHON_COMPAT=( python{2_7,3_4} )
 
-inherit autotools-utils fortran-2 python-any-r1
+inherit autotools fortran-2 python-any-r1
 
 DESCRIPTION="An experimental suite of programs for linear scaling quantum 
chemistry"
 HOMEPAGE="http://www.freeon.org";
@@ -25,3 +24,12 @@ RDEPEND="
        virtual/lapack"
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-stop.patch
+)
+
+src_prepare() {
+       default
+       eautoreconf
+}

diff --git a/sci-chemistry/freeon/metadata.xml 
b/sci-chemistry/freeon/metadata.xml
index 8abcc2a..8f4e98e 100644
--- a/sci-chemistry/freeon/metadata.xml
+++ b/sci-chemistry/freeon/metadata.xml
@@ -8,7 +8,7 @@
                <email>nicolasb...@gentoo.org</email>
                <name>Nicolas Bock</name>
        </maintainer>
-<maintainer type="project">
+       <maintainer type="project">
                <email>sci-chemis...@gentoo.org</email>
                <name>Gentoo Chemistry Project</name>
        </maintainer>

Reply via email to