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

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 52 insertions, 7 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/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)* ../.