Stabilise latest on amd64 and x86. Seems to work with new sci-libs/gdal. Remove older.

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

4 files changed, 8 insertions, 127 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 00f223afb33b..9aea93d7144e 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.13 2012/05/25 18:18:12 scarabeus Exp $
+
+  25 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -armadillo-2.4.4.ebuild,
+  -armadillo-3.0.1.ebuild, armadillo-3.0.2.ebuild:
+  Stabilise latest on amd64 and x86. Seems to work with new sci-libs/gdal.
+  Remove older.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> armadillo-2.4.4.ebuild,
   armadillo-3.0.1.ebuild, armadillo-3.0.2.ebuild:
diff --git a/sci-libs/armadillo/armadillo-2.4.4.ebuild b/sci-libs/armadillo/armadillo-2.4.4.ebuild
deleted file mode 100644
index 18f148d91c58..000000000000
--- a/sci-libs/armadillo/armadillo-2.4.4.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-2.4.4.ebuild,v 1.2 2012/05/04 08:22:52 jdhore 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}
-	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.0.1.ebuild b/sci-libs/armadillo/armadillo-3.0.1.ebuild
deleted file mode 100644
index 295371210ff0..000000000000
--- a/sci-libs/armadillo/armadillo-3.0.1.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.0.1.ebuild,v 1.2 2012/05/04 08:22:52 jdhore 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}
-	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.0.2.ebuild b/sci-libs/armadillo/armadillo-3.0.2.ebuild
index 2652e784f30a..8132f68eb359 100644
--- a/sci-libs/armadillo/armadillo-3.0.2.ebuild
+++ b/sci-libs/armadillo/armadillo-3.0.2.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.0.2.ebuild,v 1.2 2012/05/04 08:22:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.2.ebuild,v 1.3 2012/05/25 18:18:12 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="atlas blas doc lapack"
 
 RDEPEND=">=dev-libs/boost-1.34