Version bump. Added static-libs use flag. Some clean up

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 146 insertions, 2 deletions

diff --git a/sci-libs/qrupdate/ChangeLog b/sci-libs/qrupdate/ChangeLog
index 6ddf2ba73320..efe6af9c55db 100644
--- a/sci-libs/qrupdate/ChangeLog
+++ b/sci-libs/qrupdate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/qrupdate
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qrupdate/ChangeLog,v 1.12 2010/05/13 06:33:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qrupdate/ChangeLog,v 1.13 2010/05/13 15:53:20 bicatali Exp $
+
+*qrupdate-1.1.1 (13 May 2010)
+
+  13 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +qrupdate-1.1.1.ebuild, +files/qrupdate-1.1.1-Makefiles.patch:
+  Version bump. Added static-libs use flag. Some clean up
 
   13 May 2010; Jeroen Roovers <jer@gentoo.org> qrupdate-1.1.0.ebuild:
   Stable for HPPA (bug #318649).
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index def115e628a4..cf80dbfaf31c 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,10 +1,13 @@
 AUX qrupdate-1.0.1-makefile.patch 806 RMD160 24fa32017a2b05a5e1f2a410f7e44afeddc834c1 SHA1 92ea35b6c4b441a0e77c8488184ada69d04d71be SHA256 0933615553070d1b8705324c0a9c0279164e759409650eaaef5b5983a4822987
 AUX qrupdate-1.1.0-darwin-dylib.patch 1545 RMD160 d71d8bc4939d753f5ab055ee92486e34e7d44a26 SHA1 57198914901ff37613f0727dd396c6b8a7050de9 SHA256 cf602352d25c506a5406d1bc4dd57d9515cc2085b65caf0f6279dded09874804
 AUX qrupdate-1.1.0-destdir.patch 1676 RMD160 730824fc5b26d8a875a64aa58b2e2d39957aff22 SHA1 a70e6792a4b21cc48485f2d469ccb7a1b65b0cb7 SHA256 8fd9b82df622e9b6d5c4dbd0b0de1e9c29da77774c3ac9b5ae62ce7ef7d6b2f1
+AUX qrupdate-1.1.1-Makefiles.patch 2350 RMD160 c4a1a95399e243bddf75f4cf2943373965ba2b59 SHA1 0c6e82669c66115fdd56c6c77a07d5a4977a530b SHA256 68f6febb354250ccabf1dbe68e96c834aadbe058987ec20f9095e19d7ed2dfb2
 DIST qrupdate-1.0.1.tar.gz 42179 RMD160 d1f120ae97d840bf7b932c7d18abb54360d7d1f6 SHA1 679aa98ff823332ead25b5c5c9c01210155a510d SHA256 45ba0b4e6b15236a219b5b380e15fc9acfe6760a9ca5e53484de9b534969ba0d
 DIST qrupdate-1.1.0.tar.gz 48830 RMD160 09a5544bf0fedcbcc30746ed4988183618143f38 SHA1 7bad3929af17f595d4349e5a6f8155c194c58735 SHA256 4048f17bb0cf084b74962c882aa6d1367568dc65900259fbea1407eb9ec28bd3
+DIST qrupdate-1.1.1.tar.gz 50063 RMD160 fd63306abe91adcd5d47e408d9cd4af3e1b32b0c SHA1 8fbaba202b0d4bf80852b2dc6c8d1d4b90b816d4 SHA256 9f0100d358f96cae9394c28c97dbf1fd359675671d2a2c9ac88cfd121a46662a
 EBUILD qrupdate-1.0.1.ebuild 1196 RMD160 3766f95cf8fdc61df5871d3ccaa9d8a352707f04 SHA1 337518cc16c5c8dbc651272965dd56d888828594 SHA256 75bfb2d639b25a42037e5ee06c5a98b64f6c9fd8a9740a0182f1d221a7d234d6
 EBUILD qrupdate-1.1.0-r1.ebuild 1459 RMD160 0ed2afd9fe0c8135ee2ac3140e2ee7c8a785429b SHA1 9aa9c6650c0e5df69c87aca3d0c8dfb898939f62 SHA256 400e10225b9b30acc966fbfd4f6b9615d71168fa94cdeae64a32e92f7055b08b
 EBUILD qrupdate-1.1.0.ebuild 1195 RMD160 48c9119b1001a9cf29e0def276c8ac075cdfe907 SHA1 28960e6ea56b8b7e4322a4b9ae1c3eedec415616 SHA256 38b0cfd236941353b0d50e0ef4c3c84f58e6519b48f19dadc4844be936673584
-MISC ChangeLog 1928 RMD160 0733933398fa8eeac32ee201aaa4ab566d57e8c7 SHA1 51c5ee6f0610d759e3096250d80502090bf030ab SHA256 bab30f2cc54be5e0afa8b579825efdd804d622a9ad71d0aaecc74a58e26fccf6
+EBUILD qrupdate-1.1.1.ebuild 1390 RMD160 a27f12cc834f1d12b8c254514a436f1739a906e9 SHA1 8d8b8a80997c6a2b4af39b1dd7d844fa3f3b9ab7 SHA256 2e823fcae47058e51a04e916671a9cc10413678de13d25da7654f2eccc34b55d
+MISC ChangeLog 2143 RMD160 5a80c4fff69f6a743ca754fea31f9ca9b22ce15d SHA1 21425df66422d68c9ec2f686a6f28aee8d0e99e4 SHA256 9949dc892c8f360abc9843c07a138526a95823fefa2eda4e150fc7fc0c7dfbad
 MISC metadata.xml 279 RMD160 59bf94f0890a53e2d8a8fcf42fc1c70011ddfff0 SHA1 0827e8ffae3dcd740b8e63a571a311bdf2342911 SHA256 3920e5ddce75e4dc97be39228565444cf403f174839d8e2f4acd1bd02a83c318
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
new file mode 100644
index 000000000000..9c9ef9317342
--- /dev/null
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
@@ -0,0 +1,88 @@
+diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
+--- qrupdate-1.1.1.orig/Makefile	2009-02-06 09:12:00.000000000 +0000
++++ qrupdate-1.1.1/Makefile	2010-05-13 17:27:15.000000000 +0100
+@@ -32,22 +32,22 @@
+ 	@echo "   make install - installs everything"
+ 
+ lib:
+-	make -C src/ lib
++	$(MAKE) -C src lib
+ solib:
+-	make -C src/ solib
++	$(MAKE) -C src solib
+ test: lib
+-	make -C test/
++	$(MAKE) -C test
+ 
+ clean:
+ 	rm -f libqrupdate.a libqrupdate.so
+-	make -C src/ clean
+-	make -C test/ clean
++	$(MAKE) -C src clean
++	$(MAKE) -C test clean
+ 
+ install:
+-	make -C src/ install
++	$(MAKE) -C src install
+ 
+ install-shlib:
+-	make -C src/ install-shlib
++	$(MAKE) -C src install-shlib
+ 
+ install-staticlib:
+-	make -C src/ install-staticlib
++	$(MAKE) -C src install-staticlib
+diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
+--- qrupdate-1.1.1.orig/src/Makefile	2010-01-19 11:32:35.000000000 +0000
++++ qrupdate-1.1.1/src/Makefile	2010-05-13 17:28:30.000000000 +0100
+@@ -34,6 +34,8 @@
+ 
+ OBJS = $(SRC:%.f=%.o)
+ 
++PICOBJS = $(SRC:%.f=%.lo)
++
+ lib: ../libqrupdate.a
+ 
+ ifeq ($(shell uname),Darwin)
+@@ -46,19 +48,22 @@
+ ../libqrupdate.a: $(OBJS)
+ 	ar -cr $@ $(OBJS)
+ 
+-../libqrupdate.so: $(OBJS)
+-	$(FC) $(FFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR) $(OBJS) \
++../libqrupdate.so: $(PICOBJS)
++	$(FC) $(LDFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR) $(PICOBJS) \
+ 		$(BLAS) $(LAPACK)
+ 
+-../libqrupdate.dylib: $(OBJS)
+-	$(FC) $(FFLAGS) $(LDFLAGS) -dynamiclib -o $@ -install_name $(PREFIX)/$(LIBDIR)/libqrupdate.$(MAJOR).dylib $(OBJS) \
++../libqrupdate.dylib: $(PICOBJS)
++	$(FC) $(LDFLAGS) -dynamiclib -o $@ -install_name $(PREFIX)/$(LIBDIR)/libqrupdate.$(MAJOR).dylib $(PICOBJS) \
+ 		$(BLAS) $(LAPACK)
+ 
++$(PICOBJS): %.lo: %.f
++	$(FC) $(FFLAGS) $(FPICFLAGS) -c $< -o $@
++
+ $(OBJS): %.o: %.f
+-	$(FC) $(FFLAGS) $(FPICFLAGS) -c $<
++	$(FC) $(FFLAGS) -c $<
+ 
+ clean:
+-	rm -f $(OBJS)
++	rm -f $(OBJS) $(PICOBJS)
+ 
+ install: install-shlib install-staticlib
+ 
+diff -Nur qrupdate-1.1.1.orig/test/Makefile qrupdate-1.1.1/test/Makefile
+--- qrupdate-1.1.1.orig/test/Makefile	2010-02-11 08:25:37.000000000 +0000
++++ qrupdate-1.1.1/test/Makefile	2010-05-13 17:15:51.000000000 +0100
+@@ -41,7 +41,7 @@
+ 	$(FC) $(FFLAGS) -c $<
+ 
+ ../libqrupdate.a:
+-	make -C ../ lib
+-	
++	$(MAKE) -C .. lib
++
+ clean: 
+ 	rm -f *.o $(PROGS) $(OUTS)
diff --git a/sci-libs/qrupdate/qrupdate-1.1.1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.1.ebuild
new file mode 100644
index 000000000000..1889fac8bf58
--- /dev/null
+++ b/sci-libs/qrupdate/qrupdate-1.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qrupdate/qrupdate-1.1.1.ebuild,v 1.1 2010/05/13 15:53:20 bicatali Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A library for fast updating of QR and Cholesky decompositions"
+HOMEPAGE="http://sourceforge.net/projects/qrupdate"
+SRC_URI="mirror://sourceforge/qrupdate/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="static-libs"
+
+RDEPEND="virtual/lapack"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefiles.patch
+	sed -i Makeconf \
+		-e "s:gfortran:$(tc-getFC):g" \
+		-e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
+		-e "s:BLAS=.*:BLAS=$(pkg-config --libs blas):" \
+		-e "s:LAPACK=.*:LAPACK=$(pkg-config --libs lapack):" \
+		-e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
+		-e "s:LIBDIR=lib:LIBDIR=$(get_libdir):" \
+		|| die "Failed to set up Makeconf"
+}
+
+src_compile() {
+	emake solib || die "emake shared lib failed"
+	if use static-libs; then
+		emake lib || die "emake static lib failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-shlib || die "emake shared lib install failed"
+	if use static-libs; then
+		emake DESTDIR="${D}" install-staticlib || die "emake static lib install failed"
+	fi
+	dodoc README ChangeLog
+}