Fix for compilation with gcc-4.6 (-fwhole-file), #362843; use pkg-config to get lapack libs

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

6 files changed, 74 insertions, 8 deletions

diff --git a/sci-chemistry/scala/ChangeLog b/sci-chemistry/scala/ChangeLog
index 50ff9ccd38ba..e3d09d6e3e80 100644
--- a/sci-chemistry/scala/ChangeLog
+++ b/sci-chemistry/scala/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/scala
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.7 2011/01/18 17:01:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.8 2011/04/10 15:38:20 jlec Exp $
+
+*scala-3.3.18-r2 (10 Apr 2011)
+
+  10 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.3.18-gcc4.6.patch,
+  +scala-3.3.18-r2.ebuild, files/Makefile.am, files/configure.ac:
+  Fix for compilation with gcc-4.6 (-fwhole-file), #362843; use pkg-config to
+  get lapack libs
 
   18 Jan 2011; Thomas Kahle <tomka@gentoo.org> scala-3.3.18-r1.ebuild:
   x86 stable per bug 351756
diff --git a/sci-chemistry/scala/Manifest b/sci-chemistry/scala/Manifest
index 061e4552221c..0756ea101f69 100644
--- a/sci-chemistry/scala/Manifest
+++ b/sci-chemistry/scala/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Makefile.am 73 RMD160 919c14040b76627428d143027260e9ef2deb2836 SHA1 090d67b6052b322bcc8224b4052bfc9aaf9b0743 SHA256 9b964ac556e8343f4ed45d7293d0144aef569d565141a96a555416aeb411feae
-AUX configure.ac 313 RMD160 098fbafb1f83c2925ff2580c5e0191263b37f574 SHA1 e1550b1b27c967660f7d47c62dea9e693983eca4 SHA256 5c54a92c67fc74f1e4700f53aa9962a0315ec3fb2578c1c13694bfb16d3100ff
+AUX 3.3.18-gcc4.6.patch 436 RMD160 0be6ed16bcb0ecde043ce800372da7e29f5e6b65 SHA1 54ddd9db96fcbb46d5bc5ac976480552e47205da SHA256 915f1ee06f884d17758a8fd3b31914c682d218344ec08236ffd7b36768f8bb28
+AUX Makefile.am 79 RMD160 c1a98f47aeb1b76124a2a34abbfa08ac48b4bcab SHA1 3caf0666b67fe58ee00e15be3a54de2346332c4e SHA256 d655d49aa232e166c512d22b4545f77072abe8cdd9e24f67e1fe998b6c307979
+AUX configure.ac 351 RMD160 d82d6d6eaebf52e0f400d3f9fb74c84e98a91f66 SHA1 00197613e3b14c776b9bc005a81e6a35fd2e8ce2 SHA256 d1f8afc52e0dd275173be950c1d218dced367afb1724da477941e199e23e2cbb
 DIST scala-3.3.18.tar.gz 368590 RMD160 e3507d08f4ef435ad1095422c55b80b0297db435 SHA1 5c7baf6c1bd3e40c49a83ca1b4fa5eb76be5a68f SHA256 9c7848289117f5e3f1f83ae3aa18dd958c40a076e13bcb219456bcb9e6055610
 EBUILD scala-3.3.18-r1.ebuild 863 RMD160 a335b9627cdb48f4383fd58f5c4e29a18b3b50b1 SHA1 271420154b162fbc06be423b50df3b4d83494609 SHA256 8929990f0543b0d8f3d934ab228f92dc67b91d4d0b70587b2405e6655e167397
