Version Bump, #373715

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

5 files changed, 88 insertions, 14 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/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>
-