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

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 30 insertions, 133 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/Manifest b/sci-libs/armadillo/Manifest
index 5234c91228c0..7f30da36dae2 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,8 +1,24 @@
-DIST armadillo-2.4.4.tar.gz 2899115 RMD160 39e2e85fcc2ba7e513a4414de45a2eed03bba10a SHA1 257155b726b0974dc48e50000b4484f11208ac39 SHA256 9ba816c4d3414db9267dd3804a60eda2986675b57e8556e1e27bd0fc2d64937d
-DIST armadillo-3.0.1.tar.gz 2918729 RMD160 f91802e500df469a047bc0e64c1c72334915ab27 SHA1 e5715a9a7c939926e2bdc8da6785ca0204c0b52b SHA256 33e15c7b46bf46bf6eb7aa50705ff921cf2945f22ebcdded93a0216c48a22800
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST armadillo-3.0.2.tar.gz 2918529 RMD160 fdcb0934854c1331ede9ae72e74b84cd18f550b7 SHA1 238a389715809f261b8d33f62a87e8358dcedeee SHA256 64e38459dfa4bba97ad92ffcdc855921ff22a12d01c61a14e3049af522ea21c0
-EBUILD armadillo-2.4.4.ebuild 1392 RMD160 aa2194f6b786614f30c07e9420c5c7fb24dcb25f SHA1 fd1f3b3f8e985df2d432c5086bcd3a5b00b72854 SHA256 99a62a5eee24d663715296150a729c4f7e1a34c944bb8848b76225747bb81016
-EBUILD armadillo-3.0.1.ebuild 1392 RMD160 b5673e3c1c029f710e060242a7f37368861728c3 SHA1 f781c08c8afd8e9b83ec1a5f44d7d0dce4086059 SHA256 cfeb4e6d26ccfbf620efd8328873e00da9b3802ba03a4070b43022ef83f6b082
-EBUILD armadillo-3.0.2.ebuild 1392 RMD160 a36d14d1147502e1ed4975184cbdc57ac2a173de SHA1 53474ddeae13e4cbd7aed132e65ec0256ec44cac SHA256 f0dcb5446561dd6a797cd44096cd087df2de84fefdd63171271fec51a6957aa2
-MISC ChangeLog 2268 RMD160 0fb35f846fa82ed1489b0bab329f2a2eb7a0eccc SHA1 7187faa5c736e69822424404c30cd8c438406c3d SHA256 b934314ac37488eff41d11fa9d58f1b5caa7e7ffee6344116fc67fae5c30675d
+EBUILD armadillo-3.0.2.ebuild 1393 RMD160 63fbe005799d3e88bcc794082523ee88142a63ad SHA1 40a85341b3923742284a5c2f546c598a444522a7 SHA256 2fb7a9d610a7b152e4eb12f4775fa56a141a49abc9907c589ee7d4a9b006dd4c
+MISC ChangeLog 2494 RMD160 1cdf34195b650407ae5f808279be613ada286033 SHA1 69ff0060e461102e293f37509b1127390b9514a8 SHA256 344ee1be3d61e73855382193bc12caba94aeed906b27d05d55c699e96a17aa64
 MISC metadata.xml 938 RMD160 5bc8667971361af5e848c038f53acb6e8c974f67 SHA1 3dde90b456147fec82470d6a5804489c1b0c91cb SHA256 c26e73cdee3f87e18188e53385b69ef7d90603a040c5eaf13463c648259c4de3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPv8zrAAoJEOSiRoyO7jvoHgIQAJcHgatnvNTUZAid96wrksRx
+/lwwNYriX9P8pP+U38ZpZazNZS5hKYehVfnH+XwPN/Vq4hmQC9qwzXE0bj15Uu7h
+z4yEMO56maX1MhhVePuiPlUZC/+IPrt4k0JjweQh/i/n0m0TvC6Blpf2oN14CS+7
+gGl3o42fDkjk66o97NxhfnRasPjxjyZ7ewMToBF8E8y6SWL0p9Kd/9vb6J0BXnRd
+V43FLDOi1Vqu/8d3Kmj5547UMW08NmkmXD0gQ9dZXEkxRIV2OLwzMK19AsvYNZYi
+cG2eEkKnfA6NG7QdoyEG215T6SeIiYjzewXD8LR4WNTGAVJKLc1mgd03gPhusJOC
+r1IGF/S+Zv+o0jaW7uTIN/cwAdXhYWSxOh1+NuE5lvcX94WphbFbrc6fe0kK1KB0
+UHl6ql6QF7lKuF4vO0s2OTPUuInJ4BEYMHqc1fGDGp9easOwDKpaSgcEfMWbmjHk
+Ccy0oVr+BD5jDz4BTiTFLJP9M+4nJzdST5s8njn2uXCYyArKo/09r6IjZtHm2fFU
+n1DI3XU3iZUkE/JA80fz1caHxyvRycFo/YQkQ6gOLn2smPYlenAavXZqfSKt5zQz
+abpfK+VtXICc8MeDTYEY+qeYTuqQPBTJ4Om46VzG0sLNn2dYZovonnJ6pLIAI1Dz
+J5JSMIAcYbJQZGWnjfh6
+=ZDDf
+-----END PGP SIGNATURE-----
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