Bump

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index c58b016749436391bc6420220babeed3ad7c77f1..c42035f1faa07945a670d9eaac6ac421fbabf3fd 100644 (file)
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.3 2011/07/18 01:38:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.4 2011/08/06 21:41:13 bicatali Exp $
+
+*armadillo-2.2.1 (06 Aug 2011)
+
+  06 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-2.2.1.ebuild:
+  Bump
 
 *armadillo-2.0.2 (18 Jul 2011)
 

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 72d30808935d3c57892a4a657f1fb6f62cc6c7f5..8c47b7d4dd3e6086f54943e38ce1f9eaf51d2293 100644 (file)
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST armadillo-1.1.6.tar.gz 2861337 RMD160 4a8fe4ce8b33676f2a498fae0245dd502328ec94 SHA1 acc2fecb3ce801a53991a37df826c20c8798b037 SHA256 aefe705a22328cddf229c72ee058f4308a09406591e5b03e9487704a42d82b13
 DIST armadillo-1.2.0.tar.gz 2865477 RMD160 e150425d1c03470256f75b635765b849de40fd48 SHA1 ab5d4037ef2ee997b3a78809bc069f37305da1a7 SHA256 859dc5a2d6934a46bd18b42492a0f1c7b97b201c6cc95b4352b8c5b9631e69a3
 DIST armadillo-2.0.2.tar.gz 2885519 RMD160 8f142c12099c273ab2f38dcc3a1c53d37dfc1d5a SHA1 e9df63160650dd8e708cc0bb299f15904e0369ca SHA256 ac6a164402d3e911ff1f486fdbba701fcdd1d488da3580a849d444ba0eaf9146
+DIST armadillo-2.2.1.tar.gz 2888669 RMD160 25a43b91e7b2c084e003b168a4fdd1234c4e613d SHA1 65ab922627c5c411fa9795131caad189cbfb8689 SHA256 c1626acc0063b5d30f2563814584974b8a7ba37761200a9dbb6ae818059355e1
 EBUILD armadillo-1.1.6.ebuild 1393 RMD160 5d928506ec311d9975cfa66a9cda1a8970c7e14a SHA1 9fbc3c632ee51796986c121f795e03a5a8af42bf SHA256 dd3db0aa6b4fb576aad374a79dd05cfd688fc1bccba8ffdde21394461bace637
 EBUILD armadillo-1.2.0.ebuild 1393 RMD160 5ef4ca4410cef73740ac4c950efa3d0dce42708f SHA1 2c107b8d0adff2b638c951eb6e61ad454dc2fbf3 SHA256 82948e337cff69acc97500e83ad1b5a3ce95dc183f66508805b85744bb40481a
 EBUILD armadillo-2.0.2.ebuild 1393 RMD160 ce31e4b54a5555b1386e9d23b727c7040ea62d10 SHA1 bca573ece5a70f9dd8632ea23ecb526d96c75c49 SHA256 fcf2e7ffa27b97b20864f0decb57df04b1142bd84ac2f84f560bc49ddedfd962
-MISC ChangeLog 875 RMD160 8d71a0c8dd962c5c86e6f3a54cdfdaa2b5ebd816 SHA1 d2dd5bc8e5475a633f6df4b71e8edaee028db5e9 SHA256 9896f5c8e8f59e005475fa2e921b2852e687358c2a1c634c70aa49c35d8a36cd
+EBUILD armadillo-2.2.1.ebuild 1397 RMD160 6330c2f70a330593d283c17c7bb00ea986260e97 SHA1 feff9a09a4f32ed04ed5e81dea976409f338163f SHA256 bb01a3459eabe3715412e1f769411774986650cb05c3f92f97a751e6c5e45ab0
+MISC ChangeLog 999 RMD160 56f7d77a350b7073a769a855359ba9a8c8581381 SHA1 149167ebfd853eb3a3881a35bb6b2df0642b0d87 SHA256 fdb1c9afc86159ebb4dd6016b4e377ee415d70aec7317382a2d9b252eac93ca9
 MISC metadata.xml 938 RMD160 5bc8667971361af5e848c038f53acb6e8c974f67 SHA1 3dde90b456147fec82470d6a5804489c1b0c91cb SHA256 c26e73cdee3f87e18188e53385b69ef7d90603a040c5eaf13463c648259c4de3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4jjoQACgkQgAnW8HDreRYgPwCgjtlnUqkczJcdQRGO3d0XXWi2
-hyYAoLe6h3+EQrK8d72FL3xnvAzz4Tdg
-=BDws
+iEYEARECAAYFAk49tQIACgkQ1ycZbhPLE2BWywCgr9BwwKH0/btGr7Ma0Cx+f5Y7
+uWYAoJxy1rrYJM/z2xUfMVPMkWmLUbO2
+=LLuO
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/armadillo/armadillo-2.2.1.ebuild b/sci-libs/armadillo/armadillo-2.2.1.ebuild
new file mode 100644 (file)
index 0000000..bfac4aa
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-2.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.2.1.ebuild,v 1.1 2011/08/06 21:41:13 bicatali Exp $
+
+EAPI=4
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atlas blas doc lapack"
+
+RDEPEND="
+       >=dev-libs/boost-1.34
+       atlas? ( sci-libs/lapack-atlas )
+       blas? ( virtual/blas )
+       lapack? ( virtual/lapack )"
+
+DEPEND="${DEPEND}
+       dev-util/pkgconfig"
+
+src_prepare() {
+       # avoid the automagic cmake macros
+       sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+}
+
+src_configure() {
+       local mycmakeargs=()
+       if use blas; then
+               mycmakeargs+=(
+                       -DBLAS_FOUND=ON
+                       -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+               )
+       fi
+       if use lapack; then
+               mycmakeargs+=(
+                       -DLAPACK_FOUND=ON
+                       -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+               )
+       fi
+       if use atlas; then
+               mycmakeargs=(
+                       -DCBLAS_FOUND=ON
+                       -DCLAPACK_FOUND=ON
+                       -DATLAS_INCLUDE_DIR="${EPREFIX}/usr/include/atlas/"
+                       -DCBLAS_LIBRARIES="$(pkg-config --libs cblas)"
+                       -DCLAPACK_LIBRARIES="-L${EPREFIX}/usr/lib64/lapack/atlas -llapack"
+               )
+       fi
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+       use doc && dodoc docs/*pdf
+}