From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2A707138A1C for ; Fri, 3 Apr 2015 17:54:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06D9EE09F5; Fri, 3 Apr 2015 17:54:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64FC5E09F5 for ; Fri, 3 Apr 2015 17:54:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E1AA3408A0 for ; Fri, 3 Apr 2015 17:54:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 599941523C for ; Fri, 3 Apr 2015 17:53:54 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <1428081023.30266d37ecc086878831efacd6407b765904ba42.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/armadillo/ChangeLog sci-libs/armadillo/armadillo-4.600.2.ebuild sci-libs/armadillo/armadillo-4.600.4.ebuild sci-libs/armadillo/armadillo-4.650.2.ebuild X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: 30266d37ecc086878831efacd6407b765904ba42 X-VCS-Branch: master Date: Fri, 3 Apr 2015 17:53:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc47f3d4-2796-4a20-a531-0fa4d3071e81 X-Archives-Hash: 678d8b1cb6f91b2af143245698434ecb commit: 30266d37ecc086878831efacd6407b765904ba42 Author: Marius Brehler linux sungazer de> AuthorDate: Fri Apr 3 17:10:23 2015 +0000 Commit: Guillaume Horel gmail 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 + -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 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 -}