sci-libs/arrayfire: Update patches

Package-Manager: portage-2.2.14

5 files changed, 27 insertions, 2 deletions

diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 18acb43da..8f534c615 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +files/arrayfire-0.9999-CMakeLists_examples.patch,
+  +files/arrayfire-0.9999-build_gtest.patch,
+  +files/arrayfire-9999-CMakeLists_examples.patch,
+  -files/CMakeLists_examples.patch, -files/build_gtest.patch,
+  arrayfire-9999.ebuild:
+  Update patches
+
   19 Feb 2015; Marius Brehler <marbre@linux.sungazer.de> arrayfire-9999.ebuild:
   Fix SLOT operators
 
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index 5df0538c6..91c16ac0a 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -40,10 +40,13 @@ CMAKE_BUILD_TYPE=Release
 
 PATCHES=(
 	"${FILESDIR}"/FindCBLAS.patch
-	"${FILESDIR}"/CMakeLists_examples.patch
-	"${FILESDIR}"/build_gtest.patch
+	"${FILESDIR}/${P}"-CMakeLists_examples.patch
 )
 
+if [[ ${PV} == "0.9999" ]] ; then
+	PATCHES+=("${FILESDIR}/${P}"-build_gtest.patch)
+fi
+
 # 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"
diff --git a/sci-libs/arrayfire/files/CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch
index 89020f675..89020f675 100644
--- a/sci-libs/arrayfire/files/CMakeLists_examples.patch
+++ b/sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch
diff --git a/sci-libs/arrayfire/files/build_gtest.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch
index 4b777c4fa..4b777c4fa 100644
--- a/sci-libs/arrayfire/files/build_gtest.patch
+++ b/sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch
diff --git a/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch
new file mode 100644
index 000000000..56885cb1a
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch
@@ -0,0 +1,14 @@
+Adjust installation path of examples.
+
+Patch by Marius Brehler.
+
+--- examples/CMakeLists.txt
++++ examples/CMakeLists.txt_new
+@@ -18,6 +18,7 @@ MACRO(CREATE_EXAMPLES BACKEND)
+                                COMPILE_FLAGS -DAF_${DEF_NAME}
+                                OUTPUT_NAME ${EXAMPLE}_${BACKEND}
+                                RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
++        INSTALL(TARGETS ${EXAMPLE_NAME} DESTINATION share/arrayfire/examples)
+      ENDFOREACH()
+ ENDMACRO(CREATE_EXAMPLES)
+