sci-libs/libcmatrix: Version Bump

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

3 files changed, 140 insertions, 1 deletions

diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog
index 664a3cb680f2..a9e4bd1578f5 100644
--- a/sci-libs/libcmatrix/ChangeLog
+++ b/sci-libs/libcmatrix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libcmatrix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.6 2012/05/04 09:03:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.7 2012/05/21 15:08:59 jlec Exp $
+
+*libcmatrix-3.11.0 (21 May 2012)
+
+  21 May 2012; Justin Lecher <jlec@gentoo.org> +files/3.11.0-shared.patch,
+  +libcmatrix-3.11.0.ebuild:
+  Version Bump
 
   04 May 2012; Justin Lecher <jlec@gentoo.org> libcmatrix-3.9.0.ebuild:
   Prefer atlas over blas-atlas
diff --git a/sci-libs/libcmatrix/files/3.11.0-shared.patch b/sci-libs/libcmatrix/files/3.11.0-shared.patch
new file mode 100644
index 000000000000..6c5c3167619e
--- /dev/null
+++ b/sci-libs/libcmatrix/files/3.11.0-shared.patch
@@ -0,0 +1,80 @@
+diff --git a/Makefile.in b/Makefile.in
+index 1361371..1448e76 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,8 +13,8 @@ AR=@AR@
+ 
+ # You shouldn't need to alter anything below here
+ 
+-COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
+-ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
++COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c
++#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
+ 
+ LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o
+ COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o
+@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS)
+ 
+ ROOT=..
+ 
+-first: lib/libcmatrix.a
++first: lib/libcmatrix.so.3.11.0
+ 
+ #%.o: %.f
+ #	@F77@ @FFLAGS@ -c -o $@ $<
+@@ -68,25 +68,25 @@ tempclean:
+ #	-cd optim; @CLEAN@
+ #	-cd local; @CLEAN@
+ 
+-lib/libcmatrix.a: $(ALLNORMOBJS)
+-	$(AR) $@ $(ALLNORMOBJS)
+-	chmod a+rx $@
+-	$(RANLIB) $@
+-
+-lib/libcmatrix_p.a: $(ALLPROFOBJS)
+-	$(AR)  $@ $(ALLPROFOBJS)
+-	chmod a+rx $@
+-	$(RANLIB) $@
+-
+-lib/libcmatrix-g.a: $(ALLGOBJS)
+-	$(AR)  $@  $(ALLGOBJS)
+-	chmod a+rx $@
+-	$(RANLIB) $@
+-
+-lib/libcmatrix_r.a: $(ALLTHROBJS)
+-	$(AR) @MTFLAGS@ $@ $(ALLTHROBJS)
+-	chmod a+rx $@
+-	$(RANLIB) $@
++lib/libcmatrix.so.3.11.0: $(ALLNORMOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) -lrt @ATLAS_LIBS@
++	ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so.3
++	ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so
++
++lib/libcmatrix_p.so.3.11.0: $(ALLPROFOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) -lrt @ATLAS_LIBS@
++	ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so.3
++	ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so
++
++lib/libcmatrix-g.so.3.11.0: $(ALLGOBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) -lrt @ATLAS_LIBS@
++	ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so.3
++	ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so
++
++lib/libcmatrix.so_r.3.11.0: $(ALLTHROBJS)
++	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) -lrt @ATLAS_LIBS@
++	ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so.3
++	ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so
+ 
+ @CONFIGLEAF@.tar.gz:
+ 	cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@
+diff --git a/configure.ac b/configure.ac
+index c0ae0e1..50dcd5a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,6 @@
+ AC_INIT(configure.ac)
+ AC_CONFIG_HEADER(include/config.h)
++LT_INIT
+ 
+ DEFAR="ar ru"
+ MAKEEXTRA=
diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
new file mode 100644
index 000000000000..4c3eb516cd0f
--- /dev/null
+++ b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild,v 1.1 2012/05/21 15:08:59 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+MY_P="${PN}${PV}_lite"
+
+DESCRIPTION="lite version of pNMRsim"
+HOMEPAGE="http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/"
+#SRC_URI="${HOMEPAGE}/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="atlas sse threads"
+
+RDEPEND="
+	sci-libs/minuit
+	atlas? ( || ( sci-libs/atlas sci-libs/blas-atlas ) )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}R3
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-shared.patch \
+		"${FILESDIR}"/3.2.1-minuit2.patch \
+		"${FILESDIR}"/3.2.1-gcc4.4.patch \
+		"${FILESDIR}"/3.2.1-gcc4.6.patch \
+		"${FILESDIR}"/3.9.0-atlas.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-minuit \
+		$(use_with atlas) \
+		$(use_with sse) \
+		$(use_with threads)
+}
+
+src_install() {
+	dolib.so lib/*.so* || die "install failed"
+
+	insinto /usr/include/${PN}R3
+	doins include/* || die "no includes"
+
+	dodoc CHANGES docs/* || die "no docs"
+}