Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
Date: Wed, 17 Aug 2022 16:21:27
Message-Id: 1660753265.3f7cebf28a502d5407acc6dd4aaf8d130f74c255.mattst88@gentoo
1 commit: 3f7cebf28a502d5407acc6dd4aaf8d130f74c255
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 17 13:44:51 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 17 16:21:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7cebf2
7
8 media-libs/vigra: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 media-libs/vigra/vigra-1.11.1-r3.ebuild | 160 --------------------------------
13 media-libs/vigra/vigra-1.11.1-r4.ebuild | 160 --------------------------------
14 2 files changed, 320 deletions(-)
15
16 diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
17 deleted file mode 100644
18 index 65fd07b618ac..000000000000
19 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
20 +++ /dev/null
21 @@ -1,160 +0,0 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=7
26 -
27 -PYTHON_COMPAT=( python3_{7,8,9} )
28 -PYTHON_REQ_USE="threads(+),xml"
29 -inherit cmake flag-o-matic python-r1
30 -
31 -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
32 -HOMEPAGE="https://ukoethe.github.io/vigra/"
33 -
34 -if [[ ${PV} == *9999 ]] ; then
35 - EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
36 - inherit git-r3
37 -else
38 - SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
39 - KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
40 -fi
41 -
42 -LICENSE="MIT"
43 -SLOT="0"
44 -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
45 -
46 -REQUIRED_USE="
47 - python? ( hdf5 ${PYTHON_REQUIRED_USE} )
48 - test? ( hdf5 python fftw )"
49 -
50 -BDEPEND="
51 - test? (
52 - >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
53 - valgrind? ( dev-util/valgrind )
54 - )
55 -"
56 -# runtime dependency on python is required by the vigra-config script
57 -DEPEND="
58 - fftw? ( sci-libs/fftw:3.0 )
59 - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
60 - jpeg? ( virtual/jpeg:0 )
61 - openexr? (
62 - media-libs/ilmbase:=
63 - media-libs/openexr:=
64 - )
65 - png? ( media-libs/libpng:0= )
66 - python? (
67 - ${PYTHON_DEPS}
68 - dev-libs/boost:=[python?,${PYTHON_USEDEP}]
69 - dev-python/numpy[${PYTHON_USEDEP}]
70 - )
71 - tiff? ( media-libs/tiff:0= )
72 - zlib? ( sys-libs/zlib )
73 -"
74 -RDEPEND="${PYTHON_DEPS}
75 - ${DEPEND}
76 -"
77 -
78 -# Severely broken, also disabled in Fedora, bugs #390447, #653442
79 -RESTRICT="test"
80 -
81 -PATCHES=(
82 - # git master
83 - "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
84 - "${FILESDIR}/${P}-boost-python.patch"
85 - "${FILESDIR}/${P}-python3.7.patch" # bug 701208
86 - "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
87 - # TODO: upstream
88 - "${FILESDIR}/${P}-lib_suffix.patch"
89 - "${FILESDIR}/${P}-cmake-module-dir.patch"
90 - "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
91 -)
92 -
93 -pkg_setup() {
94 - use python && python_setup
95 -}
96 -
97 -src_prepare() {
98 - vigra_disable() {
99 - if ! use ${1}; then
100 - sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
101 - -i CMakeLists.txt || die "failed to disable ${1}"
102 - fi
103 - }
104 -
105 - cmake_src_prepare
106 -
107 - vigra_disable fftw fftw3
108 - vigra_disable fftw fftw3f
109 - vigra_disable jpeg
110 - vigra_disable png
111 - vigra_disable tiff
112 - vigra_disable zlib
113 -
114 - # Don't use python_fix_shebang because we can't put this behind USE="python"
115 - sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
116 -
117 - use doc || cmake_comment_add_subdirectory docsrc
118 -
119 - if ! use test; then
120 - cmake_comment_add_subdirectory test
121 - cmake_run_in vigranumpy cmake_comment_add_subdirectory test
122 - fi
123 -}
124 -
125 -src_configure() {
126 - # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
127 - # bug #808731
128 - use hdf5 && append-cppflags -DH5_USE_110_API
129 -
130 - vigra_configure() {
131 - local mycmakeargs=(
132 - -DAUTOEXEC_TESTS=OFF
133 - -DDOCINSTALL="share/doc/${PF}/html"
134 - -DWITH_HDF5=$(usex hdf5)
135 - -DWITH_OPENEXR=$(usex openexr)
136 - -DWITH_VALGRIND=$(usex valgrind)
137 - -DWITH_VIGRANUMPY=$(usex python)
138 - )
139 - cmake_src_configure
140 - }
141 -
142 - if use python; then
143 - python_foreach_impl vigra_configure
144 - else
145 - vigra_configure
146 - fi
147 -}
148 -
149 -src_compile() {
150 - local VIGRA_BUILD_DIR
151 - vigra_compile() {
152 - cmake_src_compile
153 - VIGRA_BUILD_DIR="${BUILD_DIR}"
154 - }
155 - if use python; then
156 - python_foreach_impl vigra_compile
157 - else
158 - vigra_compile
159 - fi
160 -}
161 -
162 -src_install() {
163 - if use python; then
164 - python_foreach_impl cmake_src_install
165 - python_optimize
166 - else
167 - cmake_src_install
168 - fi
169 -}
170 -
171 -src_test() {
172 - # perhaps disable tests (see #390447)
173 - vigra_test() {
174 - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
175 - }
176 - if use python; then
177 - python_foreach_impl vigra_test
178 - else
179 - vigra_test
180 - fi
181 -}
182
183 diff --git a/media-libs/vigra/vigra-1.11.1-r4.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild
184 deleted file mode 100644
185 index be3e2f9fe820..000000000000
186 --- a/media-libs/vigra/vigra-1.11.1-r4.ebuild
187 +++ /dev/null
188 @@ -1,160 +0,0 @@
189 -# Copyright 1999-2022 Gentoo Authors
190 -# Distributed under the terms of the GNU General Public License v2
191 -
192 -EAPI=7
193 -
194 -PYTHON_COMPAT=( python3_{8,9} )
195 -PYTHON_REQ_USE="threads(+),xml"
196 -inherit cmake flag-o-matic python-r1
197 -
198 -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
199 -HOMEPAGE="https://ukoethe.github.io/vigra/"
200 -
201 -if [[ ${PV} == *9999 ]] ; then
202 - EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
203 - inherit git-r3
204 -else
205 - SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
206 - KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
207 -fi
208 -
209 -LICENSE="MIT"
210 -SLOT="0"
211 -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
212 -
213 -REQUIRED_USE="
214 - python? ( hdf5 ${PYTHON_REQUIRED_USE} )
215 - test? ( hdf5 python fftw )"
216 -
217 -BDEPEND="
218 - test? (
219 - >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
220 - valgrind? ( dev-util/valgrind )
221 - )
222 -"
223 -# runtime dependency on python is required by the vigra-config script
224 -DEPEND="
225 - fftw? ( sci-libs/fftw:3.0= )
226 - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
227 - jpeg? ( virtual/jpeg:0 )
228 - openexr? (
229 - dev-libs/imath:=
230 - media-libs/openexr:=
231 - )
232 - png? ( media-libs/libpng:0= )
233 - python? (
234 - ${PYTHON_DEPS}
235 - dev-libs/boost:=[python?,${PYTHON_USEDEP}]
236 - dev-python/numpy[${PYTHON_USEDEP}]
237 - )
238 - tiff? ( media-libs/tiff:0= )
239 - zlib? ( sys-libs/zlib )
240 -"
241 -RDEPEND="${PYTHON_DEPS}
242 - ${DEPEND}
243 -"
244 -
245 -# Severely broken, also disabled in Fedora, bugs #390447, #653442
246 -RESTRICT="test"
247 -
248 -PATCHES=(
249 - # git master
250 - "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
251 - "${FILESDIR}/${P}-boost-python.patch"
252 - "${FILESDIR}/${P}-python3.7.patch" # bug 701208
253 - "${FILESDIR}/${P}-gcc-10.patch" # bug 723302
254 - # TODO: upstream
255 - "${FILESDIR}/${P}-lib_suffix.patch"
256 - "${FILESDIR}/${P}-cmake-module-dir.patch"
257 - "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
258 -)
259 -
260 -pkg_setup() {
261 - use python && python_setup
262 -}
263 -
264 -src_prepare() {
265 - vigra_disable() {
266 - if ! use ${1}; then
267 - sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
268 - -i CMakeLists.txt || die "failed to disable ${1}"
269 - fi
270 - }
271 -
272 - cmake_src_prepare
273 -
274 - vigra_disable fftw fftw3
275 - vigra_disable fftw fftw3f
276 - vigra_disable jpeg
277 - vigra_disable png
278 - vigra_disable tiff
279 - vigra_disable zlib
280 -
281 - # Don't use python_fix_shebang because we can't put this behind USE="python"
282 - sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
283 -
284 - use doc || cmake_comment_add_subdirectory docsrc
285 -
286 - if ! use test; then
287 - cmake_comment_add_subdirectory test
288 - cmake_run_in vigranumpy cmake_comment_add_subdirectory test
289 - fi
290 -}
291 -
292 -src_configure() {
293 - # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
294 - # bug #808731
295 - use hdf5 && append-cppflags -DH5_USE_110_API
296 -
297 - vigra_configure() {
298 - local mycmakeargs=(
299 - -DAUTOEXEC_TESTS=OFF
300 - -DDOCINSTALL="share/doc/${PF}/html"
301 - -DWITH_HDF5=$(usex hdf5)
302 - -DWITH_OPENEXR=$(usex openexr)
303 - -DWITH_VALGRIND=$(usex valgrind)
304 - -DWITH_VIGRANUMPY=$(usex python)
305 - )
306 - cmake_src_configure
307 - }
308 -
309 - if use python; then
310 - python_foreach_impl vigra_configure
311 - else
312 - vigra_configure
313 - fi
314 -}
315 -
316 -src_compile() {
317 - local VIGRA_BUILD_DIR
318 - vigra_compile() {
319 - cmake_src_compile
320 - VIGRA_BUILD_DIR="${BUILD_DIR}"
321 - }
322 - if use python; then
323 - python_foreach_impl vigra_compile
324 - else
325 - vigra_compile
326 - fi
327 -}
328 -
329 -src_install() {
330 - if use python; then
331 - python_foreach_impl cmake_src_install
332 - python_optimize
333 - else
334 - cmake_src_install
335 - fi
336 -}
337 -
338 -src_test() {
339 - # perhaps disable tests (see #390447)
340 - vigra_test() {
341 - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
342 - }
343 - if use python; then
344 - python_foreach_impl vigra_test
345 - else
346 - vigra_test
347 - fi
348 -}