[gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-01-12 20:24 Christoph Junghans
  0 siblings, 0 replies; 43+ messages in thread
From: Christoph Junghans @ 2015-01-12 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e4c30c6ad4e407eae2da64e589ed7c951f0dafbc
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 11:38:08 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 11:38:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4c30c6a

sci-libs/armadillo-4.600.2: Version bump, fix examples install location

---
 sci-libs/armadillo/ChangeLog                |   8 +-
 sci-libs/armadillo/armadillo-4.600.2.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ce386e2..92146ca 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/armadillo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.600.2 (11 Jan 2015)
+
+  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.600.2.ebuild:
+  Version bump, fix examples install location
+
 *armadillo-4.300.9 (28 Jun 2014)
 
   28 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-4.600.2.ebuild b/sci-libs/armadillo/armadillo-4.600.2.ebuild
new file mode 100644
index 0000000..35856d7
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.600.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2020-09-22 12:14 Aisha Tammy
  0 siblings, 0 replies; 43+ messages in thread
From: Aisha Tammy @ 2020-09-22 12:14 UTC (permalink / raw
  To: gentoo-commits

commit:     882077ddaa6702ff9b2937f438ca77758176f454
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 12:08:27 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 12:09:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=882077dd

sci-libs/armadillo: drop package

present in ::gentoo

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-libs/armadillo/armadillo-6.700.5.ebuild | 121 ----------------------------
 sci-libs/armadillo/metadata.xml             |  43 ----------
 2 files changed, 164 deletions(-)

diff --git a/sci-libs/armadillo/armadillo-6.700.5.ebuild b/sci-libs/armadillo/armadillo-6.700.5.ebuild
deleted file mode 100644
index eb62a2209..000000000
--- a/sci-libs/armadillo/armadillo-6.700.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs
-
-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/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	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
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
deleted file mode 100644
index af1c24703..000000000
--- a/sci-libs/armadillo/metadata.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Armadillo is a C++ linear algebra library (matrix maths) aiming
-towards a good balance between speed and ease of use. Integer,
-floating point and complex numbers are supported, as well as a
-subset of trigonometric and statistics functions. Various matrix
-decompositions are provided through optional integration with LAPACK
-and ATLAS libraries. 
-A delayed evaluation approach is employed (during compile time) to
-combine several operations into one and reduce (or eliminate) the
-need for temporaries. This is accomplished through recursive
-templates and template meta-programming.
-</longdescription>
-	<use>
-		<flag name="atlas">
-Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
-clapack
-</flag>
-		<flag name="arpack">
-Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
-</flag>
-		<flag name="mkl">
-Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
-</flag>
-		<flag name="tbb">
-Use matrix allocation from the Threads Building Blocks
-<pkg>dev-cpp/tbb</pkg>
-</flag>
-		<flag name="superlu">
-Use SuperLU for sparse linear equation solving
-<pkg>sci-libs/superlu</pkg>
-</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">arma</remote-id>
-	</upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2016-05-17  9:19 Marius Brehler
  0 siblings, 0 replies; 43+ messages in thread
From: Marius Brehler @ 2016-05-17  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     74d13228abb2edd785000b1d03c050d04b9c87be
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 18:22:16 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon May  9 18:22:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=74d13228

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.28

 sci-libs/armadillo/armadillo-4.650.4.ebuild        | 112 -------------------
 sci-libs/armadillo/armadillo-5.600.2.ebuild        | 121 ---------------------
 sci-libs/armadillo/armadillo-6.600.5.ebuild        | 121 ---------------------
 ...llo-6.200.5.ebuild => armadillo-6.700.5.ebuild} |  19 ++--
 4 files changed, 10 insertions(+), 363 deletions(-)

diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild
deleted file mode 100644
index 646ded7..0000000
--- a/sci-libs/armadillo/armadillo-4.650.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-5.600.2.ebuild b/sci-libs/armadillo/armadillo-5.600.2.ebuild
deleted file mode 100644
index 6682a81..0000000
--- a/sci-libs/armadillo/armadillo-5.600.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-6.600.5.ebuild b/sci-libs/armadillo/armadillo-6.600.5.ebuild
deleted file mode 100644
index aba1f7b..0000000
--- a/sci-libs/armadillo/armadillo-6.600.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-6.200.5.ebuild b/sci-libs/armadillo/armadillo-6.700.5.ebuild
similarity index 86%
rename from sci-libs/armadillo/armadillo-6.200.5.ebuild
rename to sci-libs/armadillo/armadillo-6.700.5.ebuild
index aba1f7b..e01555a 100644
--- a/sci-libs/armadillo/armadillo-6.200.5.ebuild
+++ b/sci-libs/armadillo/armadillo-6.700.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake-utils toolchain-funcs multilib eutils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
@@ -48,9 +48,9 @@ src_prepare() {
 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)
+		-DARMA_EXTRA_DEBUG="$(usex debug)"
+		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
+		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
 	)
 	if use arpack; then
 		mycmakeargs+=(
@@ -93,6 +93,7 @@ src_configure() {
 		mycmakeargs+=(
 			-DSuperLU_FOUND=ON
 			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
 		)
 	fi
 
@@ -102,10 +103,10 @@ src_configure() {
 src_test() {
 	pushd examples > /dev/null
 	emake \
+		CXX="$(tc-getCXX)" \
 		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+		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
 }
@@ -113,7 +114,7 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
+	use doc && dodoc *pdf *html
 	if use examples; then
 		insinto /usr/share/examples/${PF}
 		doins -r examples/*


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2016-04-01 14:09 Marius Brehler
  0 siblings, 0 replies; 43+ messages in thread
From: Marius Brehler @ 2016-04-01 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d37f3e3ea912ce66fb2247fd7ffde1bafd782e75
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Apr  1 14:02:48 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Fri Apr  1 14:02:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d37f3e3e

sci-libs/armadillo: Version bump to 6.600.5

Package-Manager: portage-2.2.26

 sci-libs/armadillo/armadillo-6.600.5.ebuild | 121 ++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/sci-libs/armadillo/armadillo-6.600.5.ebuild b/sci-libs/armadillo/armadillo-6.600.5.ebuild
new file mode 100644
index 0000000..aba1f7b
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-6.600.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
+	superlu? ( sci-libs/superlu )
+"
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2016-04-01 14:09 Marius Brehler
  0 siblings, 0 replies; 43+ messages in thread
From: Marius Brehler @ 2016-04-01 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     0ec83e8a59b97bd6ce02118a9218b24d3be2ad2d
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Apr  1 14:00:45 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Fri Apr  1 14:00:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ec83e8a

sci-libs/armadillo: Version bump from 6.200.3 to 6.200.5

Package-Manager: portage-2.2.26

 sci-libs/armadillo/{armadillo-6.200.3.ebuild => armadillo-6.200.5.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/armadillo/armadillo-6.200.3.ebuild b/sci-libs/armadillo/armadillo-6.200.5.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-6.200.3.ebuild
rename to sci-libs/armadillo/armadillo-6.200.5.ebuild


^ permalink raw reply	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-11-13  8:35 Marius Brehler
  0 siblings, 0 replies; 43+ messages in thread
From: Marius Brehler @ 2015-11-13  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b8cc54780393c27f8cb11cdba5d3b78b934d93be
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Nov 13 08:34:49 2015 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Fri Nov 13 08:34:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8cc5478

sci-libs/armadillo: Version bump; remove old

Package-Manager: portage-2.2.20.1

 sci-libs/armadillo/ChangeLog                       |   7 ++
 sci-libs/armadillo/armadillo-5.500.2.ebuild        | 121 ---------------------
 ...llo-5.400.2.ebuild => armadillo-6.200.3.ebuild} |   2 +-
 3 files changed, 8 insertions(+), 122 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index daba68a..78f1e70 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*armadillo-6.200.3 (13 Nov 2015)
+
+  13 Nov 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-6.200.3.ebuild, -armadillo-5.400.2.ebuild,
+  -armadillo-5.500.2.ebuild:
+  sci-libs/armadillo: Version bump; remove old
+
 *armadillo-5.600.2 (21 Sep 2015)
 
   21 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.500.2.ebuild b/sci-libs/armadillo/armadillo-5.500.2.ebuild
deleted file mode 100644
index 6682a81..0000000
--- a/sci-libs/armadillo/armadillo-5.500.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-5.400.2.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild
similarity index 99%
rename from sci-libs/armadillo/armadillo-5.400.2.ebuild
rename to sci-libs/armadillo/armadillo-6.200.3.ebuild
index 6682a81..aba1f7b 100644
--- a/sci-libs/armadillo/armadillo-5.400.2.ebuild
+++ b/sci-libs/armadillo/armadillo-6.200.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"
 SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0/5"
+SLOT="0/6"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu tbb test"
 REQUIRED_USE="test? ( lapack )"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-09-21 19:05 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-09-21 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     461031132c33f6dc98c9789b589a71c27995aae9
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Sep 21 18:30:23 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:30:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=46103113

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.20.1

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.600.2.ebuild | 121 ++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index c172727..daba68a 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*armadillo-5.600.2 (21 Sep 2015)
+
+  21 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.600.2.ebuild:
+  sci-libs/armadillo: Version bump
+
   10 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
   -armadillo-5.100.2.ebuild, -armadillo-5.200.2-r1.ebuild:
   sci-libs/armadillo: Remove old: Keep in sync with tree

diff --git a/sci-libs/armadillo/armadillo-5.600.2.ebuild b/sci-libs/armadillo/armadillo-5.600.2.ebuild
new file mode 100644
index 0000000..6682a81
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.600.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
+	superlu? ( sci-libs/superlu )
+"
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-09-13 18:34 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-09-13 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     2e90c9d63841026529f917665e197875f45ba7e3
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Sep 10 07:39:07 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 07:40:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2e90c9d6

sci-libs/armadillo: Remove old: Keep in sync with tree

Package-Manager: portage-2.2.20.1

 sci-libs/armadillo/ChangeLog                   |   4 +
 sci-libs/armadillo/armadillo-5.100.2.ebuild    | 112 -----------------------
 sci-libs/armadillo/armadillo-5.200.2-r1.ebuild | 121 -------------------------
 3 files changed, 4 insertions(+), 233 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 191e8c9..c172727 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  10 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -armadillo-5.100.2.ebuild, -armadillo-5.200.2-r1.ebuild:
+  sci-libs/armadillo: Remove old: Keep in sync with tree
+
 *armadillo-5.500.2 (08 Sep 2015)
 
   08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.100.2.ebuild b/sci-libs/armadillo/armadillo-5.100.2.ebuild
deleted file mode 100644
index cb326b0..0000000
--- a/sci-libs/armadillo/armadillo-5.100.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/5"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild b/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild
deleted file mode 100644
index 6682a81..0000000
--- a/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	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/examples/${PF}
-		doins -r examples/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-09-09  7:11 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-09-09  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     962b7dd6419c21a05d50dd71d7841ee92dee8be2
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Sep  8 08:03:18 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 08:03:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=962b7dd6

sci-libs/armadillo: Yet another version bump

Package-Manager: portage-2.2.20.1

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.500.2.ebuild | 121 ++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 4f40a8b..191e8c9 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*armadillo-5.500.2 (08 Sep 2015)
+
+  08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.500.2.ebuild:
+  sci-libs/armadillo: Yet another version bump
+
 *armadillo-5.400.2 (26 Aug 2015)
 
   26 Aug 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.500.2.ebuild b/sci-libs/armadillo/armadillo-5.500.2.ebuild
new file mode 100644
index 0000000..6682a81
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.500.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
+	superlu? ( sci-libs/superlu )
+"
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-08-27 15:01 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-08-27 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ec916e5ff8efe0e3747ff35b6575d7aa23f6c3ab
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Aug 26 17:46:09 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 17:51:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ec916e5f

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.20

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.400.2.ebuild | 121 ++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 9cbde4a..4f40a8b 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*armadillo-5.400.2 (26 Aug 2015)
+
+  26 Aug 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.400.2.ebuild:
+  sci-libs/armadillo: Version bump
+
   25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
   -armadillo-5.200.1.ebuild, -armadillo-5.200.2.ebuild:
   sci-libs/armadillo: Drop old

diff --git a/sci-libs/armadillo/armadillo-5.400.2.ebuild b/sci-libs/armadillo/armadillo-5.400.2.ebuild
new file mode 100644
index 0000000..6682a81
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.400.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
+	superlu? ( sci-libs/superlu )
+"
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-07-25 23:39 Andrew Savchenko
  0 siblings, 0 replies; 43+ messages in thread
From: Andrew Savchenko @ 2015-07-25 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b5a14b3c1a93bb6dfa0e2fb2ec9179a50bd1dfe8
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jul 25 09:30:14 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 09:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b5a14b3c

sci-libs/armadillo: Drop old

Package-Manager: portage-2.2.20

 sci-libs/armadillo/ChangeLog                |   4 +
 sci-libs/armadillo/armadillo-5.200.1.ebuild | 112 ----------------------------
 sci-libs/armadillo/armadillo-5.200.2.ebuild | 112 ----------------------------
 3 files changed, 4 insertions(+), 224 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index f38652d..c192624 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -armadillo-5.200.1.ebuild, -armadillo-5.200.2.ebuild:
+  sci-libs/armadillo: Drop old
+
 *armadillo-5.200.2-r1 (25 Jul 2015)
 
   25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.200.1.ebuild b/sci-libs/armadillo/armadillo-5.200.1.ebuild
deleted file mode 100644
index 913504f..0000000
--- a/sci-libs/armadillo/armadillo-5.200.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 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/5"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild
deleted file mode 100644
index ceebe9c..0000000
--- a/sci-libs/armadillo/armadillo-5.200.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
-
-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/5"
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-07-25 23:39 Andrew Savchenko
  0 siblings, 0 replies; 43+ messages in thread
From: Andrew Savchenko @ 2015-07-25 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b84afcb2b666160d9f0b9caeffadbb78992e476f
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jul 25 09:29:38 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 09:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b84afcb2

sci-libs/armadillo: Add superlu useflag

Package-Manager: portage-2.2.20

 sci-libs/armadillo/ChangeLog                   |   6 ++
 sci-libs/armadillo/armadillo-5.200.2-r1.ebuild | 121 +++++++++++++++++++++++++
 sci-libs/armadillo/metadata.xml                |   4 +
 3 files changed, 131 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ba91269..f38652d 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.200.2-r1 (25 Jul 2015)
+
+  25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.200.2-r1.ebuild, metadata.xml:
+  sci-libs/armadillo: Add superlu useflag
+
   25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
   armadillo-5.100.2.ebuild, armadillo-5.200.1.ebuild, armadillo-5.200.2.ebuild:
   sci-libs/armadillo: Fix slots

diff --git a/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild b/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild
new file mode 100644
index 0000000..0f4f32e
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.200.2-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 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/5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
+	superlu? ( sci-libs/superlu )
+"
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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/examples/${PF}
+		doins -r examples/*
+	fi
+}

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index dfc8f30..af978f1 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -29,6 +29,10 @@
     Use matrix allocation from the Threads Building Blocks
     <pkg>dev-cpp/tbb</pkg>
   </flag>
+    <flag name="superlu">
+    Use SuperLU for sparse linear equation solving
+    <pkg>sci-libs/superlu</pkg>
+  </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">arma</remote-id>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-07-25 23:39 Andrew Savchenko
  0 siblings, 0 replies; 43+ messages in thread
From: Andrew Savchenko @ 2015-07-25 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a343efd838ab45c415381a8fe7fc92f3c9cfa032
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jul 25 09:28:25 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 09:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a343efd8

sci-libs/armadillo: Fix slots

Package-Manager: portage-2.2.20

 sci-libs/armadillo/ChangeLog                | 4 ++++
 sci-libs/armadillo/armadillo-5.100.2.ebuild | 4 ++--
 sci-libs/armadillo/armadillo-5.200.1.ebuild | 4 ++--
 sci-libs/armadillo/armadillo-5.200.2.ebuild | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 6f29e41..ba91269 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
+  armadillo-5.100.2.ebuild, armadillo-5.200.1.ebuild, armadillo-5.200.2.ebuild:
+  sci-libs/armadillo: Fix slots
+
 *armadillo-5.200.2 (20 Jul 2015)
 
   20 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.100.2.ebuild b/sci-libs/armadillo/armadillo-5.100.2.ebuild
index 8d63e06..913504f 100644
--- a/sci-libs/armadillo/armadillo-5.100.2.ebuild
+++ b/sci-libs/armadillo/armadillo-5.100.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+# $Header: $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"
 SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0/4"
+SLOT="0/5"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"

diff --git a/sci-libs/armadillo/armadillo-5.200.1.ebuild b/sci-libs/armadillo/armadillo-5.200.1.ebuild
index 8d63e06..913504f 100644
--- a/sci-libs/armadillo/armadillo-5.200.1.ebuild
+++ b/sci-libs/armadillo/armadillo-5.200.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+# $Header: $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"
 SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0/4"
+SLOT="0/5"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"

diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild
index 8d63e06..ceebe9c 100644
--- a/sci-libs/armadillo/armadillo-5.200.2.ebuild
+++ b/sci-libs/armadillo/armadillo-5.200.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"
 SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0/4"
+SLOT="0/5"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-07-23 21:06 Jauhien Piatlicki
  0 siblings, 0 replies; 43+ messages in thread
From: Jauhien Piatlicki @ 2015-07-23 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     81a16804886701f5057843dabe07b1cc69caff39
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Jul 20 14:05:02 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 14:05:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=81a16804

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.20

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.200.2.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 908a93a..6f29e41 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.200.2 (20 Jul 2015)
+
+  20 Jul 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.200.2.ebuild:
+  sci-libs/armadillo: Version bump
+
   08 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   sci-libs/armadillo: Updating remote-id in metadata.xml
 

diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild
new file mode 100644
index 0000000..8d63e06
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.200.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-26  8:10 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-05-26  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     82fa91d393925b072afc47da8d4a267d16be7564
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 26 06:45:41 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 26 06:45:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=82fa91d3

sci-libs/armadillo: Drop old

Package-Manager: portage-2.2.18

 sci-libs/armadillo/ChangeLog                |   4 +
 sci-libs/armadillo/armadillo-5.000.1.ebuild | 112 ----------------------------
 sci-libs/armadillo/armadillo-5.100.1.ebuild | 112 ----------------------------
 3 files changed, 4 insertions(+), 224 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 69c6c08..08dbbf8 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 May 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -armadillo-5.000.1.ebuild, -armadillo-5.100.1.ebuild:
+  Drop old
+
 *armadillo-5.200.1 (26 May 2015)
 
   26 May 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.000.1.ebuild b/sci-libs/armadillo/armadillo-5.000.1.ebuild
deleted file mode 100644
index 8d63e06..0000000
--- a/sci-libs/armadillo/armadillo-5.000.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
-
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-5.100.1.ebuild b/sci-libs/armadillo/armadillo-5.100.1.ebuild
deleted file mode 100644
index 8d63e06..0000000
--- a/sci-libs/armadillo/armadillo-5.100.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
-
-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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-26  8:10 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-05-26  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a99d376a585fc28269a557bf49bd464c8d85f0c9
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 26 06:44:49 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 26 06:44:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a99d376a

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.18

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.200.1.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a6559b6..69c6c08 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.200.1 (26 May 2015)
+
+  26 May 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.200.1.ebuild:
+  Version bump
+
 *armadillo-5.100.2 (12 May 2015)
 
   12 May 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.200.1.ebuild b/sci-libs/armadillo/armadillo-5.200.1.ebuild
new file mode 100644
index 0000000..8d63e06
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.200.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-18 13:05 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-05-18 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     da9b563e4310538583b24559ce3a8cfc819213f2
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 12 12:01:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 12 12:01:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=da9b563e

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.18

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.100.2.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 8f95d92..a6559b6 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.100.2 (12 May 2015)
+
+  12 May 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.100.2.ebuild:
+  Version bump
+
 *armadillo-5.100.1 (04 May 2015)
 
   04 May 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.100.2.ebuild b/sci-libs/armadillo/armadillo-5.100.2.ebuild
new file mode 100644
index 0000000..8d63e06
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.100.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-04 14:02 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-05-04 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ed977498be2c73f801b9e2fca7460fc57685d672
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon May  4 07:38:54 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon May  4 07:38:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ed977498

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.18

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.100.1.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 91f7874..8f95d92 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.100.1 (04 May 2015)
+
+  04 May 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.100.1.ebuild:
+  Version bump
+
 *armadillo-5.000.1 (26 Apr 2015)
 
   26 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-5.100.1.ebuild b/sci-libs/armadillo/armadillo-5.100.1.ebuild
new file mode 100644
index 0000000..8d63e06
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.100.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-03 20:43 Andrew Savchenko
  0 siblings, 0 replies; 43+ messages in thread
From: Andrew Savchenko @ 2015-05-03 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8454de206d9c8fb4937847ce155776a808868b1b
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Apr 26 10:06:32 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:06:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8454de20

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.14

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-5.000.1.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index fcab445..91f7874 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-5.000.1 (26 Apr 2015)
+
+  26 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-5.000.1.ebuild:
+  Version bump
+
   03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
   -armadillo-4.600.2.ebuild, -armadillo-4.600.4.ebuild,
   -armadillo-4.650.2.ebuild:

diff --git a/sci-libs/armadillo/armadillo-5.000.1.ebuild b/sci-libs/armadillo/armadillo-5.000.1.ebuild
new file mode 100644
index 0000000..8d63e06
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.000.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-05-03 20:43 Andrew Savchenko
  0 siblings, 0 replies; 43+ messages in thread
From: Andrew Savchenko @ 2015-05-03 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     46b621eaf7754b5de756502b55fc85c155df03bf
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Apr 26 10:03:48 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:03:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=46b621ea

Revert "In CVS": Ebuilds in tree have no atlas support (#541524)

This reverts commit 4502854392f11b7e90b1d2c60c72c15602c81f80.

 sci-libs/armadillo/ChangeLog                | 159 ++++++++++++++++++++++++++++
 sci-libs/armadillo/armadillo-4.650.4.ebuild | 112 ++++++++++++++++++++
 sci-libs/armadillo/metadata.xml             |  33 ++++++
 3 files changed, 304 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
new file mode 100644
index 0000000..fcab445
--- /dev/null
+++ b/sci-libs/armadillo/ChangeLog
@@ -0,0 +1,159 @@
+# ChangeLog for sci-libs/armadillo
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -armadillo-4.600.2.ebuild, -armadillo-4.600.4.ebuild,
+  -armadillo-4.650.2.ebuild:
+  Moved to tree; Drop old
+
+*armadillo-4.650.4 (24 Mar 2015)
+
+  24 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.650.4.ebuild:
+  Version bump
+
+*armadillo-4.650.2 (08 Mar 2015)
+
+  08 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.650.2.ebuild:
+  Version bump
+
+  27 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  -armadillo-4.200.0.ebuild, -armadillo-4.300.8.ebuild,
+  -armadillo-4.300.9.ebuild, -files/armadillo-3.820.1-example-makefile.patch,
+  -files/armadillo-4.000.3-hdf5.patch:
+  Remove old
+
+*armadillo-4.600.4 (27 Jan 2015)
+
+  27 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.600.4.ebuild:
+  Version bump
+
+*armadillo-4.600.2 (11 Jan 2015)
+
+  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.600.2.ebuild:
+  Version bump, fix examples install location
+
+*armadillo-4.300.9 (28 Jun 2014)
+
+  28 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +armadillo-4.300.9.ebuild, metadata.xml:
+  version bump, see bug #515624
+
+*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:
+  sci-libs/armadillo: Version bump
+
+*armadillo-4.200.0 (22 Apr 2014)
+
+  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.200.0.ebuild,
+  -armadillo-4.000.4.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-4.100.2 (19 Mar 2014)
+
+  19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.100.2.ebuild,
+  -armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-4.000.4 (16 Feb 2014)
+
+  16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild:
+  Bump to version 4.000.4.
+
+  10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
+
+  09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
+  sci-libs/armadillo: add use flag description
+
+*armadillo-4.000.3 (09 Feb 2014)
+
+  09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.000.3.ebuild,
+  +files/armadillo-4.000.3-hdf5.patch:
+  sci-libs/armadillo: Version bump
+
+  08 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-3.930.0.ebuild:
+  Fix cblas, clapack include dir.
+
+*armadillo-3.930.0 (07 Dec 2013)
+
+  07 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.930.0.ebuild,
+  -armadillo-3.910.0.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.910.0 (19 Aug 2013)
+
+  19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.910.0.ebuild,
+  -armadillo-3.900.6.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.900.6 (03 Jul 2013)
+
+  03 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.900.6.ebuild,
+  -armadillo-3.820.1.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.820.1 (25 May 2013)
+
+  25 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.820.1.ebuild,
+  +files/armadillo-3.820.1-example-makefile.patch,
+  +files/armadillo-3.820.1-hdf5.patch, -armadillo-3.810.2.ebuild,
+  -files/armadillo-3.810.2-example-makefile.patch,
+  -files/armadillo-3.810.2-hdf5.patch:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.810.2 (29 Apr 2013)
+
+  29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.810.2.ebuild,
+  +files/armadillo-3.810.2-example-makefile.patch,
+  +files/armadillo-3.810.2-hdf5.patch, -armadillo-3.6.3-r1.ebuild, metadata.xml:
+  sci-libs/armadillo: Version bump
+
+  28 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> armadillo-3.6.3-r1.ebuild:
+  sci-libs/armadillo: Small prefix fix
+
+*armadillo-3.6.3-r1 (25 Feb 2013)
+
+  25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.3-r1.ebuild, -armadillo-3.6.2-r1.ebuild:
+  sci-libs/armadillo: Version bump. Respect libdir
+
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.6.2-r1.ebuild,
+  metadata.xml:
+  Correct USE dependency for virtual/pkgconfig
+
+*armadillo-3.6.2-r1 (07 Feb 2013)
+
+  07 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.2-r1.ebuild, -armadillo-3.6.1-r1.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.6.1-r1 (24 Jan 2013)
+
+  24 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.1-r1.ebuild, -armadillo-3.6.0-r1.ebuild:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.6.0-r1 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.0-r1.ebuild, -armadillo-3.2.4-r1.ebuild, metadata.xml:
+  sci-libs/armadillo: Version bump
+
+*armadillo-3.2.4-r1 (20 Jul 2012)
+
+  20 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.2.4-r1.ebuild, +metadata.xml:
+  sci-libs/armadillo: Adapted for new atlas

diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild
new file mode 100644
index 0000000..35856d7
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.650.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
new file mode 100644
index 0000000..385357d
--- /dev/null
+++ b/sci-libs/armadillo/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  Armadillo is a C++ linear algebra library (matrix maths) aiming
+  towards a good balance between speed and ease of use. Integer,
+  floating point and complex numbers are supported, as well as a
+  subset of trigonometric and statistics functions. Various matrix
+  decompositions are provided through optional integration with LAPACK
+  and ATLAS libraries. 
+  A delayed evaluation approach is employed (during compile time) to
+  combine several operations into one and reduce (or eliminate) the
+  need for temporaries. This is accomplished through recursive
+  templates and template meta-programming.
+</longdescription>
+<use>
+  <flag name="atlas">
+    Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
+    clapack
+  </flag>
+  <flag name="arpack">
+    Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
+  </flag>
+  <flag name='mkl'>
+    Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
+  </flag> 
+  <flag name='tbb'>
+    Use matrix allocation from the Threads Building Blocks
+    <pkg>dev-cpp/tbb</pkg>
+  </flag> 
+</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-04-16  6:34 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-04-16  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4502854392f11b7e90b1d2c60c72c15602c81f80
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 06:30:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 06:30:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=45028543

In CVS

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/armadillo/ChangeLog                | 159 ----------------------------
 sci-libs/armadillo/armadillo-4.650.4.ebuild | 112 --------------------
 sci-libs/armadillo/metadata.xml             |  33 ------
 3 files changed, 304 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
deleted file mode 100644
index fcab445..0000000
--- a/sci-libs/armadillo/ChangeLog
+++ /dev/null
@@ -1,159 +0,0 @@
-# ChangeLog for sci-libs/armadillo
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
-  -armadillo-4.600.2.ebuild, -armadillo-4.600.4.ebuild,
-  -armadillo-4.650.2.ebuild:
-  Moved to tree; Drop old
-
-*armadillo-4.650.4 (24 Mar 2015)
-
-  24 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +armadillo-4.650.4.ebuild:
-  Version bump
-
-*armadillo-4.650.2 (08 Mar 2015)
-
-  08 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +armadillo-4.650.2.ebuild:
-  Version bump
-
-  27 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
-  -armadillo-4.200.0.ebuild, -armadillo-4.300.8.ebuild,
-  -armadillo-4.300.9.ebuild, -files/armadillo-3.820.1-example-makefile.patch,
-  -files/armadillo-4.000.3-hdf5.patch:
-  Remove old
-
-*armadillo-4.600.4 (27 Jan 2015)
-
-  27 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +armadillo-4.600.4.ebuild:
-  Version bump
-
-*armadillo-4.600.2 (11 Jan 2015)
-
-  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +armadillo-4.600.2.ebuild:
-  Version bump, fix examples install location
-
-*armadillo-4.300.9 (28 Jun 2014)
-
-  28 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
-  +armadillo-4.300.9.ebuild, metadata.xml:
-  version bump, see bug #515624
-
-*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:
-  sci-libs/armadillo: Version bump
-
-*armadillo-4.200.0 (22 Apr 2014)
-
-  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.200.0.ebuild,
-  -armadillo-4.000.4.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-4.100.2 (19 Mar 2014)
-
-  19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.100.2.ebuild,
-  -armadillo-4.000.3.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-4.000.4 (16 Feb 2014)
-
-  16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild:
-  Bump to version 4.000.4.
-
-  10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
-  sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
-
-  09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
-  sci-libs/armadillo: add use flag description
-
-*armadillo-4.000.3 (09 Feb 2014)
-
-  09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.000.3.ebuild,
-  +files/armadillo-4.000.3-hdf5.patch:
-  sci-libs/armadillo: Version bump
-
-  08 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-3.930.0.ebuild:
-  Fix cblas, clapack include dir.
-
-*armadillo-3.930.0 (07 Dec 2013)
-
-  07 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.930.0.ebuild,
-  -armadillo-3.910.0.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.910.0 (19 Aug 2013)
-
-  19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.910.0.ebuild,
-  -armadillo-3.900.6.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.900.6 (03 Jul 2013)
-
-  03 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.900.6.ebuild,
-  -armadillo-3.820.1.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.820.1 (25 May 2013)
-
-  25 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.820.1.ebuild,
-  +files/armadillo-3.820.1-example-makefile.patch,
-  +files/armadillo-3.820.1-hdf5.patch, -armadillo-3.810.2.ebuild,
-  -files/armadillo-3.810.2-example-makefile.patch,
-  -files/armadillo-3.810.2-hdf5.patch:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.810.2 (29 Apr 2013)
-
-  29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.810.2.ebuild,
-  +files/armadillo-3.810.2-example-makefile.patch,
-  +files/armadillo-3.810.2-hdf5.patch, -armadillo-3.6.3-r1.ebuild, metadata.xml:
-  sci-libs/armadillo: Version bump
-
-  28 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> armadillo-3.6.3-r1.ebuild:
-  sci-libs/armadillo: Small prefix fix
-
-*armadillo-3.6.3-r1 (25 Feb 2013)
-
-  25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
-  +armadillo-3.6.3-r1.ebuild, -armadillo-3.6.2-r1.ebuild:
-  sci-libs/armadillo: Version bump. Respect libdir
-
-  22 Feb 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.6.2-r1.ebuild,
-  metadata.xml:
-  Correct USE dependency for virtual/pkgconfig
-
-*armadillo-3.6.2-r1 (07 Feb 2013)
-
-  07 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
-  +armadillo-3.6.2-r1.ebuild, -armadillo-3.6.1-r1.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.6.1-r1 (24 Jan 2013)
-
-  24 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
-  +armadillo-3.6.1-r1.ebuild, -armadillo-3.6.0-r1.ebuild:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.6.0-r1 (12 Dec 2012)
-
-  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
-  +armadillo-3.6.0-r1.ebuild, -armadillo-3.2.4-r1.ebuild, metadata.xml:
-  sci-libs/armadillo: Version bump
-
-*armadillo-3.2.4-r1 (20 Jul 2012)
-
-  20 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
-  +armadillo-3.2.4-r1.ebuild, +metadata.xml:
-  sci-libs/armadillo: Adapted for new atlas

diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild
deleted file mode 100644
index 35856d7..0000000
--- a/sci-libs/armadillo/armadillo-4.650.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
deleted file mode 100644
index 385357d..0000000
--- a/sci-libs/armadillo/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
-  Armadillo is a C++ linear algebra library (matrix maths) aiming
-  towards a good balance between speed and ease of use. Integer,
-  floating point and complex numbers are supported, as well as a
-  subset of trigonometric and statistics functions. Various matrix
-  decompositions are provided through optional integration with LAPACK
-  and ATLAS libraries. 
-  A delayed evaluation approach is employed (during compile time) to
-  combine several operations into one and reduce (or eliminate) the
-  need for temporaries. This is accomplished through recursive
-  templates and template meta-programming.
-</longdescription>
-<use>
-  <flag name="atlas">
-    Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
-    clapack
-  </flag>
-  <flag name="arpack">
-    Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
-  </flag>
-  <flag name='mkl'>
-    Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
-  </flag> 
-  <flag name='tbb'>
-    Use matrix allocation from the Threads Building Blocks
-    <pkg>dev-cpp/tbb</pkg>
-  </flag> 
-</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-04-03 17:53 Guillaume Horel
  0 siblings, 0 replies; 43+ messages in thread
From: Guillaume Horel @ 2015-04-03 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     30266d37ecc086878831efacd6407b765904ba42
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Apr  3 17:10:23 2015 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Apr  3 17:10:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=30266d37

sci-libs/armadillo: Moved to tree; Drop old

Package-Manager: portage-2.2.14

 sci-libs/armadillo/ChangeLog                |   5 ++
 sci-libs/armadillo/armadillo-4.600.2.ebuild | 112 ----------------------------
 sci-libs/armadillo/armadillo-4.600.4.ebuild | 112 ----------------------------
 sci-libs/armadillo/armadillo-4.650.2.ebuild | 112 ----------------------------
 4 files changed, 5 insertions(+), 336 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 65b92b0..fcab445 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de>
+  -armadillo-4.600.2.ebuild, -armadillo-4.600.4.ebuild,
+  -armadillo-4.650.2.ebuild:
+  Moved to tree; Drop old
+
 *armadillo-4.650.4 (24 Mar 2015)
 
   24 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-4.600.2.ebuild b/sci-libs/armadillo/armadillo-4.600.2.ebuild
deleted file mode 100644
index 35856d7..0000000
--- a/sci-libs/armadillo/armadillo-4.600.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-4.600.4.ebuild b/sci-libs/armadillo/armadillo-4.600.4.ebuild
deleted file mode 100644
index 35856d7..0000000
--- a/sci-libs/armadillo/armadillo-4.600.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}

diff --git a/sci-libs/armadillo/armadillo-4.650.2.ebuild b/sci-libs/armadillo/armadillo-4.650.2.ebuild
deleted file mode 100644
index 35856d7..0000000
--- a/sci-libs/armadillo/armadillo-4.650.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 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() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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/examples/${PF}
-		doins -r examples/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-03-08 18:08 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2015-03-08 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     46613608508cd858f05706e35d163a6e39063fb3
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Mar  8 09:29:04 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 09:29:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=46613608

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.14

 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-4.650.2.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 1d21d03..a6f4234 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.650.2 (08 Mar 2015)
+
+  08 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.650.2.ebuild:
+  Version bump
+
   27 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   -armadillo-4.200.0.ebuild, -armadillo-4.300.8.ebuild,
   -armadillo-4.300.9.ebuild, -files/armadillo-3.820.1-example-makefile.patch,

diff --git a/sci-libs/armadillo/armadillo-4.650.2.ebuild b/sci-libs/armadillo/armadillo-4.650.2.ebuild
new file mode 100644
index 0000000..35856d7
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.650.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2015-01-27 16:00 Christoph Junghans
  0 siblings, 0 replies; 43+ messages in thread
From: Christoph Junghans @ 2015-01-27 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     fceb3700383ef72d5e6bf991c0d40ffa02b08d93
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Jan 27 11:08:25 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 11:08:25 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fceb3700

sci-libs/armadillo-4.600.4: Version bump

---
 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-4.600.4.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 92146ca..51b024f 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.600.4 (27 Jan 2015)
+
+  27 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +armadillo-4.600.4.ebuild:
+  Version bump
+
 *armadillo-4.600.2 (11 Jan 2015)
 
   11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/sci-libs/armadillo/armadillo-4.600.4.ebuild b/sci-libs/armadillo/armadillo-4.600.4.ebuild
new file mode 100644
index 0000000..35856d7
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.600.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 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() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/examples/${PF}
+		doins -r examples/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-06-28 21:24 Jauhien Piatlicki
  0 siblings, 0 replies; 43+ messages in thread
From: Jauhien Piatlicki @ 2014-06-28 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b9336fb025964398de5493806df1ff3fc213a3c0
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 28 21:22:43 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sat Jun 28 21:22:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9336fb0

sci-libs/armadillo: version bump to 4.300.9

---
 sci-libs/armadillo/ChangeLog                |   6 ++
 sci-libs/armadillo/armadillo-4.300.9.ebuild | 114 ++++++++++++++++++++++++++++
 sci-libs/armadillo/metadata.xml             |   3 -
 3 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index e7b3f37..ce386e2 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.300.9 (28 Jun 2014)
+
+  28 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +armadillo-4.300.9.ebuild, metadata.xml:
+  version bump, see bug #515624
+
 *armadillo-4.300.8 (02 Jun 2014)
 
   02 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.8.ebuild,

diff --git a/sci-libs/armadillo/armadillo-4.300.9.ebuild b/sci-libs/armadillo/armadillo-4.300.9.ebuild
new file mode 100644
index 0000000..96ac582
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.300.9.ebuild
@@ -0,0 +1,114 @@
+# 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 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch )
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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/metadata.xml b/sci-libs/armadillo/metadata.xml
index ce0d5f9..385357d 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -19,9 +19,6 @@
     Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
     clapack
   </flag>
-  <flag name='int64'>
-    Use 64 bits integer for matrix indexation
-  </flag>
   <flag name="arpack">
     Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
   </flag>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-05-07 23:19 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2014-05-07 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     4e68c9cffdce6087844e249c1297c098c768f4cf
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 16:30:42 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May  6 16:30:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4e68c9cf

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                |   5 ++
 sci-libs/armadillo/armadillo-4.300.0.ebuild | 114 ++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index d08db20..a75b8d9 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.300.0 (06 May 2014)
+
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.0.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-4.200.0 (22 Apr 2014)
 
   22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.200.0.ebuild,

diff --git a/sci-libs/armadillo/armadillo-4.300.0.ebuild b/sci-libs/armadillo/armadillo-4.300.0.ebuild
new file mode 100644
index 0000000..96ac582
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.300.0.ebuild
@@ -0,0 +1,114 @@
+# 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 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch )
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-04-22 20:47 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2014-04-22 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5eb4cfd47f9eaef91446ece0ffc04a6ff55335c9
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 17:33:54 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 17:33:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5eb4cfd4

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                                        | 6 ++++++
 .../{armadillo-4.000.4.ebuild => armadillo-4.200.0.ebuild}          | 0
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ef0eced..d08db20 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.200.0 (22 Apr 2014)
+
+  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.200.0.ebuild,
+  -armadillo-4.000.4.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-4.100.2 (19 Mar 2014)
 
   19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.100.2.ebuild,

diff --git a/sci-libs/armadillo/armadillo-4.000.4.ebuild b/sci-libs/armadillo/armadillo-4.200.0.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-4.000.4.ebuild
rename to sci-libs/armadillo/armadillo-4.200.0.ebuild


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-03-22  9:45 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2014-03-22  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     daebdbdc1f0e786e2b336cccf21b34d402510a7d
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 17:45:14 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 09:44:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=daebdbdc

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                                        | 6 ++++++
 .../{armadillo-4.000.3.ebuild => armadillo-4.100.2.ebuild}          | 0
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index bdacb7f..ef0eced 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.100.2 (19 Mar 2014)
+
+  19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.100.2.ebuild,
+  -armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-4.000.4 (16 Feb 2014)
 
   16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild:

diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.100.2.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-4.000.3.ebuild
rename to sci-libs/armadillo/armadillo-4.100.2.ebuild


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-03-19 17:46 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2014-03-19 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     432e5aa4c4f881182eb9e9e0a32d5b0bb6783555
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 17:45:14 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Mar 19 17:45:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=432e5aa4

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                                        | 6 ++++++
 .../{armadillo-4.000.3.ebuild => armadillo-4.100.2.ebuild}          | 0
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index bdacb7f..ef0eced 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.100.2 (19 Mar 2014)
+
+  19 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.100.2.ebuild,
+  -armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-4.000.4 (16 Feb 2014)
 
   16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild:

diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.100.2.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-4.000.3.ebuild
rename to sci-libs/armadillo/armadillo-4.100.2.ebuild


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-02-16 13:04 Reinis Danne
  0 siblings, 0 replies; 43+ messages in thread
From: Reinis Danne @ 2014-02-16 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     09dfe1b9d488d8f73a5618e81d382ad636e0110c
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Sun Feb 16 13:03:03 2014 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Sun Feb 16 13:03:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=09dfe1b9

sci-libs/armadillo: Bump to v4.000.4

---
 sci-libs/armadillo/ChangeLog                |   5 ++
 sci-libs/armadillo/armadillo-4.000.4.ebuild | 114 ++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index e28dc78..bdacb7f 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-4.000.4 (16 Feb 2014)
+
+  16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild:
+  Bump to version 4.000.4.
+
   10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
   sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
 

diff --git a/sci-libs/armadillo/armadillo-4.000.4.ebuild b/sci-libs/armadillo/armadillo-4.000.4.ebuild
new file mode 100644
index 0000000..6dab248
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.000.4.ebuild
@@ -0,0 +1,114 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-02-10  4:14 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2014-02-10  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     bc62393734cd89341610c14c14f61abe8d478f86
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 01:55:26 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 01:55:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc623937

sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                |  3 +++
 sci-libs/armadillo/armadillo-4.000.3.ebuild | 33 +++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 59c557d..e28dc78 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
+
   09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   sci-libs/armadillo: add use flag description
 

diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild
index 7b82540..6dab248 100644
--- a/sci-libs/armadillo/armadillo-4.000.3.ebuild
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild
@@ -15,7 +15,7 @@ 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 int64 lapack mkl tbb test"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"
 
 RDEPEND="
@@ -49,7 +49,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use int64 ARMA_64BIT_WORD)
 		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
 		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
 	)
@@ -59,18 +58,6 @@ src_configure() {
 			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
 		)
 	fi
-	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
@@ -84,6 +71,24 @@ src_configure() {
 			-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
 }
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-02-10  4:14 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2014-02-10  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     92243f266bba3331b1ea6de3e53d94a5a9aaac89
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 19:31:13 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 19:31:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=92243f26

sci-libs/armadillo: add use flag description

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog    | 3 +++
 sci-libs/armadillo/metadata.xml | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 721a0a1..59c557d 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
+  sci-libs/armadillo: add use flag description
+
 *armadillo-4.000.3 (09 Feb 2014)
 
   09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.000.3.ebuild,

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index ec31109..ce0d5f9 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -22,6 +22,12 @@
   <flag name='int64'>
     Use 64 bits integer for matrix indexation
   </flag>
+  <flag name="arpack">
+    Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
+  </flag>
+  <flag name='mkl'>
+    Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
+  </flag> 
   <flag name='tbb'>
     Use matrix allocation from the Threads Building Blocks
     <pkg>dev-cpp/tbb</pkg>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2014-02-08 14:36 Reinis Danne
  0 siblings, 0 replies; 43+ messages in thread
From: Reinis Danne @ 2014-02-08 14:36 UTC (permalink / raw
  To: gentoo-commits

commit:     526e6ac0e2f64891b69bc3e0cd47b792f0d044a9
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Sat Feb  8 14:33:47 2014 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Sat Feb  8 14:33:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=526e6ac0

sci-libs/armadillo: Fix cblas, clapack include dir

---
 sci-libs/armadillo/ChangeLog                | 5 ++++-
 sci-libs/armadillo/armadillo-3.930.0.ebuild | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index f8b3e97..98a692c 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/armadillo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-3.930.0.ebuild:
+  Fix cblas, clapack include dir.
+
 *armadillo-3.930.0 (07 Dec 2013)
 
   07 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.930.0.ebuild,

diff --git a/sci-libs/armadillo/armadillo-3.930.0.ebuild b/sci-libs/armadillo/armadillo-3.930.0.ebuild
index ea09daa..59be372 100644
--- a/sci-libs/armadillo/armadillo-3.930.0.ebuild
+++ b/sci-libs/armadillo/armadillo-3.930.0.ebuild
@@ -63,7 +63,8 @@ src_configure() {
 		mycmakeargs+=(
 			-DCBLAS_FOUND=ON
 			-DCLAPACK_FOUND=ON
-			-DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')"
+			-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})"
 		)


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-08-19 23:33 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-08-19 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c03cebab4bcdb3293e29dfd2219dace720c2a9a9
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 22:21:00 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 22:21:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c03cebab

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.22288-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                                        | 6 ++++++
 .../{armadillo-3.900.6.ebuild => armadillo-3.910.0.ebuild}          | 0
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index b017872..a55f90d 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.910.0 (19 Aug 2013)
+
+  19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.910.0.ebuild,
+  -armadillo-3.900.6.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.900.6 (03 Jul 2013)
 
   03 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.900.6.ebuild,

diff --git a/sci-libs/armadillo/armadillo-3.900.6.ebuild b/sci-libs/armadillo/armadillo-3.910.0.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-3.900.6.ebuild
rename to sci-libs/armadillo/armadillo-3.910.0.ebuild


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-07-03 16:22 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-07-03 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     49c16b962fed87cf4fee5836e4082a7556fa35ef
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 16:22:03 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 16:22:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=49c16b96

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.22097-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                                        | 6 ++++++
 .../{armadillo-3.820.1.ebuild => armadillo-3.900.6.ebuild}          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 505c50b..b017872 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.900.6 (03 Jul 2013)
+
+  03 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.900.6.ebuild,
+  -armadillo-3.820.1.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.820.1 (25 May 2013)
 
   25 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.820.1.ebuild,

diff --git a/sci-libs/armadillo/armadillo-3.820.1.ebuild b/sci-libs/armadillo/armadillo-3.900.6.ebuild
similarity index 97%
rename from sci-libs/armadillo/armadillo-3.820.1.ebuild
rename to sci-libs/armadillo/armadillo-3.900.6.ebuild
index 84523a3..f721375 100644
--- a/sci-libs/armadillo/armadillo-3.820.1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.900.6.ebuild
@@ -31,7 +31,7 @@ PDEPEND="${RDEPEND}
 	tbb? ( dev-cpp/tbb )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{hdf5,example-makefile}.patch
+	epatch "${FILESDIR}"/${PN}-3.820.1-{hdf5,example-makefile}.patch
 	# avoid the automagic cmake macros
 	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-02-28  0:20 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-02-28  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a217a6447c1ceb8ced672fd61e669f4098bcac4c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 00:19:38 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 00:19:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a217a644

sci-libs/armadillo: Small prefix fix

Package-Manager: portage-2.2.0_alpha163

---
 sci-libs/armadillo/ChangeLog                 |    3 +++
 sci-libs/armadillo/armadillo-3.6.3-r1.ebuild |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a5368dd..71af4a9 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> armadillo-3.6.3-r1.ebuild:
+  sci-libs/armadillo: Small prefix fix
+
 *armadillo-3.6.3-r1 (25 Feb 2013)
 
   25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
index b7bd289..0258f25 100644
--- a/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="atlas blas doc examples lapack"
 
 RDEPEND="
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=( -DINSTALL_LIB_DIR="${EROOT}/usr/$(get_libdir)" )
+	local mycmakeargs=( -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" )
 	if use blas; then
 		mycmakeargs+=(
 			-DBLAS_FOUND=ON


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-02-25  2:38 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-02-25  2:38 UTC (permalink / raw
  To: gentoo-commits

commit:     3b7788cbd1b3a0e79f1341449be1fcb4b555ef4c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 01:40:27 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 01:40:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3b7788cb

sci-libs/armadillo: Version bump. Respect libdir

Package-Manager: portage-2.2.01.21688-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                       |    6 ++++++
 ...o-3.6.2-r1.ebuild => armadillo-3.6.3-r1.ebuild} |    7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ae5bb80..a5368dd 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.6.3-r1 (25 Feb 2013)
+
+  25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.3-r1.ebuild, -armadillo-3.6.2-r1.ebuild:
+  sci-libs/armadillo: Version bump. Respect libdir
+
   22 Feb 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.6.2-r1.ebuild,
   metadata.xml:
   Correct USE dependency for virtual/pkgconfig

diff --git a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
similarity index 91%
rename from sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
rename to sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
index 0135614..b7bd289 100644
--- a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake-utils toolchain-funcs
+inherit cmake-utils toolchain-funcs multilib
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
@@ -19,7 +19,7 @@ IUSE="atlas blas doc examples lapack"
 
 RDEPEND="
 	dev-libs/boost
-	atlas? ( sci-libs/atlas )
+	atlas? ( sci-libs/atlas[lapack] )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
 DEPEND="${DEPEND}
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=()
+	local mycmakeargs=( -DINSTALL_LIB_DIR="${EROOT}/usr/$(get_libdir)" )
 	if use blas; then
 		mycmakeargs+=(
 			-DBLAS_FOUND=ON
@@ -51,7 +51,6 @@ src_configure() {
 		$(tc-getPKG_CONFIG) --exists atlas-cblas-threads && c+=-threads
 		$(tc-getPKG_CONFIG) --exists atlas-lapack-threads && l+=-threads
 		mycmakeargs=(
-			-DARMA_USE_ATLAS=ON
 			-DCBLAS_FOUND=ON
 			-DCLAPACK_FOUND=ON
 			-DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-02-22 15:46 Justin Lecher
  0 siblings, 0 replies; 43+ messages in thread
From: Justin Lecher @ 2013-02-22 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     69d13bf0066675905477af55a9567d032d0fe38c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 11:52:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 11:52:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=69d13bf0

sci-libs/armadillo: Correct USE dependency for virtual/pkgconfig

Package-Manager: portage-2.2.0_alpha163
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                 |    4 ++++
 sci-libs/armadillo/armadillo-3.6.2-r1.ebuild |    4 +++-
 sci-libs/armadillo/metadata.xml              |   10 +++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 98a0bf6..ae5bb80 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.6.2-r1.ebuild,
+  metadata.xml:
+  Correct USE dependency for virtual/pkgconfig
+
 *armadillo-3.6.2-r1 (07 Feb 2013)
 
   07 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
index e50e652..0135614 100644
--- a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
@@ -23,7 +23,9 @@ RDEPEND="
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
 DEPEND="${DEPEND}
-	virtual/pkgconfig"
+	atlas? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	lapack? ( virtual/pkgconfig )"
 
 src_prepare() {
 	# avoid the automagic cmake macros

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index edf2d81..3581e19 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Armadillo is a C++ linear algebra library (matrix maths) aiming
   towards a good balance between speed and ease of use. Integer,
   floating point and complex numbers are supported, as well as a
@@ -14,7 +14,7 @@
   need for temporaries. This is accomplished through recursive
   templates and template meta-programming.
 </longdescription>
-<use>
-  <flag name="atlas">Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and clapack</flag>
-</use>
+  <use>
+    <flag name="atlas">Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and clapack</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-02-07  7:34 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-02-07  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4bf26afd59ce4cb527b78532ffce8751099b68df
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 07:34:25 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 07:34:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4bf26afd

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.21688-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                       |    6 ++++++
 ...o-3.6.1-r1.ebuild => armadillo-3.6.2-r1.ebuild} |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ed4eccf..98a0bf6 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.6.2-r1 (07 Feb 2013)
+
+  07 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.2-r1.ebuild, -armadillo-3.6.1-r1.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.6.1-r1 (24 Jan 2013)
 
   24 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-3.6.1-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
similarity index 99%
rename from sci-libs/armadillo/armadillo-3.6.1-r1.ebuild
rename to sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
index 2959e6a..e50e652 100644
--- a/sci-libs/armadillo/armadillo-3.6.1-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 CMAKE_IN_SOURCE_BUILD=1
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2013-01-24 19:47 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2013-01-24 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e74041228a49f0a22e180b56bd4556ad5ca23fea
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 17:29:10 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 17:29:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e7404122

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.21580-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                       |    8 +++++++-
 ...o-3.6.0-r1.ebuild => armadillo-3.6.1-r1.ebuild} |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 7788ddd..ed4eccf 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/armadillo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.6.1-r1 (24 Jan 2013)
+
+  24 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.1-r1.ebuild, -armadillo-3.6.0-r1.ebuild:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.6.0-r1 (12 Dec 2012)
 
   12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-3.6.0-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.1-r1.ebuild
similarity index 97%
rename from sci-libs/armadillo/armadillo-3.6.0-r1.ebuild
rename to sci-libs/armadillo/armadillo-3.6.1-r1.ebuild
index 9a0199c..2959e6a 100644
--- a/sci-libs/armadillo/armadillo-3.6.0-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2012-12-12 18:27 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2012-12-12 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     fc157f7e46e78b97b6648fcb7eea4324771e800c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 18:26:51 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 18:26:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fc157f7e

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.21418-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                       |    6 ++++
 ...o-3.2.4-r1.ebuild => armadillo-3.6.0-r1.ebuild} |   26 ++++++++++----------
 sci-libs/armadillo/metadata.xml                    |   10 ++++----
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index bff94a2..7788ddd 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.6.0-r1 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.6.0-r1.ebuild, -armadillo-3.2.4-r1.ebuild, metadata.xml:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.2.4-r1 (20 Jul 2012)
 
   20 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/armadillo/armadillo-3.2.4-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.0-r1.ebuild
similarity index 63%
rename from sci-libs/armadillo/armadillo-3.2.4-r1.ebuild
rename to sci-libs/armadillo/armadillo-3.6.0-r1.ebuild
index e464d2a..9a0199c 100644
--- a/sci-libs/armadillo/armadillo-3.2.4-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.0-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.2.4.ebuild,v 1.1 2012/07/20 21:51:23 bicatali Exp $
+# $Header: $
 
 EAPI=4
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
@@ -17,11 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="atlas blas doc examples lapack"
 
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+	dev-libs/boost
 	atlas? ( sci-libs/atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
-
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
@@ -35,26 +35,26 @@ src_configure() {
 	if use blas; then
 		mycmakeargs+=(
 			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
 		)
 	fi
 	if use lapack; then
 		mycmakeargs+=(
 			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
 		)
 	fi
 	if use atlas; then
-		local c=atlas-cblas l=atlas-lapac
-		pkg-config --exists atlas-cblas-threads && c+=-threads
-		pkg-config --exists atlas-lapack-threads && l+=-threads
+		local c=atlas-cblas l=atlas-lapack
+		$(tc-getPKG_CONFIG) --exists atlas-cblas-threads && c+=-threads
+		$(tc-getPKG_CONFIG) --exists atlas-lapack-threads && l+=-threads
 		mycmakeargs=(
 			-DARMA_USE_ATLAS=ON
 			-DCBLAS_FOUND=ON
 			-DCLAPACK_FOUND=ON
-			-DATLAS_INCLUDE_DIR="$(pkg-config --cflags ${c} | sed 's/-I//')"
-			-DCBLAS_LIBRARIES="$(pkg-config --libs ${c})"
-			-DCLAPACK_LIBRARIES="$(pkg-config --libs ${l})"
+			-DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')"
+			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
 		)
 	fi
 	cmake-utils_src_configure
@@ -63,7 +63,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	dodoc README.txt
-	use doc && dodoc docs/*pdf
+	use doc && dodoc *pdf && dohtml *html
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 8997101..edf2d81 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   Armadillo is a C++ linear algebra library (matrix maths) aiming
   towards a good balance between speed and ease of use. Integer,
   floating point and complex numbers are supported, as well as a
@@ -14,7 +14,7 @@
   need for temporaries. This is accomplished through recursive
   templates and template meta-programming.
 </longdescription>
-	<use>
-		<flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
-	</use>
+<use>
+  <flag name="atlas">Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and clapack</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2012-07-20 22:03 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2012-07-20 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     406663fbf15932746c860a7bc553af6637c75f61
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Fri Jul 20 22:02:50 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 22:02:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=406663fb

sci-libs/armadillo: Adapted for new atlas

(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 sci-libs/armadillo/ChangeLog                 |    9 +++
 sci-libs/armadillo/armadillo-3.2.4-r1.ebuild |   71 ++++++++++++++++++++++++++
 sci-libs/armadillo/metadata.xml              |   20 +++++++
 3 files changed, 100 insertions(+), 0 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
new file mode 100644
index 0000000..bff94a2
--- /dev/null
+++ b/sci-libs/armadillo/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sci-libs/armadillo
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*armadillo-3.2.4-r1 (20 Jul 2012)
+
+  20 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +armadillo-3.2.4-r1.ebuild, +metadata.xml:
+  sci-libs/armadillo: Adapted for new atlas

diff --git a/sci-libs/armadillo/armadillo-3.2.4-r1.ebuild b/sci-libs/armadillo/armadillo-3.2.4-r1.ebuild
new file mode 100644
index 0000000..e464d2a
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-3.2.4-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.2.4.ebuild,v 1.1 2012/07/20 21:51:23 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="atlas blas doc examples lapack"
+
+RDEPEND=">=dev-libs/boost-1.34
+	atlas? ( sci-libs/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
+		local c=atlas-cblas l=atlas-lapac
+		pkg-config --exists atlas-cblas-threads && c+=-threads
+		pkg-config --exists atlas-lapack-threads && l+=-threads
+		mycmakeargs=(
+			-DARMA_USE_ATLAS=ON
+			-DCBLAS_FOUND=ON
+			-DCLAPACK_FOUND=ON
+			-DATLAS_INCLUDE_DIR="$(pkg-config --cflags ${c} | sed 's/-I//')"
+			-DCBLAS_LIBRARIES="$(pkg-config --libs ${c})"
+			-DCLAPACK_LIBRARIES="$(pkg-config --libs ${l})"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.txt
+	use doc && dodoc docs/*pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
new file mode 100644
index 0000000..8997101
--- /dev/null
+++ b/sci-libs/armadillo/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<longdescription lang="en">
+  Armadillo is a C++ linear algebra library (matrix maths) aiming
+  towards a good balance between speed and ease of use. Integer,
+  floating point and complex numbers are supported, as well as a
+  subset of trigonometric and statistics functions. Various matrix
+  decompositions are provided through optional integration with LAPACK
+  and ATLAS libraries. 
+  A delayed evaluation approach is employed (during compile time) to
+  combine several operations into one and reduce (or eliminate) the
+  need for temporaries. This is accomplished through recursive
+  templates and template meta-programming.
+</longdescription>
+	<use>
+		<flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
+	</use>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/
@ 2011-03-06 19:38 Sebastien Fabbro
  0 siblings, 0 replies; 43+ messages in thread
From: Sebastien Fabbro @ 2011-03-06 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2f321ce24742f3a5f10a8000d1177c2dd7fcc662
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Sun Mar  6 19:27:19 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 19:27:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f321ce2

[sci-libs/armadillo] move to the main tree

---
 sci-libs/armadillo/ChangeLog              |    9 ---------
 sci-libs/armadillo/armadillo-1.0.0.ebuild |   22 ----------------------
 sci-libs/armadillo/metadata.xml           |   15 ---------------
 3 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
deleted file mode 100644
index 9f0d95a..0000000
--- a/sci-libs/armadillo/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for sci-libs/armadillo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*armadillo-1.0.0 (13 Dec 2010)
-
-  13 December 2010; Nico Schlömer <nico.schloemer@gmail.com>
-  +metadata.xml, +armadillo-1.0.0.ebuild:
-  Initial import.

diff --git a/sci-libs/armadillo/armadillo-1.0.0.ebuild b/sci-libs/armadillo/armadillo-1.0.0.ebuild
deleted file mode 100644
index e39385c..0000000
--- a/sci-libs/armadillo/armadillo-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit cmake-utils
-
-DESCRIPTION="C++ linear algebra library aiming towards a good balance between speed and ease of use"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/arma/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-devel/gcc-4.0.0
-	virtual/lapack
-	virtual/blas
-	>=dev-libs/boost-1.34"
-
-RDEPEND="${DEPEND}"

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
deleted file mode 100644
index 429446a..0000000
--- a/sci-libs/armadillo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
-Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use. Integer, floating point and complex numbers are supported, as well as a subset of trigonometric and statistics functions. Various matrix decompositions are provided through optional integration with LAPACK and ATLAS libraries.
-A delayed evaluation approach is employed (during compile time) to combine several operations into one and reduce (or eliminate) the need for temporaries. This is accomplished through recursive templates and template meta-programming.
-This library is useful if C++ has been decided as the language of choice (due to speed and/or integration capabilities), rather than another language like Matlab(r) or Octave. It is distributed under a license that is useful in both open-source and commercial contexts.
-Armadillo is primarily developed at NICTA (Australia), with contributions from around the world.
-</longdescription>
-<use>
-    <flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
-</use>
-</pkgmetadata>
-



^ permalink raw reply related	[flat|nested] 43+ messages in thread

end of thread, other threads:[~2020-09-22 12:14 UTC | newest]

Thread overview: 43+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-12 20:24 [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 12:14 Aisha Tammy
2016-05-17  9:19 Marius Brehler
2016-04-01 14:09 Marius Brehler
2016-04-01 14:09 Marius Brehler
2015-11-13  8:35 Marius Brehler
2015-09-21 19:05 Justin Lecher
2015-09-13 18:34 Justin Lecher
2015-09-09  7:11 Justin Lecher
2015-08-27 15:01 Justin Lecher
2015-07-25 23:39 Andrew Savchenko
2015-07-25 23:39 Andrew Savchenko
2015-07-25 23:39 Andrew Savchenko
2015-07-23 21:06 Jauhien Piatlicki
2015-05-26  8:10 Justin Lecher
2015-05-26  8:10 Justin Lecher
2015-05-18 13:05 Justin Lecher
2015-05-04 14:02 Justin Lecher
2015-05-03 20:43 Andrew Savchenko
2015-05-03 20:43 Andrew Savchenko
2015-04-16  6:34 Justin Lecher
2015-04-03 17:53 Guillaume Horel
2015-03-08 18:08 Justin Lecher
2015-01-27 16:00 Christoph Junghans
2014-06-28 21:24 Jauhien Piatlicki
2014-05-07 23:19 Sebastien Fabbro
2014-04-22 20:47 Sebastien Fabbro
2014-03-22  9:45 Justin Lecher
2014-03-19 17:46 Sebastien Fabbro
2014-02-16 13:04 Reinis Danne
2014-02-10  4:14 Sebastien Fabbro
2014-02-10  4:14 Sebastien Fabbro
2014-02-08 14:36 Reinis Danne
2013-08-19 23:33 Sebastien Fabbro
2013-07-03 16:22 Sebastien Fabbro
2013-02-28  0:20 Sebastien Fabbro
2013-02-25  2:38 Sebastien Fabbro
2013-02-22 15:46 Justin Lecher
2013-02-07  7:34 Sebastien Fabbro
2013-01-24 19:47 Sebastien Fabbro
2012-12-12 18:27 Sebastien Fabbro
2012-07-20 22:03 Sebastien Fabbro
2011-03-06 19:38 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox