Version bump. Removed old. Restore doc flag

(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 16 insertions, 71 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ea5714875747..a1b18c8af26c 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.18 2012/11/10 09:54:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.19 2012/11/20 00:06:33 bicatali Exp $
+
+*armadillo-3.4.4 (20 Nov 2012)
+
+  20 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.4.4.ebuild,
+  -armadillo-3.2.2.ebuild, -armadillo-3.2.4.ebuild, metadata.xml:
+  Version bump. Removed old. Restore doc flag
 
   10 Nov 2012; Justin Lecher <jlec@gentoo.org> armadillo-3.4.3.ebuild:
   Drop USE=doc and fix installation of docs, #442284
diff --git a/sci-libs/armadillo/armadillo-3.2.2.ebuild b/sci-libs/armadillo/armadillo-3.2.2.ebuild
deleted file mode 100644
index 0b0e768281a7..000000000000
--- a/sci-libs/armadillo/armadillo-3.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.2.2.ebuild,v 1.1 2012/06/07 18:44:46 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 ~ppc ~ppc64 ~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}
-	virtual/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/armadillo-3.2.4.ebuild b/sci-libs/armadillo/armadillo-3.4.4.ebuild
index 30c9c7337c3d..7d0d6d879738 100644
--- a/sci-libs/armadillo/armadillo-3.2.4.ebuild
+++ b/sci-libs/armadillo/armadillo-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.2.4.ebuild,v 1.1 2012/07/20 21:51:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.1 2012/11/20 00:06:33 bicatali Exp $
 
 EAPI=4
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="atlas blas doc examples lapack"
 
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+	dev-libs/boost
 	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
@@ -60,7 +61,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	dodoc README.txt
-	use doc && dodoc docs/*pdf
+	use doc && dodoc *pdf && dohtml *html
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 8997101096bd..4a8f6b75bedb 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,7 +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>