aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-06 11:46:05 +0200
committerJustin Lecher <jlec@gentoo.org>2015-06-06 11:46:05 +0200
commit80de9dc8cc9e9dd43c8c9e447be921dc06656769 (patch)
tree78f950c1b30c71ccde93665e484ae292e4989b49
parentsci-biology/mira: version bump, note that >=gcc-4.9.1 is needed since 4.9.x (diff)
parentsci-libs/clblas: Fix installation of cmake configuration (diff)
downloadsci-80de9dc8cc9e9dd43c8c9e447be921dc06656769.tar.gz
sci-80de9dc8cc9e9dd43c8c9e447be921dc06656769.tar.bz2
sci-80de9dc8cc9e9dd43c8c9e447be921dc06656769.zip
Merge remote-tracking branch 'github/master'
* github/master: sci-libs/clblas: Fix installation of cmake configuration sci-libs/clblas: Drop old dev-libs/boost-compute: Update HOMEPAGE, SRC_URI and github remote-id: project was transfered on from kylelutz to boostorg sci-libs/clfft: Drop old; Install cmake configuration sci-libs/clfft: Cleanup ebuilds sci-libs/clfft: Fork 0.9999 from 9999 sci-libs/clfft: Fork 2.4 from 9999 sci-libs/clblas: Cleanup ebuilds sci-libs/clblas: Fork 2.4 from 9999
-rw-r--r--dev-libs/boost-compute/ChangeLog5
-rw-r--r--dev-libs/boost-compute/boost-compute-9999.ebuild6
-rw-r--r--dev-libs/boost-compute/metadata.xml2
-rw-r--r--sci-libs/clblas/ChangeLog16
-rw-r--r--sci-libs/clblas/Manifest1
-rw-r--r--sci-libs/clblas/clblas-2.4-r1.ebuild (renamed from sci-libs/clblas/clblas-2.2.ebuild)16
l---------sci-libs/clblas/clblas-2.4.ebuild1
-rw-r--r--sci-libs/clblas/clblas-9999.ebuild15
-rw-r--r--sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch11
-rw-r--r--sci-libs/clblas/files/clblas-2.2-library_tools_tune_CMakeLists.patch14
-rw-r--r--sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch25
-rw-r--r--sci-libs/clfft/ChangeLog12
-rw-r--r--sci-libs/clfft/Manifest1
-rw-r--r--[l---------]sci-libs/clfft/clfft-0.9999.ebuild54
l---------sci-libs/clfft/clfft-2.2.ebuild1
-rw-r--r--sci-libs/clfft/clfft-2.4-r1.ebuild54
l---------sci-libs/clfft/clfft-2.4.ebuild1
-rw-r--r--sci-libs/clfft/clfft-9999.ebuild28
-rw-r--r--sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch128
-rw-r--r--sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch25
20 files changed, 337 insertions, 79 deletions
diff --git a/dev-libs/boost-compute/ChangeLog b/dev-libs/boost-compute/ChangeLog
index c4816bfe9..0b089ee71 100644
--- a/dev-libs/boost-compute/ChangeLog
+++ b/dev-libs/boost-compute/ChangeLog
@@ -1,6 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de>
+ boost-compute-9999.ebuild, metadata.xml:
+ dev-libs/boost-compute: Update HOMEPAGE, SRC_URI and github remote-id: project
+ was transfered on from kylelutz to boostorg
+
05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
dev-libs/boost-compute: Add github to remote-id in metadata.xml
diff --git a/dev-libs/boost-compute/boost-compute-9999.ebuild b/dev-libs/boost-compute/boost-compute-9999.ebuild
index b9b09c936..aebd86d14 100644
--- a/dev-libs/boost-compute/boost-compute-9999.ebuild
+++ b/dev-libs/boost-compute/boost-compute-9999.ebuild
@@ -7,16 +7,16 @@ EAPI=5
inherit eutils cmake-utils
DESCRIPTION="A header-only C++ Computing Library for OpenCL"
-HOMEPAGE="https://github.com/kylelutz/compute"
+HOMEPAGE="https://github.com/boostorg/compute"
LICENSE="Boost-1.0"
SLOT="0"
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/kylelutz/compute.git git://github.com/kylelutz/compute.git"
+ EGIT_REPO_URI="https://github.com/boostorg/compute.git git://github.com/boostorg/compute.git"
inherit git-r3
KEYWORDS=""
else
- SRC_URI="https://github.com/kylelutz/compute/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/boostorg/compute/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/compute-${PV}"
fi
diff --git a/dev-libs/boost-compute/metadata.xml b/dev-libs/boost-compute/metadata.xml
index ea38de657..b93ef2986 100644
--- a/dev-libs/boost-compute/metadata.xml
+++ b/dev-libs/boost-compute/metadata.xml
@@ -13,6 +13,6 @@
and memory buffers.
</longdescription>
<upstream>
- <remote-id type="github">kylelutz/compute</remote-id>
+ <remote-id type="github">boostorg/compute</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sci-libs/clblas/ChangeLog b/sci-libs/clblas/ChangeLog
index 1a007549a..e6656f8f5 100644
--- a/sci-libs/clblas/ChangeLog
+++ b/sci-libs/clblas/ChangeLog
@@ -2,6 +2,22 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*clblas-2.4-r1 (06 Jun 2015)
+
+ 06 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> +clblas-2.4-r1.ebuild,
+ +files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch,
+ -clblas-2.4.ebuild, clblas-9999.ebuild:
+ sci-libs/clblas: Fix installation of cmake configuration
+
+ 06 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> -clblas-2.2.ebuild,
+ -files/clblas-2.2-client_CMakeLists.patch,
+ -files/clblas-2.2-library_tools_tune_CMakeLists.patch:
+ sci-libs/clblas: Drop old
+
+ 05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> clblas-2.2.ebuild,
+ clblas-2.4.ebuild, clblas-9999.ebuild:
+ sci-libs/clblas: Cleanup ebuilds
+
05 Jun 2015; Justin Lecher <jlec@gentoo.org> clblas-2.2.ebuild,
clblas-9999.ebuild:
sci-libs/clblas: Move to python-single-r1.eclass
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index b54efe1eb..47dd24365 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -1,2 +1 @@
-DIST clblas-2.2.tar.gz 794888 SHA256 0563e028485d240f8b6e6efcae61677049627b19e924dcb1ef8014065b6416df SHA512 9f094845d854130d3901d639606069050da10a33b05985757d72188b2d8ef6e7836edc105f5ad8bf2d0922eb19e9a178388260b2a9da34e2fe27dc731233ec85 WHIRLPOOL 2f81de82d584ec4f2158c1165d02221cacf3775cdb9c96617ca2e3ea1fbb7844c833e50cbd8c7b2601585771ddb81a48795dd1534200806b560954a069cf4ec1
DIST clblas-2.4.tar.gz 800848 SHA256 3e9b8e138c465df1daff0235d9c93b0005986a7257a3739aea2d4c8b60b7ed37 SHA512 ae8c1fc1bef7573b12279977fc32f9e97c9b81b9167994ca6f352587a670dcee0f486ab2b7d5191092324f5e8fc00f9a2ea29303a026a0c1201be31d384cafe7 WHIRLPOOL a97537d7390055ad608eeac66679362956db7acfa96cf1165581ff8f9adfe309b8ff8231225bd8ca6247c8f588bff24d6f648e131cec52f8e3093168a3f26f82
diff --git a/sci-libs/clblas/clblas-2.2.ebuild b/sci-libs/clblas/clblas-2.4-r1.ebuild
index 0fe40e69e..00133c2e3 100644
--- a/sci-libs/clblas/clblas-2.2.ebuild
+++ b/sci-libs/clblas/clblas-2.4-r1.ebuild
@@ -12,16 +12,9 @@ MY_PN="clBLAS"
DESCRIPTION="A software library containing BLAS routines for OpenCL"
HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/${MY_PN}-${PV}/src"
-fi
+SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_PN}-${PV}/src"
LICENSE="Apache-2.0"
SLOT="0"
@@ -45,10 +38,9 @@ DEPEND="${RDEPEND}"
RESTRICT="test"
PATCHES=(
- "${FILESDIR}/${P}"-client_CMakeLists.patch
- "${FILESDIR}/${P}"-library_tools_tune_CMakeLists.patch
"${FILESDIR}"/clblas-samples_CMakeLists.patch
"${FILESDIR}"/clblas-scripts_perf_CMakeLists.patch
+ "${FILESDIR}"/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
)
pkg_pretend() {
diff --git a/sci-libs/clblas/clblas-2.4.ebuild b/sci-libs/clblas/clblas-2.4.ebuild
deleted file mode 120000
index 9729dfdc2..000000000
--- a/sci-libs/clblas/clblas-2.4.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-clblas-9999.ebuild \ No newline at end of file
diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild
index 17688baf9..bb47c0d37 100644
--- a/sci-libs/clblas/clblas-9999.ebuild
+++ b/sci-libs/clblas/clblas-9999.ebuild
@@ -6,22 +6,14 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1
+inherit cmake-utils git-r3 python-single-r1
MY_PN="clBLAS"
DESCRIPTION="A software library containing BLAS routines for OpenCL"
HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
-
-if [ ${PV} == "9999" ] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/${MY_PN}-${PV}/src"
-fi
+EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
+S="${WORKDIR}/${P}/src"
LICENSE="Apache-2.0"
SLOT="0"
@@ -47,6 +39,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/clblas-samples_CMakeLists.patch
"${FILESDIR}"/clblas-scripts_perf_CMakeLists.patch
+ "${FILESDIR}"/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
)
pkg_pretend() {
diff --git a/sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch b/sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch
deleted file mode 100644
index 552e230e3..000000000
--- a/sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/CMakeLists.txt 2014-06-19 22:53:25.000000000 +0200
-+++ client/CMakeLists.txt.new 2015-03-23 16:30:39.164046584 +0100
-@@ -52,7 +52,7 @@ include_directories(
-
- add_executable(client ${CLIENT_SRC} ${CLIENT_HEADER})
- target_link_libraries(client ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} clBLAS)
--set_target_properties( client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+set_target_properties( client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" OUTPUT_NAME clBLAS-client )
-
- add_executable(testPerfWrapper ${WRAPPER_SRC})
- target_link_libraries(testPerfWrapper ${Boost_LIBRARIES})
diff --git a/sci-libs/clblas/files/clblas-2.2-library_tools_tune_CMakeLists.patch b/sci-libs/clblas/files/clblas-2.2-library_tools_tune_CMakeLists.patch
deleted file mode 100644
index 5f1f763fe..000000000
--- a/sci-libs/clblas/files/clblas-2.2-library_tools_tune_CMakeLists.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Install tune as clBLAS-tune.
-
-Patch by Marius Brehler.
---- library/tools/tune/CMakeLists.txt
-+++ library/tools/tune/CMakeLists.txt
-@@ -138,7 +138,7 @@ endif()
- add_executable(tune ${TOOLS_SRC} ${TOOLS_EXTERNAL_SRC})
- add_dependencies(tune GENERATE_CLT)
- target_link_libraries(tune ${OPENCL_LIBRARIES} ${TIME_LIBRARY} ${MATH_LIBRARY})
--set_target_properties( tune PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+set_target_properties( tune PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" OUTPUT_NAME clBLAS-tune )
-
- # CPack configuration; include the executable into the package
- install( TARGETS tune
diff --git a/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch b/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
new file mode 100644
index 000000000..32cb7b553
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch
@@ -0,0 +1,25 @@
+From b83750ab917b12500f9755dc4c81f99eb55bb67e Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Sat, 6 Jun 2015 10:35:32 +0200
+Subject: [PATCH] Install cmake configuration to lib/cmake/clBLAS
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a23cd37..5c378dc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -300,7 +300,7 @@ endif( )
+ if(WIN32)
+ set(destdir CMake)
+ else()
+- set(destdir share/clBLAS)
++ set(destdir lib${SUFFIX_LIB}/cmake/clBLAS)
+ endif()
+ string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+ configure_file(
+--
+2.3.6
+
diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog
index a30e2d4e3..eb0991326 100644
--- a/sci-libs/clfft/ChangeLog
+++ b/sci-libs/clfft/ChangeLog
@@ -2,6 +2,18 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*clfft-2.4-r1 (05 Jun 2015)
+
+ 05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> +clfft-2.4-r1.ebuild,
+ +files/clfft-2.4-fix-cmake-config-install.patch,
+ +files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch,
+ -clfft-2.2.ebuild, -clfft-2.4.ebuild, clfft-0.9999.ebuild, clfft-9999.ebuild:
+ sci-libs/clfft: Drop old; Install cmake configuration
+
+ 05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de> clfft-0.9999.ebuild,
+ clfft-2.4.ebuild, clfft-9999.ebuild:
+ sci-libs/clfft: Cleanup ebuilds
+
05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
sci-libs/clfft: Add github to remote-id in metadata.xml
diff --git a/sci-libs/clfft/Manifest b/sci-libs/clfft/Manifest
index 6d6894071..65c5acaf2 100644
--- a/sci-libs/clfft/Manifest
+++ b/sci-libs/clfft/Manifest
@@ -1,2 +1 @@
-DIST clfft-2.2.tar.gz 678144 SHA256 eed3cc196c1b18785291261294655daa4c7d4d9e8b4a3aad26004db55f544e0d SHA512 b7a2e7e3c0c1f7126c37e4a39f09c72c2ac0d3a29e12a3f86deaae7090114dae8e925a03fcc8d39f8530c200de7ec6e3cfc4c8ad76ed5a39f555e76082c86850 WHIRLPOOL 8f7a1919aff1e5cd1044ba4c17cd2b98b652e65b74b7dc8400020071d9a949f0981ed1c578d0916397ca5c171bd8a378788f3cedaf70a9d255de96de67ce4718
DIST clfft-2.4.tar.gz 678262 SHA256 d77506af774bbe8ccf4226a58e623c8a29587edcf02984e72851099be0efe04b SHA512 3450f3ee962e1722c765e962178c57df0bf298508603ac5b4ec12bd6396dc10279136d5b91383b9da56d95cebd0e552bf78e2c01ccaeb8cd43ed947b7d536209 WHIRLPOOL 6ec21e182deac2a8c0a102a96c974289e56cf3f9908fbf067d7105f50646270bee2e17cf98fdf6cecf8ce28c8714c710ce46f514f7cfc1de205d5ef48bb5a0ed
diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild
index b6c165da9..0aebebb39 120000..100644
--- a/sci-libs/clfft/clfft-0.9999.ebuild
+++ b/sci-libs/clfft/clfft-0.9999.ebuild
@@ -1 +1,53 @@
-clfft-9999.ebuild \ No newline at end of file
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils git-r3
+
+MY_PN="clFFT"
+
+DESCRIPTION="A software library containing FFT functions written in OpenCL"
+HOMEPAGE="https://github.com/clMathLibraries/clFFT"
+EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ >=sys-devel/gcc-4.6:*
+ virtual/opencl
+ dev-libs/boost"
+DEPEND="${RDEPEND}"
+# test? (
+# dev-cpp/gtest
+# sci-libs/fftw:3.0
+# )"
+
+# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
+# Therefore src_test() won't execute any test.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/clfft-client_CMakeLists.patch
+ "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
+ "${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
+ die "Compilation with gcc older than 4.6 is not supported."
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build test TEST)
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/clfft/clfft-2.2.ebuild b/sci-libs/clfft/clfft-2.2.ebuild
deleted file mode 120000
index b6c165da9..000000000
--- a/sci-libs/clfft/clfft-2.2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-clfft-9999.ebuild \ No newline at end of file
diff --git a/sci-libs/clfft/clfft-2.4-r1.ebuild b/sci-libs/clfft/clfft-2.4-r1.ebuild
new file mode 100644
index 000000000..6b9893890
--- /dev/null
+++ b/sci-libs/clfft/clfft-2.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_PN="clFFT"
+
+DESCRIPTION="A software library containing FFT functions written in OpenCL"
+HOMEPAGE="https://github.com/clMathLibraries/clFFT"
+SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ >=sys-devel/gcc-4.6:*
+ virtual/opencl
+ dev-libs/boost"
+DEPEND="${RDEPEND}"
+# test? (
+# dev-cpp/gtest
+# sci-libs/fftw:3.0
+# )"
+
+# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
+# Therefore src_test() won't execute any test.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/clfft-client_CMakeLists.patch
+ "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
+ "${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
+ die "Compilation with gcc older than 4.6 is not supported."
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build test TEST)
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/clfft/clfft-2.4.ebuild b/sci-libs/clfft/clfft-2.4.ebuild
deleted file mode 120000
index b6c165da9..000000000
--- a/sci-libs/clfft/clfft-2.4.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-clfft-9999.ebuild \ No newline at end of file
diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index 994dad99c..96b7dcdf3 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -4,25 +4,15 @@
EAPI=5
-inherit cmake-utils
+inherit cmake-utils git-r3
MY_PN="clFFT"
DESCRIPTION="A software library containing FFT functions written in OpenCL"
HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-
-if [ ${PV} == "9999" ] || [ ${PV} == "0.9999" ]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
- S="${WORKDIR}/${P}/src"
- if [ ${PV} == "9999" ]; then
- EGIT_BRANCH="develop"
- fi
-else
- SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/${MY_PN}-${PV}/src"
-fi
+EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
+EGIT_BRANCH="develop"
+S="${WORKDIR}/${P}/src"
LICENSE="Apache-2.0"
SLOT="0"
@@ -42,13 +32,9 @@ DEPEND="${RDEPEND}"
# Therefore src_test() won't execute any test.
RESTRICT="test"
-# Patches are only needed for the recent master and releases <= 2.4
-if [ ${PV} != "9999" ]; then
- PATCHES=(
- "${FILESDIR}"/clfft-client_CMakeLists.patch
- "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch
- )
-fi
+PATCHES=(
+ "${FILESDIR}"/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
+)
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
diff --git a/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch b/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
new file mode 100644
index 000000000..6dd1e15db
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-2.4-fix-cmake-config-install.patch
@@ -0,0 +1,128 @@
+Upstream patch, with modified destdir
+https://github.com/clMathLibraries/clFFT/pull/88
+
+
+Description: install missing cmake config module
+Author: <kent.knox@amd>
+Origin: upstream
+Forwarded: not-needed
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -283,6 +283,29 @@ else( )
+ message( "GoogleTest unit tests will NOT be built" )
+ endif( )
+
++if( BUILD_EXAMPLES )
++ add_subdirectory( examples )
++endif()
++
++if(WIN32)
++ set(destdir CMake)
++else()
++ set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
++endif()
++string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
++configure_file(
++ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
++ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
++ @ONLY)
++configure_file(
++ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfig.cmake.in
++ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
++ @ONLY)
++install(EXPORT Library DESTINATION ${destdir} FILE clFFTTargets.cmake)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
++ DESTINATION ${destdir})
++
+ # The following code is setting variables to control the behavior of CPack to generate our
+ if( WIN32 )
+ set( CPACK_SOURCE_GENERATOR "ZIP" )
+diff --git a/src/clFFTConfig.cmake.in b/src/clFFTConfig.cmake.in
+new file mode 100644
+index 0000000..5b58c35
+--- /dev/null
++++ b/src/clFFTConfig.cmake.in
+@@ -0,0 +1,3 @@
++include(${CMAKE_CURRENT_LIST_DIR}/clFFTTargets.cmake)
++get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE)
++set(CLFFT_LIBRARIES clFFT)
+diff --git a/src/clFFTConfigVersion.cmake.in b/src/clFFTConfigVersion.cmake.in
+new file mode 100644
+index 0000000..e358473
+--- /dev/null
++++ b/src/clFFTConfigVersion.cmake.in
+@@ -0,0 +1,46 @@
++# This is a basic version file for the Config-mode of find_package().
++# It is used by write_basic_package_version_file() as input file for configure_file()
++# to create a version-file which can be installed along a config.cmake file.
++#
++# The created file sets PACKAGE_VERSION_EXACT if the current version string and
++# the requested version string are exactly the same and it sets
++# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
++# but only if the requested major version is the same as the current one.
++# The variable CLFFT_VERSION must be set before calling configure_file().
++
++
++set(PACKAGE_VERSION "@CLFFT_VERSION@")
++
++if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
++ set(PACKAGE_VERSION_COMPATIBLE FALSE)
++else()
++
++ if("@CLFFT_VERSION@" MATCHES "^([0-9]+)\\.")
++ set(CLFFT_VERSION_MAJOR "${CMAKE_MATCH_1}")
++ else()
++ set(CLFFT_VERSION_MAJOR "@CLFFT_VERSION@")
++ endif()
++
++ if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CLFFT_VERSION_MAJOR}")
++ set(PACKAGE_VERSION_COMPATIBLE TRUE)
++ else()
++ set(PACKAGE_VERSION_COMPATIBLE FALSE)
++ endif()
++
++ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
++ set(PACKAGE_VERSION_EXACT TRUE)
++ endif()
++endif()
++
++
++# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
++if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
++ return()
++endif()
++
++# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
++if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
++ math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
++ set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
++ set(PACKAGE_VERSION_UNSUITABLE TRUE)
++endif()
+diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
+index 63ac0f9..0d400d8 100644
+--- a/src/library/CMakeLists.txt
++++ b/src/library/CMakeLists.txt
+@@ -95,6 +95,7 @@ endif( )
+
+ # CPack configuration; include the executable into the package
+ install( TARGETS clFFT
++ EXPORT Library
+ RUNTIME DESTINATION bin${SUFFIX_BIN}
+ LIBRARY DESTINATION lib${SUFFIX_LIB}
+ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
+index a635bf1..3dc026f 100644
+--- a/src/statTimer/CMakeLists.txt
++++ b/src/statTimer/CMakeLists.txt
+@@ -80,6 +80,7 @@ endif( )
+
+ # CPack configuration; include the executable into the package
+ install( TARGETS StatTimer
++ EXPORT Library
+ RUNTIME DESTINATION bin${SUFFIX_BIN}
+ LIBRARY DESTINATION lib${SUFFIX_LIB}
+ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+--
+2.1.4
+
diff --git a/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch b/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
new file mode 100644
index 000000000..dc317d40d
--- /dev/null
+++ b/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch
@@ -0,0 +1,25 @@
+From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marbre@linux.sungazer.de>
+Date: Fri, 5 Jun 2015 14:59:29 +0200
+Subject: [PATCH] Install cmake configuration to lib/cmake/clFFT
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ad15e4a..73200fa 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -290,7 +290,7 @@ endif()
+ if(WIN32)
+ set(destdir CMake)
+ else()
+- set(destdir share/clFFT)
++ set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
+ endif()
+ string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+ configure_file(
+--
+2.0.5
+