[gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/files/, sci-libs/arrayfire/

[Marius Brehler]

commit:     2b45c47e0027abe02020ea299c6f12a35481a86e
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Jan  2 08:42:55 2017 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Jan  2 08:42:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2b45c47e

sci-libs/arrayfire: Drop old

Package-Manager: portage-2.3.0

 sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild       | 113 ---------------------
 .../files/arrayfire-3.4.1-FindCBLAS.patch          |  37 -------
 2 files changed, 150 deletions(-)

diff --git a/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
deleted file mode 100644
index 563042a..0000000
--- a/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-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://github.com/google/googletest/archive/release-${GTEST_PV}.zip -> gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-
-LICENSE="BSD
-	nonfree? ( OpenSIFT )"
-SLOT="0"
-IUSE="+examples +cpu cuda nonfree opencl test unified graphics"
-
-RDEPEND="
-	>=sys-devel/gcc-4.7:*
-	media-libs/freeimage
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0.44
-		dev-libs/boost
-	)
-	cpu? (
-		virtual/blas
-		virtual/cblas
-		virtual/lapacke
-		sci-libs/fftw:3.0
-	)
-	opencl? (
-		virtual/blas
-		virtual/cblas
-		virtual/lapacke
-		>=sci-libs/clblas-2.4
-		>=sci-libs/clfft-2.6.1
-		>=dev-libs/boost-1.61.0
-		dev-libs/opencl-clhpp
-	)
-	graphics? (
-		media-libs/glbinding
-		>=media-libs/glfw-3.1.1
-		=sci-visualization/forge-0.9.0
-	)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-full-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=("${FILESDIR}/${P}-FindCBLAS.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 nonfree; then
-		find "${WORKDIR}" -name "*_nonfree*" -delete || die
-	fi
-
-	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=(
-		-DBUILD_CPU="$(usex cpu)"
-		-DBUILD_CUDA="$(usex cuda)"
-		-DBUILD_OPENCL="$(usex opencl)"
-		-DBUILD_EXAMPLES="$(usex examples)"
-		-DBUILD_TEST="$(usex test)"
-		-DBUILD_GRAPHICS="$(usex graphics)"
-		-DBUILD_NONFREE="$(usex nonfree)"
-		-DBUILD_UNIFIED="$(usex unified)"
-		-DUSE_SYSTEM_BOOST_COMPUTE=ON
-		-DUSE_SYSTEM_CL2HPP=ON
-		-DUSE_SYSTEM_CLBLAS=ON
-		-DUSE_SYSTEM_CLFFT=ON
-		-DUSE_SYSTEM_FORGE=ON
-		-DUSE_SYSTEM_GLBINDING=ON
-		-DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dobin "${BUILD_DIR}/bin2cpp"
-}

diff --git a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
deleted file mode 100644
index b75569f..0000000
--- a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/arrayfire/arrayfire/pull/1657
-
-
-From 23228318b153bdc5bb30e084f9310b09b1644bd0 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@×××××××××××.de>
-Date: Wed, 30 Nov 2016 14:07:21 +0100
-Subject: [PATCH] FindCBLAS.cmake: Fix setting CBLAS_INCLUDE_DIR if PkgConfig
- is used
-
----
- CMakeModules/FindCBLAS.cmake | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
-index fbb646b..058b7d7 100644
---- a/CMakeModules/FindCBLAS.cmake
-+++ b/CMakeModules/FindCBLAS.cmake
-@@ -39,8 +39,14 @@ IF(PC_CBLAS_FOUND)
-     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)
-+  FIND_PATH(CBLAS_INCLUDE_DIRS NAMES cblas.h HINTS ${PC_CBLAS_INCLUDE_DIRS} )
-+  IF (NOT CBLAS_INCLUDE_DIRS)
-+    message(FATAL_ERROR "Something is wrong in your pkg-config file - cblas.h not found in ${PC_CBLAS_INCLUDE_DIRS}")
-+  ENDIF (NOT CBLAS_INCLUDE_DIRS)
-+  SET(CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS})
-+
-+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES CBLAS_INCLUDE_DIR)
-+  MARK_AS_ADVANCED(CBLAS_LIBRARIES CBLAS_INCLUDE_DIR)
- 
- ELSE(PC_CBLAS_FOUND)
- 
--- 
-2.7.3
-