Version bump

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

diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog
index d6b96de5d33a4a45871e1829c3266c07c08a803a..89cb07a810dc3240f9fb4daffa42ef6cedf07424 100644 (file)
--- a/sci-libs/libcmatrix/ChangeLog
+++ b/sci-libs/libcmatrix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/libcmatrix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.4 2011/04/21 06:38:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.5 2011/08/31 14:28:27 jlec Exp $
+
+  31 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/3.9.0-atlas.patch,
+  +libcmatrix-3.9.0.ebuild, metadata.xml:
+  Version bump
+
+*libcmatrix-3.9.0 (31 Aug 2011)
+
+  31 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/3.9.0-atlas.patch,
+  +libcmatrix-3.9.0.ebuild, metadata.xml:
+  Version bump
 
   21 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-atlas.patch,
   files/3.2.1-shared.patch, libcmatrix-3.2.1.ebuild:

diff --git a/sci-libs/libcmatrix/Manifest b/sci-libs/libcmatrix/Manifest
index 6046ae199a24171f44b3884c76c5da689d6ad838..8fc8926d75679160655f0da3b7c9938e80f7b246 100644 (file)
--- a/sci-libs/libcmatrix/Manifest
+++ b/sci-libs/libcmatrix/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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.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.2.1.ebuild 1177 RMD160 c9a6b8d1b97c79ef67414372161685d680009780 SHA1 2edaa9916e01499ea61555c8718cf18a1fb8a893 SHA256 80dd189e6503651e1e29dbb152cfc1ea21a1c7ff00395b8a130ed2658b610374
-MISC ChangeLog 905 RMD160 74b8f41f2d22a5bb5fe7ab617c48485e41c911d8 SHA1 693250dbcd525be2cb35c1f7a5e7991943971c08 SHA256 0dc60cd3a29a886a645ac4cf9bbdfd1e7a5d75f134b46ff58d7429f9a961fc50
-MISC metadata.xml 290 RMD160 812d033907b7a0d755e1e38fb368b8eb5384cf02 SHA1 e7fc920fb3801d39c18f549ebac50add4d7f60da SHA256 307cd1defa0ca02a2c515b20c8ce50c80c4deccf845b8c55badd51896cbd8771
+EBUILD libcmatrix-3.9.0.ebuild 1211 RMD160 a85bc947362d10afad75fd9e70487d95ec659618 SHA1 dc78617a8bcca1271541c0585246fd97a4541cb2 SHA256 f39b244a044191933700db9fb6c043be351f55282dc9d161ffcb1ae108a8f511
+MISC ChangeLog 1200 RMD160 b74e2f50bba7127492ef9964e9d32e25333a3111 SHA1 bbaedfa79f72c145bf7e746c99108bbe6d19fa89 SHA256 a0a5070a26f856bbc53a90783d5d8a78e99b26bbcf9bdc1c59e182d5ce1e1cbd
+MISC metadata.xml 295 RMD160 b01bf6efe61a4994f6aa0c5650c07077c380b3b8 SHA1 e05c4889a35f8e9649ba16905b624e1eb2366a9d SHA256 09bc2384fe68e6420da3b531d4e262847d36b61f310fcd431179ad84e2886afd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2v0O0ACgkQgAnW8HDreRbGfQCfdO+Uc7FaSeJCD8MOHgibrlHN
-xy0AoNFZXgUz1mHltI7bH6Fj5gP0rUbw
-=MByV
+iEYEAREKAAYFAk5eRRAACgkQgAnW8HDreRaZKACgyIICj58BMMHpaMbuqt1LvfhB
+gQ4AnRctPKbakyqzhcVkkZU1tcwyCPLE
+=Phoh
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/libcmatrix/files/3.9.0-atlas.patch b/sci-libs/libcmatrix/files/3.9.0-atlas.patch
new file mode 100644 (file)
index 0000000..329e794
--- /dev/null
+++ b/sci-libs/libcmatrix/files/3.9.0-atlas.patch
@@ -0,0 +1,24 @@
+ configure-libraries.ac |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure-libraries.ac b/configure-libraries.ac
+index 6e9579d..a919398 100755
+--- a/configure-libraries.ac
++++ b/configure-libraries.ac
+@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas,
+       AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check)
+ if test x$with_atlas != xno; then
+       FOUNDATLAS=yes
++      PKG_CHECK_MODULES([ATLAS], [cblas])
+       AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no
+               AC_MSG_WARN([ATLAS header files (cblas.h) not found 
+ Is CPPFLAGS is defined to include relevant directory?]))
+@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?]))
+               AC_MSG_WARN([ATLAS library (libatlas.a) not found
+ Is LDFLAGS is defined to include relevant directory?]))
+       if test x$FOUNDATLAS = xyes; then       
+-              LIBS="-lcblas $LIBS"
++              LIBS="$ATLAS_LIBS $LIBS"
+               CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL"
+       else
+               if test x$with_atlas = xyes; then

diff --git a/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild
new file mode 100644 (file)
index 0000000..4da9c6d
--- /dev/null
+++ b/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild,v 1.1 2011/08/31 14:28:27 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/blas-atlas sci-libs/atlas ) )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}R3
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/3.2.1-shared.patch \
+               "${FILESDIR}"/3.2.1-minuit2.patch \
+               "${FILESDIR}"/3.2.1-gcc4.4.patch \
+               "${FILESDIR}"/3.2.1-gcc4.6.patch \
+               "${FILESDIR}"/${PV}-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"
+}

diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml
index ae22c398e6eeee8f7c04a92a33d00f56fa2c71d9..178121cbeb0763b8c641c79ccea46b8d80daec8e 100644 (file)
--- a/sci-libs/libcmatrix/metadata.xml
+++ b/sci-libs/libcmatrix/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='atlas'>Use of atlas blas implementation</flag>
-</use>
+       <herd>sci</herd>
+       <maintainer>
+               <email>jlec@gentoo.org</email>
+       </maintainer>
+       <use>
+               <flag name="atlas">Use of atlas blas implementation</flag>
+       </use>
 </pkgmetadata>