aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Brehler <marbre@linux.sungazer.de>2015-09-18 10:35:51 +0200
committerMarius Brehler <marbre@linux.sungazer.de>2015-09-18 10:36:12 +0200
commitc4d7001938b7ff967f4d9af2aee645fcecc91f85 (patch)
tree59b006d3ee03ca4b7b3dc1e111509a87e104f882 /sci-libs/arrayfire
parentMerge pull request #490 from kiwifb/ipyparallel (diff)
downloadsci-c4d7001938b7ff967f4d9af2aee645fcecc91f85.tar.gz
sci-c4d7001938b7ff967f4d9af2aee645fcecc91f85.tar.bz2
sci-c4d7001938b7ff967f4d9af2aee645fcecc91f85.zip
sci-libs/arrayfire: Drop old
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sci-libs/arrayfire')
-rw-r--r--sci-libs/arrayfire/ChangeLog7
-rw-r--r--sci-libs/arrayfire/Manifest2
-rw-r--r--sci-libs/arrayfire/arrayfire-3.0.2.ebuild100
-rw-r--r--sci-libs/arrayfire/arrayfire-3.0_beta.ebuild94
-rw-r--r--sci-libs/arrayfire/arrayfire-3.1.0.ebuild100
-rw-r--r--sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch34
-rw-r--r--sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch52
-rw-r--r--sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch26
8 files changed, 7 insertions, 408 deletions
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index acf4051cc..d7a241bf2 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 18 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -arrayfire-3.0.2.ebuild, -arrayfire-3.0_beta.ebuild, -arrayfire-3.1.0.ebuild,
+ -files/arrayfire-3.0_beta-FindBoostCompute.patch,
+ -files/arrayfire-3.0_beta-FindCBLAS.patch,
+ -files/arrayfire-3.0_beta-opencl_CMakeLists.patch:
+ sci-libs/arrayfire: Drop old
+
*arrayfire-3.1.1-r1 (17 Sep 2015)
17 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
diff --git a/sci-libs/arrayfire/Manifest b/sci-libs/arrayfire/Manifest
index dc008a4f7..96cb9b9b8 100644
--- a/sci-libs/arrayfire/Manifest
+++ b/sci-libs/arrayfire/Manifest
@@ -1,4 +1,2 @@
-DIST arrayfire-3.0.2.tar.bz2 19945111 SHA256 0253da88d5823b365dcf2627885150a8cea848311791fb5b7a9d6ce91075d8db SHA512 c61ba8dbe62ed5c590a3e153ceb2641f9ab4e8e866b43930e47fa871560c6611f8d5435a5aa6aa77eac1882b570821c60fa811272abf3548e7f924da5510fd13 WHIRLPOOL 990a975832e778a19ae4658768d92f31fae960535d30f044986244c01645d74cf7e1f0fd4021024cd8170ee1a79dfdad0c7cdb4ca0dcf1c0c12e65e6f7d3e2d7
-DIST arrayfire-3.1.0.tar.bz2 23432406 SHA256 1ab54a02eb4db4d771b0b70c074f12c1c32b1ee3bbf6a3b148a537a43830b68a SHA512 bc5fab27a0b1690fb8d05e96a2f1ce17f2e8bf19574384ab615b0e2b6b2e10df79d926e2e4d2409bcf0d79fd96bfe3cd53950879db39c937ed959756b5925710 WHIRLPOOL a5bab0bb2b1a530838ff4319a0bf6b5a358286ce8b52cfc8a05a4a7190103ff3acf6a4e340eb6677ba5561fbc50812807c692306954583c430097d6035f449bd
DIST arrayfire-3.1.1.tar.bz2 23466597 SHA256 d353ec37ada7e20cf231f2d997d743553e503956b1ca679cd56097bddbac9f64 SHA512 cd8d25983285fc21673d979fcf26f8521b418fb8b51b07046100eccf648131fa411f81490193e47dde99a823212acf9a824d1fcf5e157edef0bee7290187ce5c WHIRLPOOL bf62f720d191e327639d28d7c5d534201df52bbf81ace3513a3ee0836013a7b0e6b7905d6880bd231e30b7d55795e7aa61475769f4ffb2e6a1962eef0f57ed53
DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
diff --git a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild b/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
deleted file mode 100644
index 7c43ce325..000000000
--- a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2
-test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- media-libs/freeimage
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- sci-libs/fftw:3.0
- )
- opencl? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- dev-libs/boost
- dev-libs/boost-compute
- >=sci-libs/clblas-2.4
- >=sci-libs/clfft-2.6.1
- )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${PN}"-9999-FindCBLAS.patch
- "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- -DUSE_SYSTEM_BOOST_COMPUTE=ON
- -DUSE_SYSTEM_CLBLAS=ON
- -DUSE_SYSTEM_CLFFT=ON
- -DBUILD_GRAPHICS=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild b/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild
deleted file mode 100644
index 75337f05f..000000000
--- a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils git-r3
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git://github.com/${PN}/${PN}.git"
-SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-EGIT_COMMIT="v3.0beta"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- sci-libs/fftw:3.0
- )
- opencl? (
- dev-libs/boost
- dev-libs/boost-compute
- sci-libs/clblas
- sci-libs/clfft
- )"
-DEPEND="${RDEPEND}"
-
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}"/${P}-FindCBLAS.patch
- "${FILESDIR}"/${P}-FindBoostCompute.patch
- "${FILESDIR}"/${P}-opencl_CMakeLists.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- git-r3_src_unpack
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- cd "${BUILD_DIR}"/third_party/src/ || die
- unpack ${A}
- mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild b/sci-libs/arrayfire/arrayfire-3.1.0.ebuild
deleted file mode 100644
index 47030283e..000000000
--- a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2
-test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- media-libs/freeimage
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- sci-libs/fftw:3.0
- )
- opencl? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- dev-libs/boost
- dev-libs/boost-compute
- >=sci-libs/clblas-2.4
- >=sci-libs/clfft-2.6.1
- )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-full-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${PN}"-9999-FindCBLAS.patch
- "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- -DUSE_SYSTEM_BOOST_COMPUTE=ON
- -DUSE_SYSTEM_CLBLAS=ON
- -DUSE_SYSTEM_CLFFT=ON
- -DBUILD_GRAPHICS=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
deleted file mode 100644
index 3052df20d..000000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Set BoostCompute inlcude dir.
-
-Patch by Marius Brehler.
-
---- CMakeModules/FindBoostCompute.cmake
-+++ CMakeModules/FindBoostCompute.cmake
-@@ -3,25 +3,10 @@
- # * BoostCompute_FOUND Flag for Boost Compute
- # * BoostCompute_INCLUDE_DIR Location of the Boost Compute headers
-
--# Look a directory above for the Boost Compute folder
--FIND_PATH( BoostCompute_SOURCE_DIR
-- NAMES include/boost/compute.hpp
-- PATH_SUFFIXES compute BoostCompute
-- DOC "Location of the Boost Compute source directory"
-- PATHS ${CMAKE_SOURCE_DIR}/..
-- ${CMAKE_SOURCE_DIR}/../..
-- /usr/local)
-
--FIND_PATH( BoostCompute_INCLUDE_DIR
-- NAMES boost/compute.hpp
-- DOC "Location of the Boost Compute include directory."
-- PATHS ${BoostCompute_SOURCE_DIR}/include)
-+set(BoostCompute_INCLUDE_DIR "/usr/include/compute")
-+SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" )
-
--IF(BoostCompute_INCLUDE_DIR AND BoostCompute_SOURCE_DIR)
-- SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" )
--ELSE()
-- SET( BoostCompute_FOUND OFF CACHE BOOL "BoostCompute Found" )
--ENDIF()
-
- IF(NOT BoostCompute_FOUND)
- MESSAGE(FATAL_ERROR, "Boost.Compute not found! Clone Boost.Compute from https://github.com/kylelutz/compute.git")
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
deleted file mode 100644
index 263c62aaf..000000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Use pkg-config to find cblas.
-
-Patch by Marius Brehler.
-
---- b/CMakeModules/FindCBLAS.cmake
-+++ a/CMakeModules/FindCBLAS.cmake
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for cblas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # Using FindCBLAS.cmake from the following repo
- # https://github.com/clementfarabet/THC/blob/master/COPYRIGHT.txt
-
-@@ -18,6 +24,29 @@ SET(CBLAS_LIBRARIES)
- SET(CBLAS_INCLUDE_DIR)
- SET(CBLAS_INCLUDE_FILE)
-
-+
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_CBLAS cblas)
-+if(PC_CBLAS_FOUND)
-+ foreach(PC_LIB ${PC_CBLAS_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_CBLAS_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_CBLAS_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(CBLAS DEFAULT_MSG CBLAS_LIBRARIES)
-+ mark_as_advanced(CBLAS_LIBRARIES)
-+else(PC_CBLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for CBLAS found; starting more extensive search.")
-+
-+
-+
-+
-+
- # CBLAS in Intel mkl
- FIND_PACKAGE(MKL)
- IF (MKL_FOUND AND NOT CBLAS_LIBRARIES)
-@@ -203,3 +232,5 @@ IF(NOT CBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "CBLAS library not found.")
- ENDIF(CBLAS_FOUND)
- ENDIF(NOT CBLAS_FIND_QUIETLY)
-+
-+endif(PC_CBLAS_FOUND)
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
deleted file mode 100644
index 7279afaa6..000000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Do not install clFFT/clBLAS headers.
-
-Patch by Marius Brehler.
-
---- src/backend/opencl/CMakeLists.txt
-+++ src/backend/opencl/CMakeLists.txt
-@@ -18,9 +18,6 @@ ADD_DEFINITIONS(-DAF_OPENCL
- FIND_PACKAGE(CLBLAS REQUIRED)
- INCLUDE_DIRECTORIES(${CLBLAS_INCLUDE_DIRS})
- LINK_DIRECTORIES(${CLBLAS_LIBRARY_DIR})
--# Custom install command
--INSTALL(DIRECTORY "${CLBLAS_PACKAGE_DIR}/include/" DESTINATION include
-- COMPONENT headers)
- IF(UNIX)
- FILE(GLOB CLBLAS_LIBS "${CLBLAS_PACKAGE_DIR}/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
- ELSEIF(WIN32)
-@@ -33,9 +30,6 @@ INSTALL(FILES ${CLBLAS_LIBS} DESTINATION
- FIND_PACKAGE(clFFT REQUIRED)
- INCLUDE_DIRECTORIES(${CLFFT_INCLUDE_DIRS})
- LINK_DIRECTORIES(${CLFFT_LIBRARY_DIR})
--# Custom install command
--INSTALL(DIRECTORY "${CLFFT_BUILD_DIR}/package/include/" DESTINATION include
-- COMPONENT headers)
- IF(UNIX)
- FILE(GLOB CLFFT_LIBS "${CLFFT_BUILD_DIR}/package/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
- ELSE(UNIX)