Version bump

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

4 files changed, 14 insertions, 73 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ca18eaa13e74..1ff2ed5a1d9f 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.5 2011/09/01 04:50:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.6 2011/11/27 06:09:39 bicatali Exp $
+
+*armadillo-2.2.5 (27 Nov 2011)
+
+  27 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org> -armadillo-2.2.1.ebuild,
+  -armadillo-2.2.3.ebuild, +armadillo-2.2.5.ebuild:
+  Version bump
 
 *armadillo-2.2.3 (01 Sep 2011)
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b0e5e7db0bf3..d8bfc4825cff 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST armadillo-2.2.1.tar.gz 2888669 RMD160 25a43b91e7b2c084e003b168a4fdd1234c4e613d SHA1 65ab922627c5c411fa9795131caad189cbfb8689 SHA256 c1626acc0063b5d30f2563814584974b8a7ba37761200a9dbb6ae818059355e1
-DIST armadillo-2.2.3.tar.gz 2888375 RMD160 86dd5e5217d264852eddf6baeafa471e7d88da49 SHA1 32b25242be6c3c42a801dd64270a06c94ae56648 SHA256 ae9f0727a594fba65eb3cf1a8c724e89ec03f23c49922bb14400148e7da39db7
-EBUILD armadillo-2.2.1.ebuild 1397 RMD160 6330c2f70a330593d283c17c7bb00ea986260e97 SHA1 feff9a09a4f32ed04ed5e81dea976409f338163f SHA256 bb01a3459eabe3715412e1f769411774986650cb05c3f92f97a751e6c5e45ab0
-EBUILD armadillo-2.2.3.ebuild 1397 RMD160 cb96d55058a299c5e6cb5ab7e669d486b0cd44c2 SHA1 6dfd040d716f427fb961ae2847511a601cf439fb SHA256 eca35b69879053a21535c74c8736f43ac1fb348f9111c68b425e43eb50b547b1
-MISC ChangeLog 1204 RMD160 5c9063affe470d8f847b9a7c47fad83d432ed902 SHA1 5f6675c0663e51d814a9cf69e1131d78d6f4c0f0 SHA256 ae2cd7605b2962ee27ebde9418142a19673c3956903cac56b6bb0d152e68c1fa
+DIST armadillo-2.2.5.tar.gz 2893349 RMD160 8d87763879c864443bc0a85956c33c278e1ba9c4 SHA1 a9b33e48443c6d86ab1e3c50597a1b228f1316b5 SHA256 71b1d2b6cbc6f6de5488bc2fbffb67d2272fc977bbb98c0aed64ea6428d3fa96
+EBUILD armadillo-2.2.5.ebuild 1397 RMD160 b53c25ee07df531f4fd52f394abe94f86cdc25b7 SHA1 68e536fb75f3db74dea84f746ad7e2008663ceac SHA256 cfaf469ecee5943b4f49b2c960a1feb76b55e90889426839aae4814f6bb7f4fa
+MISC ChangeLog 1384 RMD160 11f5fa15466d2f92e1bbc21a18b1115f1b2cc98c SHA1 bfb570951adefbefe8a1b12ed4cc4cee465e764a SHA256 834b1f989d3fd51b306bb7fe8e85fd41a78a5fbb85c4bb50bd2a234cbc5c8cec
 MISC metadata.xml 938 RMD160 5bc8667971361af5e848c038f53acb6e8c974f67 SHA1 3dde90b456147fec82470d6a5804489c1b0c91cb SHA256 c26e73cdee3f87e18188e53385b69ef7d90603a040c5eaf13463c648259c4de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5fDywACgkQ1ycZbhPLE2D4ngCgpuhaO27/23TgEwz9CLYaYY/a
-pM0AnRNU01SvjQG1cupo6wSxKEw9k+V9
-=q5ng
+iEYEARECAAYFAk7R1CwACgkQ1ycZbhPLE2B6gQCglOfUKAR5x+ISlQOFL72JZCf8
+Ql4AmwVWx7/EPFdBPz+/cHEAw9ZYXUmx
+=dubq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-2.2.3.ebuild b/sci-libs/armadillo/armadillo-2.2.3.ebuild
deleted file mode 100644
index e85fb98a96b5..000000000000
--- a/sci-libs/armadillo/armadillo-2.2.3.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.2.3.ebuild,v 1.1 2011/09/01 04:50:01 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 ~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.2.1.ebuild b/sci-libs/armadillo/armadillo-2.2.5.ebuild
index bfac4aa1f4bc..f7b5603dad53 100644
--- a/sci-libs/armadillo/armadillo-2.2.1.ebuild
+++ b/sci-libs/armadillo/armadillo-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.1 2011/08/06 21:41:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.2.5.ebuild,v 1.1 2011/11/27 06:09:39 bicatali Exp $
 
 EAPI=4