Gentoo Archives: gentoo-commits

From: Marius Brehler <marbre@××××××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/, sci-libs/clfft/files/
Date: Mon, 25 Apr 2016 08:48:40
Message-Id: 1461574039.5a8af573fdea28725ce64c507e89000206fc3dd0.marbre@gentoo
1 commit: 5a8af573fdea28725ce64c507e89000206fc3dd0
2 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
3 AuthorDate: Mon Apr 25 08:47:19 2016 +0000
4 Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
5 CommitDate: Mon Apr 25 08:47:19 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5a8af573
7
8 sci-libs/clfft: Drop old
9
10 Package-Manager: portage-2.2.26
11
12 sci-libs/clfft/clfft-2.6.1.ebuild | 56 -------------------
13 sci-libs/clfft/clfft-2.8-r1.ebuild | 62 ----------------------
14 sci-libs/clfft/clfft-2.8.ebuild | 61 ---------------------
15 ...ll-cmake-configuration-to-lib-cmake-clFFT.patch | 25 ---------
16 ...-Install-examples-to-share-clFFT-examples.patch | 15 ------
17 5 files changed, 219 deletions(-)
18
19 diff --git a/sci-libs/clfft/clfft-2.6.1.ebuild b/sci-libs/clfft/clfft-2.6.1.ebuild
20 deleted file mode 100644
21 index bbb7f4e..0000000
22 --- a/sci-libs/clfft/clfft-2.6.1.ebuild
23 +++ /dev/null
24 @@ -1,56 +0,0 @@
25 -# Copyright 1999-2015 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -# $Id$
28 -
29 -EAPI=5
30 -
31 -inherit cmake-utils
32 -
33 -MY_PN="clFFT"
34 -
35 -DESCRIPTION="Library containing FFT functions written in OpenCL"
36 -HOMEPAGE="https://github.com/clMathLibraries/clFFT"
37 -SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
38 -
39 -LICENSE="Apache-2.0"
40 -SLOT="0"
41 -KEYWORDS="~amd64"
42 -IUSE="+client examples test"
43 -
44 -RDEPEND="
45 - >=sys-devel/gcc-4.6:*
46 - virtual/opencl
47 - dev-libs/boost"
48 -DEPEND="${RDEPEND}"
49 -# test? (
50 -# dev-cpp/gtest
51 -# sci-libs/fftw:3.0
52 -# )"
53 -
54 -# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
55 -# Therefore src_test() won't execute any test.
56 -RESTRICT="test"
57 -
58 -S="${WORKDIR}/${MY_PN}-${PV}/src"
59 -
60 -PATCHES=(
61 - "${FILESDIR}/${P}"-Install-cmake-configuration-to-lib-cmake-clFFT.patch
62 - "${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch
63 -)
64 -
65 -pkg_pretend() {
66 - if [[ ${MERGE_TYPE} != binary ]]; then
67 - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
68 - die "Compilation with gcc older than 4.6 is not supported."
69 - fi
70 - fi
71 -}
72 -
73 -src_configure() {
74 - local mycmakeargs=(
75 - $(cmake-utils_use_build client CLIENT)
76 - $(cmake-utils_use_build examples EXAMPLES)
77 - $(cmake-utils_use_build test TEST)
78 - )
79 - cmake-utils_src_configure
80 -}
81
82 diff --git a/sci-libs/clfft/clfft-2.8-r1.ebuild b/sci-libs/clfft/clfft-2.8-r1.ebuild
83 deleted file mode 100644
84 index 792567f..0000000
85 --- a/sci-libs/clfft/clfft-2.8-r1.ebuild
86 +++ /dev/null
87 @@ -1,62 +0,0 @@
88 -# Copyright 1999-2015 Gentoo Foundation
89 -# Distributed under the terms of the GNU General Public License v2
90 -# $Id$
91 -
92 -EAPI=5
93 -
94 -inherit cmake-utils
95 -
96 -MY_PN="clFFT"
97 -
98 -DESCRIPTION="Library containing FFT functions written in OpenCL"
99 -HOMEPAGE="https://github.com/clMathLibraries/clFFT"
100 -SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
101 -
102 -LICENSE="Apache-2.0"
103 -SLOT="0"
104 -KEYWORDS="~amd64"
105 -IUSE="callback_client +client examples test"
106 -
107 -RDEPEND="
108 - >=sys-devel/gcc-4.6:*
109 - virtual/opencl
110 - dev-libs/boost"
111 -DEPEND="${RDEPEND}"
112 -# test? (
113 -# dev-cpp/gtest
114 -# sci-libs/fftw:3.0
115 -# )"
116 -
117 -# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
118 -# Therefore src_test() won't execute any test.
119 -RESTRICT="test"
120 -
121 -S="${WORKDIR}/${MY_PN}-${PV}/src"
122 -
123 -pkg_pretend() {
124 - if [[ ${MERGE_TYPE} != binary ]]; then
125 - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
126 - die "Compilation with gcc older than 4.6 is not supported."
127 - fi
128 - fi
129 -}
130 -
131 -src_configure() {
132 - local mycmakeargs=(
133 - $(cmake-utils_use_build callback_client CALLBACK_CLIENT)
134 - $(cmake-utils_use_build client CLIENT)
135 - $(cmake-utils_use_build examples EXAMPLES)
136 - $(cmake-utils_use_build test TEST)
137 - -DBoost_USE_STATIC_LIBS=OFF
138 - )
139 - cmake-utils_src_configure
140 -}
141 -
142 -# Upstream fixed already adjusted their CMakeLists.txt. Thus, the (callback) client
143 -# is installed by cmake again with the next release.
144 -src_install() {
145 - cmake-utils_src_install
146 -
147 - use callback_client && dobin "${BUILD_DIR}/staging/clFFT-callback-client-2.8.0"
148 - use client && dobin "${BUILD_DIR}/staging/clFFT-client-2.8.0"
149 -}
150
151 diff --git a/sci-libs/clfft/clfft-2.8.ebuild b/sci-libs/clfft/clfft-2.8.ebuild
152 deleted file mode 100644
153 index 6d2580e..0000000
154 --- a/sci-libs/clfft/clfft-2.8.ebuild
155 +++ /dev/null
156 @@ -1,61 +0,0 @@
157 -# Copyright 1999-2015 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -# $Id$
160 -
161 -EAPI=5
162 -
163 -inherit cmake-utils
164 -
165 -MY_PN="clFFT"
166 -
167 -DESCRIPTION="Library containing FFT functions written in OpenCL"
168 -HOMEPAGE="https://github.com/clMathLibraries/clFFT"
169 -SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
170 -
171 -LICENSE="Apache-2.0"
172 -SLOT="0"
173 -KEYWORDS="~amd64"
174 -IUSE="callback_client +client examples test"
175 -
176 -RDEPEND="
177 - >=sys-devel/gcc-4.6:*
178 - virtual/opencl
179 - dev-libs/boost"
180 -DEPEND="${RDEPEND}"
181 -# test? (
182 -# dev-cpp/gtest
183 -# sci-libs/fftw:3.0
184 -# )"
185 -
186 -# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
187 -# Therefore src_test() won't execute any test.
188 -RESTRICT="test"
189 -
190 -S="${WORKDIR}/${MY_PN}-${PV}/src"
191 -
192 -pkg_pretend() {
193 - if [[ ${MERGE_TYPE} != binary ]]; then
194 - if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
195 - die "Compilation with gcc older than 4.6 is not supported."
196 - fi
197 - fi
198 -}
199 -
200 -src_configure() {
201 - local mycmakeargs=(
202 - $(cmake-utils_use_build callback_client CALLBACK_CLIENT)
203 - $(cmake-utils_use_build client CLIENT)
204 - $(cmake-utils_use_build examples EXAMPLES)
205 - $(cmake-utils_use_build test TEST)
206 - )
207 - cmake-utils_src_configure
208 -}
209 -
210 -# Upstream fixed already adjusted their CMakeLists.txt. Thus, the (callback) client
211 -# is installed by cmake again with the next release.
212 -src_install() {
213 - cmake-utils_src_install
214 -
215 - use callback_client && dobin "${BUILD_DIR}/staging/clFFT-callback-client-2.8.0"
216 - use client && dobin "${BUILD_DIR}/staging/clFFT-client-2.8.0"
217 -}
218
219 diff --git a/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch b/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
220 deleted file mode 100644
221 index dc317d4..0000000
222 --- a/sci-libs/clfft/files/clfft-2.6.1-Install-cmake-configuration-to-lib-cmake-clFFT.patch
223 +++ /dev/null
224 @@ -1,25 +0,0 @@
225 -From 6a3ba77529987d5906ba6f734bc2fa66a9155a1c Mon Sep 17 00:00:00 2001
226 -From: Marius Brehler <marbre@××××××××××××××.de>
227 -Date: Fri, 5 Jun 2015 14:59:29 +0200
228 -Subject: [PATCH] Install cmake configuration to lib/cmake/clFFT
229 -
230 ----
231 - src/CMakeLists.txt | 2 +-
232 - 1 file changed, 1 insertion(+), 1 deletion(-)
233 -
234 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
235 -index ad15e4a..73200fa 100644
236 ---- a/src/CMakeLists.txt
237 -+++ b/src/CMakeLists.txt
238 -@@ -290,7 +290,7 @@ endif()
239 - if(WIN32)
240 - set(destdir CMake)
241 - else()
242 -- set(destdir share/clFFT)
243 -+ set(destdir lib${SUFFIX_LIB}/cmake/clFFT)
244 - endif()
245 - string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
246 - configure_file(
247 ---
248 -2.0.5
249 -
250
251 diff --git a/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch b/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
252 deleted file mode 100644
253 index dff3039..0000000
254 --- a/sci-libs/clfft/files/clfft-2.6.1-Install-examples-to-share-clFFT-examples.patch
255 +++ /dev/null
256 @@ -1,15 +0,0 @@
257 -Patch to fix location of examples:
258 -https://github.com/clMathLibraries/clFFT/pull/108
259 -
260 -Backported for 2.6.1 by Marius Brehler.
261 ---- src/examples/CMakeLists.txt
262 -+++ src/examples/CMakeLists.txt
263 -@@ -47,6 +47,7 @@ FOREACH(FILE ${FILES})
264 - OUTPUT_NAME ${EXAMPLE}
265 - RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
266 -
267 -+ INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
268 - INSTALL(TARGETS ${EXAMPLE_NAME}
269 -- RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples")
270 -+ RUNTIME DESTINATION "share/clFFT/examples")
271 - ENDFOREACH()