sci-libs/libcmatrix: Version Bump

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

4 files changed, 148 insertions, 5 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/Manifest b/sci-libs/libcmatrix/Manifest
index 19ca7aed6572..bed4d247d013 100644
--- a/sci-libs/libcmatrix/Manifest
+++ b/sci-libs/libcmatrix/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX 3.11.0-shared.patch 2711 RMD160 7e5748e3ba7e870a5968b00701bb6e5174b176db SHA1 afb7a5d994aa70da2b855dfccda8c46d2d12fe80 SHA256 d688fd8d345a820fead80e1ba841f43829ee250fa07f132d86607a5a789b30d6
 AUX 3.2.1-atlas.patch 1236 RMD160 025515694d147603905da15df43cebaa645dc3ef SHA1 933e60b763e634c954cfcbe95d1c37b086b2fba9 SHA256 63598c6d7d4cf3687d3dc1c49d736b5fbe0cb552fbdfd53151bccdd96ca35a34
 AUX 3.2.1-gcc4.4.patch 286 RMD160 8b275ad714b6bedbff03e411187342406f5cf1a7 SHA1 52873e8ef3197148d6c4ddfe0155a3cbfe4fd3db SHA256 e6eff8c9be0f9ac9026d1c00841e81a3f2e00127cbb70bd6e117de262e262fb3
 AUX 3.2.1-gcc4.6.patch 616 RMD160 5c08d0fad7f79cfe8d1c5577d0983f0f04d70c01 SHA1 9245459b34251206cb08595bab96914482c7a8c5 SHA256 fa7a4db6b1899a7a85fa6cd87f0d97ea6330ffc33787039d02330440dbdc30cb
 AUX 3.2.1-minuit2.patch 588 RMD160 7bfc835d79915342e6fdb209cfff29e0e8692bbc SHA1 374e8b92a1263ab488089303c6cbb46a28e7929f SHA256 099d47445e6efb340831b4a1f6210b02eb2a2ccf6f680f982761defcadfd1962
 AUX 3.2.1-shared.patch 2678 RMD160 d7f289d7845364211f4398b37891b90bdff1dfd2 SHA1 794f48aaf9de460307e235a6108d09a43f644121 SHA256 611c4bb56ed43b18e194620550b99e22d2b37f1475a18eaee1b01df96dda9b99
 AUX 3.9.0-atlas.patch 983 RMD160 996166f58548280a8ef4e48088ae3dc1fd18a3fd SHA1 cea5d6f7838d84ceaafbcc9247e80ec50e7f981c SHA256 99820fb2a3a29aab8a6f1e34bcbf93d99b3ae293065b007375ce29fbacb327e1
+DIST libcmatrix-3.11.0.tar.gz 1064634 RMD160 7354cf85e927b13bd6e0d16941ceffb2bf0c5443 SHA1 d3ffd0d0c1933218f497ebe079bd9427e46a9a21 SHA256 0cd4b1f921235ea64d7fbd8d814fbe639bf9ddb23e4a6d3182cf2788cc23f8b8
 DIST libcmatrix-3.2.1.tar.gz 1151322 RMD160 d5f41d7fde34039482e3c971ecff84177ba5c064 SHA1 4612d4d0be34566bca83fe8b8a17033cd0457375 SHA256 6b4cb3ae4e1ed0a33190b09cd15a72c0938e3b598dbda39ca1557b482731b5c4
 DIST libcmatrix-3.9.0.tar.gz 1067645 RMD160 800601adbc25a6a349cf6868b087742578385a2c SHA1 acc73bc5102a7acc5da228f2beebc4d1f8d16268 SHA256 19103a2f51073113379ce9b005f9db950ea28d39fedfb9660521bb7daf13d386
+EBUILD libcmatrix-3.11.0.ebuild 1212 RMD160 c913f601394de60dc86715d0cfadc311ac2a2ecf SHA1 266d1e3842ff12767cad54425c83216951193f10 SHA256 fd5a7d5379fa659382256c11c6da97895e4a29eb2340b403aad6a480bc30918d
 EBUILD libcmatrix-3.2.1.ebuild 1177 RMD160 c9a6b8d1b97c79ef67414372161685d680009780 SHA1 2edaa9916e01499ea61555c8718cf18a1fb8a893 SHA256 80dd189e6503651e1e29dbb152cfc1ea21a1c7ff00395b8a130ed2658b610374
 EBUILD libcmatrix-3.9.0.ebuild 1211 RMD160 9d72f09d0841e2ef5e4f747f525f234600b20d04 SHA1 117522232636d79759888ba279b30dda501e2b40 SHA256 0641480f6431fe3b7f8e91f4d4b671cfcd2f67b54cc5adc1c2fdd35fd0dae63c
-MISC ChangeLog 1304 RMD160 71b5ece6835c0e7fcf7591bf67923efa35b388c6 SHA1 2f7edb609dedfe260de4ca4eabbe28778fb47207 SHA256 cc273dbe0c1852fd468e6a6c78d01f8b1841ba0c3fc79f4b5d26139685258ffd
+MISC ChangeLog 1458 RMD160 7a7421c5e1b256de21337d2226500e8a629011ec SHA1 41c9af74b716a92dbea668026f4b0f8dbf8369a6 SHA256 130bdb2a192dc2b6e3563cf664de63f5b629b801e268b597d556372a5bcaa814
 MISC metadata.xml 295 RMD160 b01bf6efe61a4994f6aa0c5650c07077c380b3b8 SHA1 e05c4889a35f8e9649ba16905b624e1eb2366a9d SHA256 09bc2384fe68e6420da3b531d4e262847d36b61f310fcd431179ad84e2886afd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+jm34ACgkQgAnW8HDreRae2QCgh1r0NBksixd92I6i8YxYE/38
-WrcAnihz+Ql92qeBFsi3g013NadrPwpD
-=mWAb
+iEYEAREKAAYFAk+6WpAACgkQgAnW8HDreRYcqQCfTzD97Tu069FhB256HQ/5XtJo
+P4MAoJw6snM4Iy3a5H/4PP66rYevOSSz
+=xns0
 -----END PGP SIGNATURE-----
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"
+}