sci-libs/cgcode: Fix missing linking to blas libs

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

4 files changed, 60 insertions, 13 deletions

diff --git a/sci-libs/cgcode/ChangeLog b/sci-libs/cgcode/ChangeLog
index c3a49b9128d1..f0debcecbc52 100644
--- a/sci-libs/cgcode/ChangeLog
+++ b/sci-libs/cgcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cgcode
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/ChangeLog,v 1.6 2011/11/21 16:34:36 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/ChangeLog,v 1.7 2012/05/30 08:59:54 jlec Exp $
+
+*cgcode-1.0-r2 (30 May 2012)
+
+  30 May 2012; Justin Lecher <jlec@gentoo.org> files/1.0-gentoo.patch,
+  +cgcode-1.0-r2.ebuild:
+  Fix missing linking to blas libs
 
 *cgcode-1.0-r1 (21 Nov 2011)
 
diff --git a/sci-libs/cgcode/Manifest b/sci-libs/cgcode/Manifest
index 9c82cb92876c..d43f8f151052 100644
--- a/sci-libs/cgcode/Manifest
+++ b/sci-libs/cgcode/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 1.0-gentoo.patch 2316 RMD160 acebc3ddf57c30954013a8bba47eb0ef9f4e3756 SHA1 68dd867dd372dcd58768232e9e16da7f3e55700f SHA256 0d92e9b43465badf7f1f1bdf26d9dd32940fee96d73680b258dddec1125cb957
+AUX 1.0-gentoo.patch 2363 RMD160 90c7477339a8c6c91d2142c934085c7ca516aee0 SHA1 396ee87b214455729704871eed9085393a4cbafd SHA256 0ebe39ee8df88f40c25fd0cbc36e10d25c7e6d3427071c6545e81fd4df439c58
 DIST cgcode-1.0.tar.gz 77941 RMD160 08630dba83d101cbb999491a0efaf4a308613ea0 SHA1 8a93a71bc684b159fa067c0a9ec3c1ff159b2dc6 SHA256 41dd5a8d388b234c26dbc514f61883530be3d0bd56abdbbde94b8724d266f594
 EBUILD cgcode-1.0-r1.ebuild 1019 RMD160 862f89a21bec6b0728ea3629745363bbf00e7dec SHA1 f0a76df25048f4242e3e2d0c0e9534b0e30dde8e SHA256 f1ea5a471b3a13180b703e10ef75ba47968973536c335ea6b6e94a79135b0374
+EBUILD cgcode-1.0-r2.ebuild 875 RMD160 1b5779294165173b2cf632c193adb00b4440d897 SHA1 1c03157926022c343ee144a9380a1860296f4d6a SHA256 ac0c94869ca93f8414efb7ddf4631391b8e41cd8d891bc564ee9f5e8bd71c783
 EBUILD cgcode-1.0.ebuild 891 RMD160 d815075946092f036602c0300b3920330cd1925f SHA1 1b3dd39f8cd24539b94d2fb55912625e04ecf84a SHA256 3d524b28e7808dea77c26d4587fc86fb41f42fa0337bde431a350471af274dd7
-MISC ChangeLog 919 RMD160 d150a635493cd8f55289f9da77f0d3912763913a SHA1 9cd3a3c7a756a7c4ffb7e0179ab9d3ac83e65ab5 SHA256 6534b96e48b630ec1dada5e9a70d5cbf2bb6b958e234c61da9df72d4710976a9
+MISC ChangeLog 1081 RMD160 f16b4e888606e0ec90e278afa2dd9f116f887169 SHA1 793f0738f4ac06abb2782c0521847a3088b010a2 SHA256 cd807017c80ee25757d1e108950c43b690579c4bb2cc44654ab17623f722cf72
 MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk7KfaEACgkQgAnW8HDreRbgIACg0zwWhGlfxKTpE0GVNbQeaPSB
