Version bump

(Portage version: 2.1.10.10/cvs/Linux x86_64)

4 files changed, 9 insertions, 129 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index c42035f1faa0..ca18eaa13e74 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.4 2011/08/06 21:41:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.5 2011/09/01 04:50:01 bicatali Exp $
+
+*armadillo-2.2.3 (01 Sep 2011)
+
+  01 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org> -armadillo-1.1.6.ebuild,
+  -armadillo-1.2.0.ebuild, -armadillo-2.0.2.ebuild, +armadillo-2.2.3.ebuild:
+  Version bump
 
 *armadillo-2.2.1 (06 Aug 2011)
 
diff --git a/sci-libs/armadillo/armadillo-1.2.0.ebuild b/sci-libs/armadillo/armadillo-1.2.0.ebuild
deleted file mode 100644
index b2c3d6d5c9d5..000000000000
--- a/sci-libs/armadillo/armadillo-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.2 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/armadillo-2.0.2.ebuild b/sci-libs/armadillo/armadillo-2.0.2.ebuild
deleted file mode 100644
index 669793bb75a9..000000000000
--- a/sci-libs/armadillo/armadillo-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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/armadillo-1.1.6.ebuild b/sci-libs/armadillo/armadillo-2.2.3.ebuild
index e2fff75445ee..e85fb98a96b5 100644
--- a/sci-libs/armadillo/armadillo-1.1.6.ebuild
+++ b/sci-libs/armadillo/armadillo-2.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2011/07/18 01:38:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.2.3.ebuild,v 1.1 2011/09/01 04:50:01 bicatali Exp $
 
-EAPI=3
+EAPI=4
 
 CMAKE_IN_SOURCE_BUILD=1