commit: d0bb74dd3ecea6635b4b088d00fa1c3c7cbb8a90 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sat Nov 28 17:49:58 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 17:49:58 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d0bb74dd
sci-libs/clblas: QA: Style fixes and add missing PYTHON_REQUIRED_USE Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> sci-libs/clblas/clblas-2.4-r1.ebuild | 63 ---------------------- sci-libs/clblas/clblas-2.6.ebuild | 10 ++-- sci-libs/clblas/clblas-9999.ebuild | 11 ++-- ...l-cmake-configuration-to-lib-cmake-clBLAS.patch | 25 --------- .../files/clblas-2.4-samples_CMakeLists.patch | 20 ------- .../files/clblas-2.4-scripts_perf_CMakeLists.patch | 11 ---- 6 files changed, 13 insertions(+), 127 deletions(-) diff --git a/sci-libs/clblas/clblas-2.4-r1.ebuild b/sci-libs/clblas/clblas-2.4-r1.ebuild deleted file mode 100644 index 140cd9b..0000000 --- a/sci-libs/clblas/clblas-2.4-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 - -MY_PN="clBLAS" - -DESCRIPTION="A software library containing BLAS routines for OpenCL" -HOMEPAGE="https://github.com/clMathLibraries/clBLAS"; -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="+client examples +ktest performance test" - -RDEPEND=" - >=sys-devel/gcc-4.6:* - virtual/opencl - || ( >=dev-util/amdapp-2.9 dev-util/intel-ocl-sdk ) - dev-libs/boost - performance? ( ${PYTHON_DEPS} ) - " -DEPEND="${RDEPEND}" -# test? ( -# >=dev-cpp/gtest-1.6.0 -# >=sci-libs/acml-6.1.0.3 -# )" - -# 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}/${P}"-samples_CMakeLists.patch - "${FILESDIR}/${P}"-scripts_perf_CMakeLists.patch - "${FILESDIR}/${P}"-Install-cmake-configuration-to-lib-cmake-clBLAS.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 client CLIENT) - $(cmake-utils_use_build examples SAMPLE) - $(cmake-utils_use_build ktest KTEST) - $(cmake-utils_use_build performance PERFORMANCE) - $(cmake-utils_use_build test TEST) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/clblas/clblas-2.6.ebuild b/sci-libs/clblas/clblas-2.6.ebuild index 2a7b07b..d060857 100644 --- a/sci-libs/clblas/clblas-2.6.ebuild +++ b/sci-libs/clblas/clblas-2.6.ebuild @@ -13,18 +13,18 @@ MY_PN="clBLAS" DESCRIPTION="A software library containing BLAS routines for OpenCL" HOMEPAGE="https://github.com/clMathLibraries/clBLAS"; 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" +KEYWORDS="~amd64" IUSE="+client examples +ktest performance test" +REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )" + RDEPEND=" - >=sys-devel/gcc-4.6:* + dev-libs/boost virtual/opencl || ( >=dev-util/amdapp-2.9 dev-util/intel-ocl-sdk ) - dev-libs/boost performance? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" @@ -37,6 +37,8 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" +S="${WORKDIR}/${MY_PN}-${PV}/src" + pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then diff --git a/sci-libs/clblas/clblas-9999.ebuild b/sci-libs/clblas/clblas-9999.ebuild index 8df3ef8..4a25302 100644 --- a/sci-libs/clblas/clblas-9999.ebuild +++ b/sci-libs/clblas/clblas-9999.ebuild @@ -12,18 +12,19 @@ MY_PN="clBLAS" DESCRIPTION="A software library containing BLAS routines for OpenCL" HOMEPAGE="https://github.com/clMathLibraries/clBLAS"; -EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git" -S="${WORKDIR}/${P}/src" +EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git"; LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="" IUSE="+client examples +ktest performance test" +REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )" + RDEPEND=" - >=sys-devel/gcc-4.6:* + dev-libs/boost virtual/opencl || ( >=dev-util/amdapp-2.9 dev-util/intel-ocl-sdk ) - dev-libs/boost performance? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" @@ -36,6 +37,8 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" +S="${WORKDIR}/${P}/src" + pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then 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 deleted file mode 100644 index 32cb7b5..0000000 --- a/sci-libs/clblas/files/clblas-2.4-Install-cmake-configuration-to-lib-cmake-clBLAS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b83750ab917b12500f9755dc4c81f99eb55bb67e Mon Sep 17 00:00:00 2001 -From: Marius Brehler <[email protected]> -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/clblas/files/clblas-2.4-samples_CMakeLists.patch b/sci-libs/clblas/files/clblas-2.4-samples_CMakeLists.patch deleted file mode 100644 index 8b5a762..0000000 --- a/sci-libs/clblas/files/clblas-2.4-samples_CMakeLists.patch +++ /dev/null @@ -1,20 +0,0 @@ -Install samples to /usr/share/clBLAS/samples. - -Patch by Marius Brehler. ---- samples/CMakeLists.txt -+++ samples/CMakeLists.txt -@@ -274,7 +274,7 @@ install( TARGETS example_sgemm example_s - example_snrm2 example_sasum example_isamax - - version -- RUNTIME DESTINATION bin${SUFFIX_BIN} -+ RUNTIME DESTINATION share/clBLAS/samples - LIBRARY DESTINATION lib${SUFFIX_LIB} - ARCHIVE DESTINATION lib${SUFFIX_LIB}/import - ) -@@ -333,4 +333,4 @@ install(FILES - ${PROJECT_BINARY_DIR}/samples/CMakeLists.txt - - DESTINATION -- samples ) -+ share/clBLAS/samples/src ) diff --git a/sci-libs/clblas/files/clblas-2.4-scripts_perf_CMakeLists.patch b/sci-libs/clblas/files/clblas-2.4-scripts_perf_CMakeLists.patch deleted file mode 100644 index 7b9b58d..0000000 --- a/sci-libs/clblas/files/clblas-2.4-scripts_perf_CMakeLists.patch +++ /dev/null @@ -1,11 +0,0 @@ -Install Python scripts to /usr/share/clBLAS and not to /usr/bin. - -Patch by Marius Brehler. ---- scripts/perf/CMakeLists.txt -+++ scripts/perf/CMakeLists.txt -@@ -21,4 +21,4 @@ set(GRAPHING_SCRIPTS measurePerformance - performanceUtility.py - ) - --install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} ) -+install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clBLAS )
