From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 79C56138CD3 for ; Sat, 6 Jun 2015 09:46:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58348E0898; Sat, 6 Jun 2015 09:46:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 836A0E0894 for ; Sat, 6 Jun 2015 09:46:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5EF3340F6D for ; Sat, 6 Jun 2015 09:46:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EA2FA32 for ; Sat, 6 Jun 2015 09:46:08 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1433581474.88f61f96f645a13363bb55fbc3364dc8bddd320b.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clblas/, sci-libs/clblas/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/clblas/ChangeLog sci-libs/clblas/clblas-2.2.ebuild sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch sci-libs/clblas/files/clblas-2.2-library_tools_tune_CMakeLists.patch X-VCS-Directories: sci-libs/clblas/ sci-libs/clblas/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 88f61f96f645a13363bb55fbc3364dc8bddd320b X-VCS-Branch: master Date: Sat, 6 Jun 2015 09:46:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7d07752d-1777-4939-9dfb-8a1a5edafc6a X-Archives-Hash: 32309093d728dfa69febc12a1bdbfbbd commit: 88f61f96f645a13363bb55fbc3364dc8bddd320b Author: Marius Brehler linux sungazer de> AuthorDate: Sat Jun 6 09:04:34 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jun 6 09:04:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=88f61f96 sci-libs/clblas: Drop old Package-Manager: portage-2.2.18 sci-libs/clblas/ChangeLog | 5 ++ sci-libs/clblas/clblas-2.2.ebuild | 64 ---------------------- .../files/clblas-2.2-client_CMakeLists.patch | 11 ---- .../clblas-2.2-library_tools_tune_CMakeLists.patch | 14 ----- 4 files changed, 5 insertions(+), 89 deletions(-) diff --git a/sci-libs/clblas/ChangeLog b/sci-libs/clblas/ChangeLog index c6ea0b4..5ebd9c6 100644 --- a/sci-libs/clblas/ChangeLog +++ b/sci-libs/clblas/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jun 2015; Marius Brehler -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 clblas-2.2.ebuild, clblas-2.4.ebuild, clblas-9999.ebuild: sci-libs/clblas: Cleanup ebuilds diff --git a/sci-libs/clblas/clblas-2.2.ebuild b/sci-libs/clblas/clblas-2.2.ebuild deleted file mode 100644 index ff407df..0000000 --- a/sci-libs/clblas/clblas-2.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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}"-client_CMakeLists.patch - "${FILESDIR}/${P}"-library_tools_tune_CMakeLists.patch - "${FILESDIR}"/clblas-samples_CMakeLists.patch - "${FILESDIR}"/clblas-scripts_perf_CMakeLists.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/files/clblas-2.2-client_CMakeLists.patch b/sci-libs/clblas/files/clblas-2.2-client_CMakeLists.patch deleted file mode 100644 index 552e230..0000000 --- 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 5f1f763..0000000 --- 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