-7wMAnihuy/rpb4ReOFJXWPnyn3UC12YJ
-=nZBi
+iEYEAREKAAYFAk/F4Y8ACgkQgAnW8HDreRZg/wCfbIvxXCL+vsRtGlJtQ00f0Eli
+MH0AmgKZjkB4kgbKJIFR1mEOl7iTzm5K
+=wnZr
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
new file mode 100644
index 000000000000..86c6bfd28287
--- /dev/null
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/cgcode-1.0-r2.ebuild,v 1.1 2012/05/30 08:59:54 jlec Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Conjugate gradient Codes for large sparse linear systems"
+HOMEPAGE="http://fetk.org/codes/cgcode/index.html"
+SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="
+	virtual/fortran
+	virtual/blas"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+
+	cat >> make.inc <<- EOF
+	F77 = $(tc-getFC)
+	FFLAGS = ${FFLAGS}
+	BLASLIBS = $(pkg-config --libs blas)
+	EOF
+}
+
+src_install() {
+	dobin goos good
+	dolib.so src/lib${PN}.so*
+	dodoc INTRODUCTION NOTE README
+}
diff --git a/sci-libs/cgcode/files/1.0-gentoo.patch b/sci-libs/cgcode/files/1.0-gentoo.patch
index 3313a5149181..612ca9e06497 100644
--- a/sci-libs/cgcode/files/1.0-gentoo.patch
+++ b/sci-libs/cgcode/files/1.0-gentoo.patch
@@ -20,11 +20,11 @@ index 4813b55..f20af02 100644
  
  goos : mains.o libs
 -	$(F77) $(DEBUG) $(OFLAGS) $(LFLAGS) mains.o $(THELIBS) -o goos
-+	$(F77) $(LDFLAGS) mains.o -L. $(THELIBS) $(BLASLIBS) -o goos
++	$(F77) $(LDFLAGS) mains.o -L./src $(THELIBS) $(BLASLIBS) -o goos
  
  good : maind.o libs
 -	$(F77) $(DEBUG) $(OFLAGS) $(LFLAGS) maind.o $(THELIBS) -o good
-+	$(F77) $(LDFLAGS) maind.o -L. $(THELIBS) $(BLASLIBS) -o good
++	$(F77) $(LDFLAGS) maind.o -L./src $(THELIBS) $(BLASLIBS) -o good
  
 -.f.o :
 -	$(F77) $(CFLAGS) $(DEBUG) $(OFLAGS) $*$ .f
@@ -49,9 +49,9 @@ index 10cf6c3..1dfd02d 100644
  $(THISLIB) : $(SOBJLIB) $(DOBJLIB)
 -	$(AR) $(THISLIB) $(SOBJLIB) $(DOBJLIB)
 -	cp $(THISLIB) ../.
-+	$(F77) $(FFLAGS) $(LDFLAGS) -shared -fPIC -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB)
++	$(F77) $(FFLAGS) $(LDFLAGS) -shared -fPIC -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB) $(BLASLIBS)
++	ln -sf $(THISLIB).1.0 $(THISLIB).1
 +	ln -sf $(THISLIB).1.0 $(THISLIB)
-+	cp $(THISLIB)* ../.
  
 -.f.o :
 -	$(F77) $(CFLAGS) $(DEBUG) $(OFLAGS) $*$ .f
@@ -70,7 +70,7 @@ index 6dad0d1..5c9d24f 100644
  $(THISLIB) : $(SOBJLIB) $(DOBJLIB)
 -	$(AR) $(THISLIB) $(SOBJLIB) $(DOBJLIB)
 -	cp $(THISLIB) ../.
-+	$(F77) $(FFLAGS) $(LDFLAGS) -shared -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB)
++	$(F77) $(FFLAGS) $(LDFLAGS) -shared -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB) $(BLASLIBS)
 +	ln -sf $(THISLIB).1.0 $(THISLIB)
 +	cp $(THISLIB)* ../.