commit: a9192fe70e3153d30c92244fcb5b9a454cec57c7 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Feb 27 13:14:06 2015 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Feb 27 13:14:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a9192fe7
Remove old Package-Manager: portage-2.2.14 --- sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/armadillo-4.200.0.ebuild | 114 --------------------- sci-libs/armadillo/armadillo-4.300.8.ebuild | 114 --------------------- sci-libs/armadillo/armadillo-4.300.9.ebuild | 114 --------------------- .../files/armadillo-3.820.1-example-makefile.patch | 33 ------ .../armadillo/files/armadillo-4.000.3-hdf5.patch | 19 ---- 6 files changed, 6 insertions(+), 394 deletions(-) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index 51b024f..1d21d03 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: $ + 27 Feb 2015; Andreas K. Huettel <[email protected]> + -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 <[email protected]> diff --git a/sci-libs/armadillo/armadillo-4.200.0.ebuild b/sci-libs/armadillo/armadillo-4.200.0.ebuild deleted file mode 100644 index 6dab248..0000000 --- a/sci-libs/armadillo/armadillo-4.200.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake-utils toolchain-funcs multilib eutils - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="http://arma.sourceforge.net/"; -SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0/4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" -REQUIRED_USE="test? ( lapack )" - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - atlas? ( sci-libs/atlas[lapack] ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack )" -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - atlas? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ - "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch - # avoid the automagic cmake macros - sed -i -e '/ARMA_Find/d' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - $(cmake-utils_use debug ARMA_EXTRA_DEBUG) - $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) - $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) - ) - if use arpack; then - mycmakeargs+=( - -DARPACK_FOUND=ON - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" - ) - fi - if use atlas; then - local c=atlas-cblas l=atlas-clapack - $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads - $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads - mycmakeargs+=( - -DCBLAS_FOUND=ON - -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" - -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" - -DCLAPACK_FOUND=ON - -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" - -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" - ) - fi - if use blas; then - mycmakeargs+=( - -DBLAS_FOUND=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - ) - fi - if use hdf5; then - mycmakeargs+=( - -DHDF5_FOUND=ON - -DHDF5_LIBRARIES="-lhdf5" - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - fi - cmake-utils_src_configure -} - -src_test() { - pushd examples > /dev/null - emake \ - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die - emake clean - popd > /dev/null -} - -src_install() { - cmake-utils_src_install - dodoc README.txt - use doc && dodoc *pdf && dohtml *html - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/sci-libs/armadillo/armadillo-4.300.8.ebuild b/sci-libs/armadillo/armadillo-4.300.8.ebuild deleted file mode 100644 index 96ac582..0000000 --- a/sci-libs/armadillo/armadillo-4.300.8.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake-utils toolchain-funcs multilib eutils - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="http://arma.sourceforge.net/"; -SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0/4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" -REQUIRED_USE="test? ( lapack )" - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - atlas? ( sci-libs/atlas[lapack] ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack )" -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - atlas? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" - -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/armadillo-4.300.9.ebuild b/sci-libs/armadillo/armadillo-4.300.9.ebuild deleted file mode 100644 index 96ac582..0000000 --- a/sci-libs/armadillo/armadillo-4.300.9.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake-utils toolchain-funcs multilib eutils - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="http://arma.sourceforge.net/"; -SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0/4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" -REQUIRED_USE="test? ( lapack )" - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - atlas? ( sci-libs/atlas[lapack] ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack )" -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - atlas? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) - tbb? ( dev-cpp/tbb )" - -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/files/armadillo-3.820.1-example-makefile.patch b/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch deleted file mode 100644 index 90169ed..0000000 --- a/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- examples/Makefile.cmake.orig 2013-04-29 09:13:58.164963641 -0700 -+++ examples/Makefile.cmake 2013-04-29 09:18:42.371460644 -0700 -@@ -1,7 +1,7 @@ - # The generated "Makefile" from "Makefile.cmake" is only usable after - # the Armadillo library has been configured and installed by CMake. - --CXX=g++ -+CXX:=g++ - #CXX=g++-4.2 - ## Under MacOS you may have an old compiler as default (e.g. GCC 4.0). - ## However, GCC 4.2 or later is available and preferable due to better -@@ -26,7 +26,7 @@ - - - --LIB_FLAGS = -larmadillo $(EXTRA_LIB_FLAGS) -+LIB_FLAGS = $(EXTRA_LIB_FLAGS) -larmadillo - ## NOTE: on Ubuntu and Debian based systems you may need to add - ## -lgfortran to LIB_FLAGS - -@@ -73,10 +73,10 @@ - all: example1 example2 - - example1: example1.cpp -- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@ - - example2: example2.cpp -- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@ - - - .PHONY: clean diff --git a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch deleted file mode 100644 index 4510cd8..0000000 --- a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- armadillo-4.000.2/CMakeLists.txt.orig 2014-02-03 14:47:35.023255183 -0800 -+++ armadillo-4.000.2/CMakeLists.txt 2014-02-03 21:19:47.567376544 -0800 -@@ -227,11 +227,11 @@ - # find_package(HDF5) - # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") - # --# if(HDF5_FOUND) --# set(ARMA_USE_HDF5 true) --# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) --# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) --# endif() -+if(HDF5_FOUND) -+ set(ARMA_USE_HDF5 true) -+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) -+ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) -+ endif() - - - include(ARMA_FindARPACK)
