Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
Date: Mon, 08 Apr 2019 21:15:20
Message-Id: 1554757983.e2a02ea40a631d05ea511a971124c669efe75f22.asturm@gentoo
1 commit: e2a02ea40a631d05ea511a971124c669efe75f22
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 8 21:09:14 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 8 21:13:03 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a02ea4
7
8 media-libs/vigra: Drop 1.11.1-r1, 1.11.0 (r0)
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/vigra/Manifest | 1 -
14 media-libs/vigra/vigra-1.11.0.ebuild | 139 -----------------------------
15 media-libs/vigra/vigra-1.11.1-r1.ebuild | 149 --------------------------------
16 3 files changed, 289 deletions(-)
17
18 diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
19 index 6ba1371af9f..cc03ca4ec08 100644
20 --- a/media-libs/vigra/Manifest
21 +++ b/media-libs/vigra/Manifest
22 @@ -1,2 +1 @@
23 -DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
24 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
25
26 diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
27 deleted file mode 100644
28 index 566354ca414..00000000000
29 --- a/media-libs/vigra/vigra-1.11.0.ebuild
30 +++ /dev/null
31 @@ -1,139 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -MY_P=${P}-src
37 -MY_V=${PV//\./-}
38 -PYTHON_COMPAT=( python2_7 )
39 -PYTHON_REQ_USE="threads,xml"
40 -inherit cmake-utils python-r1
41 -
42 -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
43 -HOMEPAGE="https://ukoethe.github.io/vigra/"
44 -SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
45 -
46 -LICENSE="MIT"
47 -SLOT="0"
48 -KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
49 -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
50 -
51 -# runtime dependency on python:2.7 is required by the vigra-config script
52 -RDEPEND="
53 - dev-lang/python:2.7
54 - >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
55 - fftw? ( sci-libs/fftw:3.0 )
56 - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
57 - jpeg? ( virtual/jpeg:0 )
58 - openexr? ( media-libs/openexr:= )
59 - png? ( media-libs/libpng:0= )
60 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
61 - tiff? ( media-libs/tiff:0= )
62 - valgrind? ( dev-util/valgrind )"
63 -
64 -DEPEND="${RDEPEND}
65 - doc? (
66 - app-doc/doxygen
67 - python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
68 - )
69 - test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
70 -
71 -REQUIRED_USE="
72 - doc? ( hdf5 fftw )
73 - python? ( hdf5 ${PYTHON_REQUIRED_USE} )
74 - test? ( hdf5 python fftw )"
75 -
76 -DOCS=( README.md )
77 -
78 -PATCHES=(
79 - "${FILESDIR}"/${P}-gcc-7.patch
80 -)
81 -
82 -pkg_setup() {
83 - use python && python_setup
84 -}
85 -
86 -src_prepare() {
87 - einfo "Removing shipped docs and VCS files"
88 - rm -rf doc || die
89 - rm .git* .travis.yml || die
90 -
91 - cmake-utils_src_prepare
92 -
93 - # Don't use python_fix_shebang because we can't put this behind USE="python"
94 - sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
95 -}
96 -
97 -src_configure() {
98 - vigra_configure() {
99 - local libdir="$(get_libdir)"
100 -
101 - local mycmakeargs=(
102 - -DAUTOEXEC_TESTS=OFF
103 - -DDOCDIR="${BUILD_DIR}/doc"
104 - -DDOCINSTALL="share/doc/${P}"
105 - -DLIBDIR_SUFFIX="${libdir/lib}"
106 - -DUSE_DOC=$(usex doc ON OFF) # unused
107 - -DUSE_FFTW3=$(usex fftw ON OFF) # unused
108 - -DUSE_JPEG=$(usex jpeg ON OFF) # unused
109 - -DUSE_MPI=$(usex mpi ON OFF) # unused
110 - -DUSE_PNG=$(usex png ON OFF) # unused
111 - -DUSE_TIFF=$(usex tiff ON OFF) # unused
112 - -DWITH_HDF5=$(usex hdf5 ON OFF)
113 - -DWITH_OPENEXR=$(usex openexr ON OFF)
114 - -DWITH_VALGRIND=$(usex valgrind ON OFF)
115 - -DWITH_VIGRANUMPY=$(usex python ON OFF)
116 - -DBUILD_TESTING=$(usex test ON OFF) # unused
117 - -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
118 - -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
119 - )
120 - cmake-utils_src_configure
121 - }
122 -
123 - if use python; then
124 - python_foreach_impl vigra_configure
125 - else
126 - # required for docdir
127 - _cmake_check_build_dir init
128 - vigra_configure
129 - fi
130 -}
131 -
132 -src_compile() {
133 - local VIGRA_BUILD_DIR
134 - vigra_compile() {
135 - cmake-utils_src_compile
136 - VIGRA_BUILD_DIR="${BUILD_DIR}"
137 - }
138 - if use python; then
139 - python_foreach_impl vigra_compile
140 - else
141 - vigra_compile
142 - fi
143 -
144 - if use doc; then
145 - einfo "Generating Documentation"
146 - # use build dir from last compile command
147 - VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
148 - fi
149 -}
150 -
151 -src_install() {
152 - if use python; then
153 - python_foreach_impl cmake-utils_src_install
154 - python_optimize
155 - else
156 - cmake-utils_src_install
157 - fi
158 -}
159 -
160 -src_test() {
161 - # perhaps disable tests (see #390447)
162 - vigra_test() {
163 - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
164 - }
165 - if use python; then
166 - python_foreach_impl vigra_test
167 - else
168 - vigra_test
169 - fi
170 -}
171
172 diff --git a/media-libs/vigra/vigra-1.11.1-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r1.ebuild
173 deleted file mode 100644
174 index c5e8c814dae..00000000000
175 --- a/media-libs/vigra/vigra-1.11.1-r1.ebuild
176 +++ /dev/null
177 @@ -1,149 +0,0 @@
178 -# Copyright 1999-2018 Gentoo Authors
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI=6
182 -MY_P="${P}-src"
183 -MY_V="${PV//\./-}"
184 -PYTHON_COMPAT=( python2_7 )
185 -PYTHON_REQ_USE="threads,xml"
186 -
187 -inherit cmake-utils python-r1
188 -
189 -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
190 -HOMEPAGE="https://ukoethe.github.io/vigra/"
191 -
192 -if [[ ${PV} == *9999 ]] ; then
193 - EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
194 - inherit git-r3
195 -else
196 - SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
197 - KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
198 -fi
199 -
200 -LICENSE="MIT"
201 -SLOT="0"
202 -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
203 -
204 -# runtime dependency on python:2.7 is required by the vigra-config script
205 -RDEPEND="
206 - dev-lang/python:2.7
207 - >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
208 - fftw? ( sci-libs/fftw:3.0 )
209 - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
210 - jpeg? ( virtual/jpeg:0 )
211 - openexr? ( media-libs/openexr:= )
212 - png? ( media-libs/libpng:0= )
213 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
214 - tiff? ( media-libs/tiff:0= )
215 - valgrind? ( dev-util/valgrind )"
216 -
217 -DEPEND="${RDEPEND}
218 - doc? (
219 - app-doc/doxygen
220 - python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
221 - )
222 - test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
223 -
224 -REQUIRED_USE="
225 - doc? ( hdf5 fftw )
226 - python? ( hdf5 ${PYTHON_REQUIRED_USE} )
227 - test? ( hdf5 python fftw )"
228 -
229 -# Severely broken, also disabled in Fedora, bugs #390447, #653442
230 -RESTRICT="test"
231 -
232 -DOCS=( README.md )
233 -
234 -PATCHES=(
235 - "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
236 -)
237 -
238 -pkg_setup() {
239 - use python && python_setup
240 -}
241 -
242 -src_prepare() {
243 - einfo "Removing shipped docs and VCS files"
244 - rm -rf doc || die
245 - rm .git* .travis.yml || die
246 -
247 - cmake-utils_src_prepare
248 -
249 - # Don't use python_fix_shebang because we can't put this behind USE="python"
250 - sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
251 -}
252 -
253 -src_configure() {
254 - vigra_configure() {
255 - local libdir="$(get_libdir)"
256 -
257 - local mycmakeargs=(
258 - -DAUTOEXEC_TESTS=OFF
259 - -DDOCDIR="${BUILD_DIR}/doc"
260 - -DDOCINSTALL="share/doc/${P}"
261 - -DLIBDIR_SUFFIX="${libdir/lib}"
262 - -DUSE_DOC=$(usex doc ON OFF) # unused
263 - -DUSE_FFTW3=$(usex fftw ON OFF) # unused
264 - -DUSE_JPEG=$(usex jpeg ON OFF) # unused
265 - -DUSE_MPI=$(usex mpi ON OFF) # unused
266 - -DUSE_PNG=$(usex png ON OFF) # unused
267 - -DUSE_TIFF=$(usex tiff ON OFF) # unused
268 - -DWITH_HDF5=$(usex hdf5 ON OFF)
269 - -DWITH_OPENEXR=$(usex openexr ON OFF)
270 - -DWITH_VALGRIND=$(usex valgrind ON OFF)
271 - -DWITH_VIGRANUMPY=$(usex python ON OFF)
272 - -DBUILD_TESTING=$(usex test ON OFF) # unused
273 - -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
274 - -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
275 - )
276 - cmake-utils_src_configure
277 - }
278 -
279 - if use python; then
280 - python_foreach_impl vigra_configure
281 - else
282 - # required for docdir
283 - _cmake_check_build_dir init
284 - vigra_configure
285 - fi
286 -}
287 -
288 -src_compile() {
289 - local VIGRA_BUILD_DIR
290 - vigra_compile() {
291 - cmake-utils_src_compile
292 - VIGRA_BUILD_DIR="${BUILD_DIR}"
293 - }
294 - if use python; then
295 - python_foreach_impl vigra_compile
296 - else
297 - vigra_compile
298 - fi
299 -
300 - if use doc; then
301 - einfo "Generating Documentation"
302 - # use build dir from last compile command
303 - VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
304 - fi
305 -}
306 -
307 -src_install() {
308 - if use python; then
309 - python_foreach_impl cmake-utils_src_install
310 - python_optimize
311 - else
312 - cmake-utils_src_install
313 - fi
314 -}
315 -
316 -src_test() {
317 - # perhaps disable tests (see #390447)
318 - vigra_test() {
319 - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
320 - }
321 - if use python; then
322 - python_foreach_impl vigra_test
323 - else
324 - vigra_test
325 - fi
326 -}