Version bump

Package-Manager: portage-HEAD

6 files changed, 8 insertions, 228 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a75b8d933..e7b3f374c 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.300.8 (02 Jun 2014)
+
+  02 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.8.ebuild,
+  -armadillo-3.930.0.ebuild, -armadillo-4.100.2.ebuild,
+  -armadillo-4.300.0.ebuild, -files/armadillo-3.820.1-hdf5.patch:
+  Version bump
+
 *armadillo-4.300.0 (06 May 2014)
 
   06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.0.ebuild:
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index ada220fd8..e6ac52b9e 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,4 +1,2 @@
-DIST armadillo-3.930.0.tar.gz 3250101 SHA256 3d0bdb313fa2f553536a5d978f8d56e0284f6ec423cfd4ad1200336d848ba95e SHA512 44bae7ea03a28b7f2613fb9525b8167b5446842e1d6573f857340db30667bbf847d90837bcca20b04fa990cfb818ab33b2372088880bc4d6c676019719bd66a7 WHIRLPOOL c96b555a24311f7f76d422ff5c749420f6c8c6d80524720e279a72597e9b0841b80d93fd410f6246d03d7752617e85f0ffbd521c7b5c6edca978935098767b19
-DIST armadillo-4.100.2.tar.gz 5478250 SHA256 edd8695ce4f84196626cc56a17247a955506d9a140d23d6b1df0924b19146275 SHA512 e2c7c74f25fdfe728fa491170abe13ce740a4f754adc4b2c159ac1003af435b9add4ed6c2cca0df8bd4280e9a482ca52ed781477f4c70763547983e5387b5f6c WHIRLPOOL 99766e68e0a1b1d41453cf5dfd74ff507b2cfe71b490a750d562f40d3ac4780c0649c36673ccc0687391ecc7f11836690443963ce9f9c5778b75dadd4ba9a746
 DIST armadillo-4.200.0.tar.gz 5479492 SHA256 77d4c64346da9fb90d1150c290919e49530cef45713e830375e04566218335ff SHA512 83afccbf0ed4b8a7873b5fc5d47975600a71d7130e59716d9f044a2cd58343e4d0f5c0037abd1e6d110413d0192c5f0f87a2f3af8183189bd82032414237244d WHIRLPOOL c785cc5b89a542c276ec3cddd56ee40a766960353d7174356c0e891dd8744d08bff350405c3b629a7a4b66a4a8b7564697faa7e9600e57065a3f1cd5e1180bd9
-DIST armadillo-4.300.0.tar.gz 5483741 SHA256 8490f02abb17027fdb657b8b86942a951efd8fad1d9daae6327beeeeb46dbf78 SHA512 01e6eb4ffe0a7668f7bf354b357099091662e2a41940d83591f6318d36e52c28a6525cad77461fa29ea5749e7d006d3fd0a8b2341c5909b3258bd63d53c38143 WHIRLPOOL 69416931cf186909fec376e06000947c6f310f39ac362f4a73dc3449bf1531ff12617f1158afaf0443e49c7dee70007cadba287e729e549d607708b1e85dcb84
+DIST armadillo-4.300.8.tar.gz 5484286 SHA256 1d1a77ad7a74e8b4a74d7b71c5e3fe488e26283907b316618de0a8558c60173a SHA512 3b5d6c9bcefb427e1dc15c259bd24154b6d2138a75be49275e2be5a456f4e2357852c7520b171109ee2b6a716c8ef2a19dea8c2a9b908b13fc2a1624500d54f3 WHIRLPOOL 90789113a10ca0e0264af3212f2c59f6f0b68cf726c22935433bc5d396c763143e6bd1b9d961ee6e5fd78adad3ee58bf1b532931761d9fbe51e99179beebf789
diff --git a/sci-libs/armadillo/armadillo-3.930.0.ebuild b/sci-libs/armadillo/armadillo-3.930.0.ebuild
deleted file mode 100644
index 59be372de..000000000
--- a/sci-libs/armadillo/armadillo-3.930.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas debug doc examples hdf5 int64 lapack tbb"
-
-RDEPEND="
-	dev-libs/boost
-	atlas? ( sci-libs/atlas[lapack] )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )"
-DEPEND="${DEPEND}
-	atlas? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	lapack? ( virtual/pkgconfig )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.820.1-{hdf5,example-makefile}.patch
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use hdf5 ARMA_USE_HDF5)
-		$(cmake-utils_use int64 ARMA_64BIT_WORD)
-		$(cmake-utils_use tbb ARMA_TBB_ALLOC)
-	)
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	if use atlas; then
-		local c=atlas-cblas l=atlas-clapack
-		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-		mycmakeargs+=(
-			-DCBLAS_FOUND=ON
-			-DCLAPACK_FOUND=ON
-			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake CXXFLAGS="-I../include ${CXXFLAGS}" EXTRA_LIB_FLAGS="-L.."
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-4.100.2.ebuild b/sci-libs/armadillo/armadillo-4.100.2.ebuild
deleted file mode 100644
index 6dab24828..000000000
--- a/sci-libs/armadillo/armadillo-4.100.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	atlas? ( sci-libs/atlas[lapack] )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )"
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	atlas? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.000.3-hdf5.patch \
-		"${FILESDIR}"/${PN}-3.820.1-example-makefile.patch
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
-		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	fi
-	if use atlas; then
-		local c=atlas-cblas l=atlas-clapack
-		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-		mycmakeargs+=(
-			-DCBLAS_FOUND=ON
-			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-			-DCLAPACK_FOUND=ON
-			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-		)
-	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-4.300.0.ebuild b/sci-libs/armadillo/armadillo-4.300.8.ebuild
index 96ac5823d..96ac5823d 100644
--- a/sci-libs/armadillo/armadillo-4.300.0.ebuild
+++ b/sci-libs/armadillo/armadillo-4.300.8.ebuild
diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
deleted file mode 100644
index f294e7bf5..000000000
--- a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2013-05-24 21:14:49.626395820 -0700
-+++ CMakeLists.txt	2013-05-24 21:15:10.724511364 -0700
-@@ -222,11 +222,11 @@
- #   find_package(HDF5)
- #   message(STATUS "HDF5_FOUND     = ${HDF5_FOUND}")
- #   
--#   if(HDF5_FOUND)
--#     set(ARMA_USE_HDF5 true)
--#     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
--#     set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
--#   endif()
-+if(HDF5_FOUND)
-+    set(ARMA_USE_HDF5 true)
-+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
-+    set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
-+endif()
- # endif()
- 
-