commit: 5461c03cab7a539008f41ce293e0fa28362dc675 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Sun Sep 6 10:16:05 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 10:16:05 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5461c03c
sci-libs/clfft: Revise patches Package-Manager: portage-2.2.20.1 sci-libs/clfft/ChangeLog | 9 ++++++++ sci-libs/clfft/clfft-0.9999.ebuild | 2 -- sci-libs/clfft/clfft-2.4-r1.ebuild | 6 +++--- sci-libs/clfft/clfft-9999.ebuild | 4 ---- ...sts.patch => clfft-2.4-client_CMakeLists.patch} | 0 ...tch => clfft-2.4-scripts_perf_CMakeLists.patch} | 0 ...ll-cmake-configuration-to-lib-cmake-clFFT.patch | 25 ---------------------- 7 files changed, 12 insertions(+), 34 deletions(-) diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog index 7e7eebb..254e3b9 100644 --- a/sci-libs/clfft/ChangeLog +++ b/sci-libs/clfft/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 06 Sep 2015; Marius Brehler <[email protected]> + +files/clfft-2.4-client_CMakeLists.patch, + +files/clfft-2.4-scripts_perf_CMakeLists.patch, + -files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch, + -files/clfft-client_CMakeLists.patch, + -files/clfft-scripts_perf_CMakeLists.patch, clfft-0.9999.ebuild, + clfft-2.4-r1.ebuild, clfft-9999.ebuild: + sci-libs/clfft: Revise patches + *clfft-2.4-r1 (05 Jun 2015) 05 Jun 2015; Marius Brehler <[email protected]> +clfft-2.4-r1.ebuild, diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild index b63bc84..fa91bc5 100644 --- a/sci-libs/clfft/clfft-0.9999.ebuild +++ b/sci-libs/clfft/clfft-0.9999.ebuild @@ -32,8 +32,6 @@ DEPEND="${RDEPEND}" RESTRICT="test" PATCHES=( - "${FILESDIR}"/clfft-client_CMakeLists.patch - "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch "${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch ) diff --git a/sci-libs/clfft/clfft-2.4-r1.ebuild b/sci-libs/clfft/clfft-2.4-r1.ebuild index 7eab543..00f177e 100644 --- a/sci-libs/clfft/clfft-2.4-r1.ebuild +++ b/sci-libs/clfft/clfft-2.4-r1.ebuild @@ -33,9 +33,9 @@ DEPEND="${RDEPEND}" RESTRICT="test" PATCHES=( - "${FILESDIR}"/clfft-client_CMakeLists.patch - "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch - "${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch + "${FILESDIR}/${P}"-client_CMakeLists.patch + "${FILESDIR}/${P}"-scripts_perf_CMakeLists.patch + "${FILESDIR}/${P}"-fix-cmake-config-install.patch ) pkg_pretend() { diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild index 91f3d26..da8499e 100644 --- a/sci-libs/clfft/clfft-9999.ebuild +++ b/sci-libs/clfft/clfft-9999.ebuild @@ -32,10 +32,6 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" -PATCHES=( - "${FILESDIR}"/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.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 diff --git a/sci-libs/clfft/files/clfft-client_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch similarity index 100% rename from sci-libs/clfft/files/clfft-client_CMakeLists.patch rename to sci-libs/clfft/files/clfft-2.4-client_CMakeLists.patch diff --git a/sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch b/sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch similarity index 100% rename from sci-libs/clfft/files/clfft-scripts_perf_CMakeLists.patch rename to sci-libs/clfft/files/clfft-2.4-scripts_perf_CMakeLists.patch 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 deleted file mode 100644 index dc317d4..0000000 --- a/sci-libs/clfft/files/clfft-9999-Install-cmake-configuration-to-lib-cmake-clFFT.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001 -From: Marius Brehler <[email protected]> -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 -
