Add a patch to allow compilation with gfortran.

Package-Manager: portage-2.1.2_pre2-r5

4 files changed, 40 insertions, 11 deletions

diff --git a/sci-chemistry/shelx/ChangeLog b/sci-chemistry/shelx/ChangeLog
index ae8696051f48..06fe3363632a 100644
--- a/sci-chemistry/shelx/ChangeLog
+++ b/sci-chemistry/shelx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/shelx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.5 2006/09/20 05:09:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/ChangeLog,v 1.6 2006/10/12 19:02:50 dberkholz Exp $
+
+  12 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/20060317-gfortran.patch, shelx-20060317.ebuild:
+  Add a patch to allow compilation with gfortran.
 
   20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   (#148281) Change herd to sci-chemistry from sci.
diff --git a/sci-chemistry/shelx/Manifest b/sci-chemistry/shelx/Manifest
index 5e48ac8e721f..58ede8d7e9e2 100644
--- a/sci-chemistry/shelx/Manifest
+++ b/sci-chemistry/shelx/Manifest
@@ -2,15 +2,19 @@ AUX 20060317-autotool.patch 1207 RMD160 705ac9dd8ed95f3c5721fdd42aa59e14b1b65271
 MD5 068645b04579adcda862d66c9548d555 files/20060317-autotool.patch 1207
 RMD160 705ac9dd8ed95f3c5721fdd42aa59e14b1b65271 files/20060317-autotool.patch 1207
 SHA256 880b6eb77f528d32ac4bd55354c86bce3e1c236dd0cbd338d034594b6841bedb files/20060317-autotool.patch 1207
+AUX 20060317-gfortran.patch 686 RMD160 0834f5c562628db093e7cb7738be75b66b0a00d6 SHA1 58f748513c54805969d7a3155dedf4edb5a709ec SHA256 fc1b248bea13989383e12a24628c3330b781cb26b6135f2614323fad7d70cc17
+MD5 fb2b2b98aac4514c52563a9d4664429c files/20060317-gfortran.patch 686
+RMD160 0834f5c562628db093e7cb7738be75b66b0a00d6 files/20060317-gfortran.patch 686
+SHA256 fc1b248bea13989383e12a24628c3330b781cb26b6135f2614323fad7d70cc17 files/20060317-gfortran.patch 686
 DIST shelx-20060317.tgz 527162 RMD160 4a72471cca8a1df8839815ec7df35349817f7f31 SHA1 3ed6481e716059441253c84500965837deddf01b SHA256 8edb841fa71cae420e65fa87fdb3d829359a199aeead6522c72a08c4f72307d9
-EBUILD shelx-20060317.ebuild 1274 RMD160 aacd37ca4e6de3fe70a3974650740d6ecec73cc5 SHA1 e93cab04372ac91cf30448387926df2a840933cb SHA256 f81eed537dd814645325c688dfa30c086cb94afbd9d7aa4179716d2dbf27ecf1
-MD5 97e926d851ce826abc59ce58183ed438 shelx-20060317.ebuild 1274
-RMD160 aacd37ca4e6de3fe70a3974650740d6ecec73cc5 shelx-20060317.ebuild 1274
-SHA256 f81eed537dd814645325c688dfa30c086cb94afbd9d7aa4179716d2dbf27ecf1 shelx-20060317.ebuild 1274
-MISC ChangeLog 1010 RMD160 8549aa5228f652e2986d0c6ca78ded7729a59634 SHA1 c0d6f4e8f9df48dc1c24276a0c50619f5e967b4a SHA256 86e7cc96e3749553650ef9bbc61b773adcf18deaa558457ff550d637f4e8cff8
-MD5 8470516ce76418681cdafd24ca517a2c ChangeLog 1010
-RMD160 8549aa5228f652e2986d0c6ca78ded7729a59634 ChangeLog 1010
-SHA256 86e7cc96e3749553650ef9bbc61b773adcf18deaa558457ff550d637f4e8cff8 ChangeLog 1010
+EBUILD shelx-20060317.ebuild 1324 RMD160 86e42802db57cd632abc6a81d98be9f1b46ec45e SHA1 fb5363ba42c722cb2f9b033702b3aab3baa3b599 SHA256 98101a7a088cab90d41da5a032514a0abdfdf607b82fab40319c7c34c3bbd19d
+MD5 9a4b25e2843ec907c925731172b8e547 shelx-20060317.ebuild 1324
+RMD160 86e42802db57cd632abc6a81d98be9f1b46ec45e shelx-20060317.ebuild 1324
+SHA256 98101a7a088cab90d41da5a032514a0abdfdf607b82fab40319c7c34c3bbd19d shelx-20060317.ebuild 1324
+MISC ChangeLog 1173 RMD160 d32f639be223c0964395edd9d2e76425ed718123 SHA1 d573b6af0493663878ea38081aa507e396c9b506 SHA256 4f6c4927384ad54ea9d07c162bc34a063e6e2c83bd97dc5997f0808edbe514b3
+MD5 3325ae8e97a1c3ecc401ef49edb3eeec ChangeLog 1173
+RMD160 d32f639be223c0964395edd9d2e76425ed718123 ChangeLog 1173
+SHA256 4f6c4927384ad54ea9d07c162bc34a063e6e2c83bd97dc5997f0808edbe514b3 ChangeLog 1173
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
diff --git a/sci-chemistry/shelx/files/20060317-gfortran.patch b/sci-chemistry/shelx/files/20060317-gfortran.patch
new file mode 100644
index 000000000000..d414a8e45c31
--- /dev/null
+++ b/sci-chemistry/shelx/files/20060317-gfortran.patch
@@ -0,0 +1,20 @@
+--- unix.orig/ciftab.f	2006-10-12 11:44:46.000000000 -0700
++++ unix/ciftab.f	2006-10-12 11:38:22.000000000 -0700
+@@ -377,7 +377,7 @@
+ C systems.  It enables a 'read-only' file to be opened for reading.
+ C
+       OPEN(LR,FILE=CIFDIR(1:K)//'ciftab.'//IS(1:L),STATUS='OLD',
+-     +READONLY,ERR=5)
++     +ERR=5)
+       GOTO 6
+    4  WRITE(*,'(/A)')' ** Cannot open file **'
+       GOTO 108
+@@ -1332,7 +1332,7 @@
+    6  FORMAT(3X,4('h  k  l   Fo   Fc   s',5X),'h  k  l   Fo   Fc   s',
+      +A1/A1)
+    7  FORMAT(4(I4,2I3,2I5,I4,2X),I4,2I3,2I5,I4)
+-   8  FORMAT($,1X,A)
++   8  FORMAT(1X,A,$)
+ C
+       WRITE(LO,1)' '//ESC//AMP//'l0o5c1x'//ESC//'(0u'//
+      +ESC//'(s0p16.66h8.5v0s0b0T'//CR
diff --git a/sci-chemistry/shelx/shelx-20060317.ebuild b/sci-chemistry/shelx/shelx-20060317.ebuild
index 97a2506375ba..a4d3b431da70 100644
--- a/sci-chemistry/shelx/shelx-20060317.ebuild
+++ b/sci-chemistry/shelx/shelx-20060317.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317.ebuild,v 1.2 2006/06/17 00:56:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/shelx/shelx-20060317.ebuild,v 1.3 2006/10/12 19:02:50 dberkholz Exp $
 
 inherit autotools eutils fortran
 
@@ -19,7 +19,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
-FORTRAN="ifc"
+FORTRAN="ifc gfortran"
 
 pkg_nofetch() {
 	einfo "Go to ${HOMEPAGE}"
@@ -31,6 +31,7 @@ pkg_nofetch() {
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}-autotool.patch
+	epatch ${FILESDIR}/${PV}-gfortran.patch
 
 	sed -i \
 		-e "s:CIFDIR='/usr/local/bin/':CIFDIR='${ROOT}usr/share/${PN}/':g" \