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

["Justin Lecher" <jlec@gentoo.org>]

commit:     8c270480e806a72fdc2808fa504c249888288950
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Sep  8 13:19:33 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 13:19:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8c270480

sci-libs/arrayfire: Add arrayfire-3.0.2; Minor improvments

Package-Manager: portage-2.2.20.1

 sci-libs/arrayfire/ChangeLog                       |  6 ++++++
 ...rrayfire-9999.ebuild => arrayfire-3.0.2.ebuild} | 25 +++++++++++-----------
 sci-libs/arrayfire/arrayfire-9999.ebuild           |  6 +++---
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 22c0ef3..3e36536 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*arrayfire-3.0.2 (08 Sep 2015)
+
+  08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +arrayfire-3.0.2.ebuild, arrayfire-9999.ebuild:
+  sci-libs/arrayfire: Add arrayfire-3.0.2; Minor improvments
+
   08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
   +files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,
   arrayfire-9999.ebuild:

diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
similarity index 75%
copy from sci-libs/arrayfire/arrayfire-9999.ebuild
copy to sci-libs/arrayfire/arrayfire-3.0.2.ebuild
index 5eb95c7..7c43ce3 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
@@ -4,15 +4,15 @@
 
 EAPI=5
 
-inherit cmake-utils git-r3
+inherit cmake-utils
 
 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=""
+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"
@@ -37,17 +37,18 @@ RDEPEND="
 		virtual/lapacke
 		dev-libs/boost
 		dev-libs/boost-compute
-		sci-libs/clblas
-		sci-libs/clfft
+		>=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}"/${P}-FindCBLAS.patch
-	"${FILESDIR}"/${P}-Try-PkgConf-first-to-find-LAPACKE.patch
+	"${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
@@ -63,13 +64,11 @@ pkg_pretend() {
 }
 
 src_unpack() {
-	git-r3_src_unpack
+	default
 
 	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
+		mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
 	fi
 }
 
@@ -89,7 +88,7 @@ src_configure() {
 	   -DUSE_SYSTEM_BOOST_COMPUTE=ON
 	   -DUSE_SYSTEM_CLBLAS=ON
 	   -DUSE_SYSTEM_CLFFT=ON
-	   -DBUILD_GRAPHICS=OFF 
+	   -DBUILD_GRAPHICS=OFF
 	)
 	cmake-utils_src_configure
 }

diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index 5eb95c7..b2fea92 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -46,8 +46,8 @@ BUILD_DIR="${S}/build"
 CMAKE_BUILD_TYPE=Release
 
 PATCHES=(
-	"${FILESDIR}"/${P}-FindCBLAS.patch
-	"${FILESDIR}"/${P}-Try-PkgConf-first-to-find-LAPACKE.patch
+	"${FILESDIR}/${P}"-FindCBLAS.patch
+	"${FILESDIR}/${P}"-Try-PkgConf-first-to-find-LAPACKE.patch
 )
 
 # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
@@ -89,7 +89,7 @@ src_configure() {
 	   -DUSE_SYSTEM_BOOST_COMPUTE=ON
 	   -DUSE_SYSTEM_CLBLAS=ON
 	   -DUSE_SYSTEM_CLFFT=ON
-	   -DBUILD_GRAPHICS=OFF 
+	   -DBUILD_GRAPHICS=OFF
 	)
 	cmake-utils_src_configure
 }