Version Bump, #373715

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

6 files changed, 98 insertions, 22 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 7945d2e2ca16..c58b01674943 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2011/05/04 00:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.3 2011/07/18 01:38:06 jlec Exp $
+
+*armadillo-2.0.2 (18 Jul 2011)
+
+  18 Jul 2011; Justin Lecher <jlec@gentoo.org> armadillo-1.1.6.ebuild,
+  armadillo-1.2.0.ebuild, +armadillo-2.0.2.ebuild, metadata.xml:
+  Version Bump, #373715
 
 *armadillo-1.2.0 (04 May 2011)
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 60788bda3f3b..72d30808935d 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
-EBUILD armadillo-1.1.6.ebuild 1388 RMD160 0187f13365213b62769a3731986e0c1b0b3288e3 SHA1 f409269b5b83c077e1e1ef40ca1061106ad694aa SHA256 b227e7d4ac125520c349f4376dd2d7b6d1d481e587a02cac9596d58a9142564c
-EBUILD armadillo-1.2.0.ebuild 1395 RMD160 8176468a788cdf23719df191621594cbee4de479 SHA1 b309da98319c1158efccc68da1fb416cd2cd9de1 SHA256 54e8ca1285b44bf5e846c8e2feea2c5484bcce81d42fa5ee457d557d2425e632
-MISC ChangeLog 686 RMD160 0f03814c8f495b5555b81c5ccdcf29af202d3575 SHA1 c3e80e4bae3a5730e505afcaf86278c3c7407ee4 SHA256 f21418d0460dddd6a13f5a96b3c3e9393d490e8a641e5091ff4b280e7a07c41f
-MISC metadata.xml 935 RMD160 38e6aad6ddef5267ac67645d8b1bd11c9732d239 SHA1 0c4a7925a4f17a9b6afb06576ee0868088c63d92 SHA256 ed59337148b690b381dfd0873e0f0c8cbd7f939cceabd348e2709e9d901496c0
+DIST armadillo-2.0.2.tar.gz 2885519 RMD160 8f142c12099c273ab2f38dcc3a1c53d37dfc1d5a SHA1 e9df63160650dd8e708cc0bb299f15904e0369ca SHA256 ac6a164402d3e911ff1f486fdbba701fcdd1d488da3580a849d444ba0eaf9146
+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
+MISC metadata.xml 938 RMD160 5bc8667971361af5e848c038f53acb6e8c974f67 SHA1 3dde90b456147fec82470d6a5804489c1b0c91cb SHA256 c26e73cdee3f87e18188e53385b69ef7d90603a040c5eaf13463c648259c4de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3AnmgACgkQ1ycZbhPLE2BFRQCeKc9m7Lq6bfCwKkqC86TMq7By
-CO0An3Fbs7n27k/n87/mac8XqCC3HX3l
-=9Lwc
+iEYEAREKAAYFAk4jjoQACgkQgAnW8HDreRYgPwCgjtlnUqkczJcdQRGO3d0XXWi2
+hyYAoLe6h3+EQrK8d72FL3xnvAzz4Tdg
+=BDws
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-1.1.6.ebuild b/sci-libs/armadillo/armadillo-1.1.6.ebuild
index d588206e7ba1..e2fff75445ee 100644
--- a/sci-libs/armadillo/armadillo-1.1.6.ebuild
+++ b/sci-libs/armadillo/armadillo-1.1.6.ebuild
@@ -1,9 +1,11 @@
 # 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-1.1.6.ebuild,v 1.1 2011/03/06 19:23:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild,v 1.2 2011/07/18 01:38:06 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 CMAKE_IN_SOURCE_BUILD=1
+
 inherit cmake-utils
 
 DESCRIPTION="Streamlined C++ linear algebra library"
@@ -15,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="atlas blas doc lapack"
 
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+	>=dev-libs/boost-1.34
 	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
@@ -25,7 +28,7 @@ DEPEND="${DEPEND}
 
 src_prepare() {
 	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/sci-libs/armadillo/armadillo-1.2.0.ebuild b/sci-libs/armadillo/armadillo-1.2.0.ebuild
index 9054e841231e..b2c3d6d5c9d5 100644
--- a/sci-libs/armadillo/armadillo-1.2.0.ebuild
+++ b/sci-libs/armadillo/armadillo-1.2.0.ebuild
@@ -1,9 +1,11 @@
 # 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-1.2.0.ebuild,v 1.1 2011/05/04 00:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild,v 1.2 2011/07/18 01:38:06 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 CMAKE_IN_SOURCE_BUILD=1
+
 inherit cmake-utils
 
 DESCRIPTION="Streamlined C++ linear algebra library"
@@ -15,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="atlas blas doc lapack"
 
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+	>=dev-libs/boost-1.34
 	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
diff --git a/sci-libs/armadillo/armadillo-2.0.2.ebuild b/sci-libs/armadillo/armadillo-2.0.2.ebuild
new file mode 100644
index 000000000000..669793bb75a9
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-2.0.2.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.0.2.ebuild,v 1.1 2011/07/18 01:38:06 jlec Exp $
+
+EAPI=3
+
+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
+}
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 9dc9f77e8504..8997101096bd 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   Armadillo is a C++ linear algebra library (matrix maths) aiming
   towards a good balance between speed and ease of use. Integer,
   floating point and complex numbers are supported, as well as a
@@ -14,8 +14,7 @@
   need for temporaries. This is accomplished through recursive
   templates and template meta-programming.
 </longdescription>
-<use>
-  <flag name='atlas'>Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
-</use>
+	<use>
+		<flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
+	</use>
 </pkgmetadata>
-