-MISC ChangeLog 1079 RMD160 69a5fa040ed5daaf2ddb13a77197c86439c988d7 SHA1 771e674b10d31ea02d9901667aab0d8319f73a0d SHA256 dead87c4b5195bdcfdb11eeed5304349065fb1b9f657106aa1ed7d078e017eac
+EBUILD scala-3.3.18-r2.ebuild 934 RMD160 eefaa2010e2dda713ba66bbc00d6caa8c99c287f SHA1 57870faf2782e75714915c3c83cadd43b4ba93ea SHA256 f363c97483ab4fcf55a69f012d5c9dacc0dd04efcff4fe964aaff28f586cc6b4
+MISC ChangeLog 1348 RMD160 7b500cf1aad802b76a2f07a41720feab9aa1107f SHA1 60640eb5df744f052102156f2d31f39720a22b6a SHA256 e019e93947b6c2f636866d0754f487f290d5a8406600e54217880988dfee98f1
 MISC metadata.xml 425 RMD160 21ce42bcdf1513857dd897f43cff75438b3b036d SHA1 26cad89cc010ed1db8965447fa07576239c262f8 SHA256 c6b7700eb561196441fc926c209e3b1503ed82f05403519e6cf7d24ad4612982
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk01xzcACgkQnZsgo/h8kNZR7QCgtwvwhzDob/0S3LBMj1B2oHxE
-d9cAoI7ehoZMfNtLJqiglb77sHRMx9Ri
-=CX3i
+iEYEARECAAYFAk2hzvEACgkQgAnW8HDreRbOMQCeNEpbNoc68KOysV/TpB+3wkOZ
+YbwAoLsXyqVXClQTIyJVfwnbTpVofPku
+=B+s0
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/scala/files/3.3.18-gcc4.6.patch b/sci-chemistry/scala/files/3.3.18-gcc4.6.patch
new file mode 100644
index 000000000000..0bb3d40d479a
--- /dev/null
+++ b/sci-chemistry/scala/files/3.3.18-gcc4.6.patch
@@ -0,0 +1,17 @@
+ scala.f |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/scala.f b/scala.f
+index d7e1cbe..8ed6fd2 100644
+--- a/scala.f
++++ b/scala.f
+@@ -3955,7 +3955,8 @@ c line buffer
+       character*40 key, value
+       character*200 realfilename
+ 
+-      integer intfp, i2swap, lenstr
++      integer intfp, lenstr
++      integer*2 i2swap
+       external intfp, i2swap, lenstr
+       logical litend
+       external litend
diff --git a/sci-chemistry/scala/files/Makefile.am b/sci-chemistry/scala/files/Makefile.am
index b16394b8817c..49fd61180ef0 100644
--- a/sci-chemistry/scala/files/Makefile.am
+++ b/sci-chemistry/scala/files/Makefile.am
@@ -1,5 +1,5 @@
 
-LIBS = -lccp4f -llapack
+LIBS = -lccp4f $(LAPACK_LIBS)
 
 bin_PROGRAMS = scala
 
diff --git a/sci-chemistry/scala/files/configure.ac b/sci-chemistry/scala/files/configure.ac
index bcbd7dededa2..35c4c7fdd194 100644
--- a/sci-chemistry/scala/files/configure.ac
+++ b/sci-chemistry/scala/files/configure.ac
@@ -6,6 +6,8 @@ AC_INIT(scala, https://bugs.gentoo.org/)
 AC_CONFIG_SRCDIR([scala.f])
 AM_INIT_AUTOMAKE([foreign])
 
+PKG_CHECK_MODULES([LAPACK],[lapack])
+
 # Checks for programs.
 AC_PROG_FC
 AC_PROG_F77
diff --git a/sci-chemistry/scala/scala-3.3.18-r2.ebuild b/sci-chemistry/scala/scala-3.3.18-r2.ebuild
new file mode 100644
index 000000000000..6e2d5a820a5f
--- /dev/null
+++ b/sci-chemistry/scala/scala-3.3.18-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.18-r2.ebuild,v 1.1 2011/04/10 15:38:20 jlec Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Scale together multiple observations of reflections"
+HOMEPAGE="http://www.ccp4.ac.uk/dist/html/scala.html"
+SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ccp4-libs
+	virtual/lapack
+	!<sci-chemistry/ccp4-6.1.2"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gcc4.6.patch
+	cp "${FILESDIR}"/{configure.ac,Makefile.am} "${S}"
+	eautoreconf
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe ${PN} || die
+	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
+	dodoc ${PN}.doc || die
+	dohtml ${PN}.html || die
+}