1 |
commit: f10498150b680bafef1fb6887957f1bc0e9c2720 |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 17 00:02:11 2016 +0000 |
4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 7 18:22:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1049815 |
7 |
|
8 |
media-libs/vigra: version bump to 1.11.0 |
9 |
|
10 |
Also: |
11 |
* update to EAPI 6 |
12 |
* respect USE=valgrind instead of always disabling |
13 |
* minor naming fixes |
14 |
|
15 |
Gentoo-Bug: https://bugs.gentoo.org/506902 |
16 |
|
17 |
Package-Manager: portage-2.2.28 |
18 |
|
19 |
media-libs/vigra/Manifest | 1 + |
20 |
media-libs/vigra/metadata.xml | 3 + |
21 |
media-libs/vigra/vigra-1.11.0.ebuild | 138 +++++++++++++++++++++++++++++++++++ |
22 |
3 files changed, 142 insertions(+) |
23 |
|
24 |
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest |
25 |
index d26e531..76b42e3 100644 |
26 |
--- a/media-libs/vigra/Manifest |
27 |
+++ b/media-libs/vigra/Manifest |
28 |
@@ -1,2 +1,3 @@ |
29 |
DIST vigra-1.10.0-src-with-docu.tar.gz 36122311 SHA256 42d4a361b0bb52fbfdae7e76000698be04dabba77be3f4248d369139fe96a099 SHA512 4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d WHIRLPOOL 92cf1517acc6ff11eb255cb6bee523ebcaab118b9f73602baf07be8070c537c5bb7e94a9ccbd97bd7e20e20efeb8ac485a184f1c3609fe7747051ed6ec4ca65f |
30 |
+DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 68617de347eae7d4700a8f66cd59ce31d6cd92ffb4a235b4df34c688673af5cb SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a WHIRLPOOL 1dc73a42b5033c88427850d72078475211a206d9af69209a5d3d05d1b117baef651ccb8232b0c0428b775160feda28b08aae3f14ab07c353de1b076664a0e105 |
31 |
DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9 |
32 |
|
33 |
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml |
34 |
index 618f709..aad87b8 100644 |
35 |
--- a/media-libs/vigra/metadata.xml |
36 |
+++ b/media-libs/vigra/metadata.xml |
37 |
@@ -8,4 +8,7 @@ |
38 |
<upstream> |
39 |
<remote-id type="github">ukoethe/vigra</remote-id> |
40 |
</upstream> |
41 |
+ <use> |
42 |
+ <flag name="valgrind">Enable valgrind in make check</flag> |
43 |
+ </use> |
44 |
</pkgmetadata> |
45 |
|
46 |
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild |
47 |
new file mode 100644 |
48 |
index 00000000..b456607 |
49 |
--- /dev/null |
50 |
+++ b/media-libs/vigra/vigra-1.11.0.ebuild |
51 |
@@ -0,0 +1,138 @@ |
52 |
+# Copyright 1999-2016 Gentoo Foundation |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+# $Id$ |
55 |
+ |
56 |
+EAPI=6 |
57 |
+MY_P=${P}-src |
58 |
+MY_V=${PV//\./-} |
59 |
+PYTHON_COMPAT=( python2_7 ) |
60 |
+PYTHON_REQ_USE="threads,xml" |
61 |
+inherit cmake-utils python-r1 |
62 |
+ |
63 |
+DESCRIPTION="C++ computer vision library with emphasis on customizable algorithms and data structures" |
64 |
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/" |
65 |
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" |
66 |
+ |
67 |
+LICENSE="MIT" |
68 |
+SLOT="0" |
69 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
70 |
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" |
71 |
+ |
72 |
+# runtime dependency on python:2.7 is required by the vigra-config script |
73 |
+RDEPEND=" |
74 |
+ dev-lang/python:2.7 |
75 |
+ >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] |
76 |
+ fftw? ( sci-libs/fftw:3.0 ) |
77 |
+ hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) |
78 |
+ jpeg? ( virtual/jpeg ) |
79 |
+ openexr? ( media-libs/openexr:= ) |
80 |
+ png? ( media-libs/libpng:0= ) |
81 |
+ python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) |
82 |
+ tiff? ( media-libs/tiff:0= ) |
83 |
+ valgrind? ( dev-util/valgrind )" |
84 |
+ |
85 |
+DEPEND="${RDEPEND} |
86 |
+ doc? ( |
87 |
+ app-doc/doxygen |
88 |
+ python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) |
89 |
+ ) |
90 |
+ test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" |
91 |
+ |
92 |
+REQUIRED_USE=" |
93 |
+ doc? ( hdf5 fftw ) |
94 |
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} ) |
95 |
+ test? ( hdf5 python fftw )" |
96 |
+ |
97 |
+DOCS=( README.md ) |
98 |
+ |
99 |
+pkg_setup() { |
100 |
+ use python && python_setup |
101 |
+} |
102 |
+ |
103 |
+src_prepare() { |
104 |
+ default |
105 |
+ |
106 |
+ einfo "Removing shipped docs and VCS files" |
107 |
+ rm -rf doc || die |
108 |
+ rm .git* .travis.yml || die |
109 |
+ |
110 |
+ cmake-utils_src_prepare |
111 |
+ |
112 |
+ # Don't use python_fix_shebang because we can't put this behind USE="python" |
113 |
+ sed -i -e '/env/s:python:python2:' config/vigra-config.in || die |
114 |
+} |
115 |
+ |
116 |
+src_configure() { |
117 |
+ vigra_configure() { |
118 |
+ local libdir="$(get_libdir)" |
119 |
+ |
120 |
+ local mycmakeargs=( |
121 |
+ -DAUTOEXEC_TESTS=OFF |
122 |
+ -DDOCDIR="${BUILD_DIR}/doc" |
123 |
+ -DDOCINSTALL="share/doc/${P}" |
124 |
+ -DLIBDIR_SUFFIX="${libdir/lib}" |
125 |
+ -DUSE_DOC=$(usex doc ON OFF) # unused |
126 |
+ -DUSE_FFTW3=$(usex fftw ON OFF) # unused |
127 |
+ -DUSE_JPEG=$(usex jpeg ON OFF) # unused |
128 |
+ -DUSE_MPI=$(usex mpi ON OFF) # unused |
129 |
+ -DUSE_PNG=$(usex png ON OFF) # unused |
130 |
+ -DUSE_TIFF=$(usex tiff ON OFF) # unused |
131 |
+ -DWITH_HDF5=$(usex hdf5 ON OFF) |
132 |
+ -DWITH_OPENEXR=$(usex openexr ON OFF) |
133 |
+ -DWITH_VALGRIND=$(usex valgrind ON OFF) |
134 |
+ -DWITH_VIGRANUMPY=$(usex python ON OFF) |
135 |
+ -DBUILD_TESTING=$(usex test ON OFF) # unused |
136 |
+ -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused |
137 |
+ -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused |
138 |
+ ) |
139 |
+ cmake-utils_src_configure |
140 |
+ } |
141 |
+ |
142 |
+ if use python; then |
143 |
+ python_foreach_impl vigra_configure |
144 |
+ else |
145 |
+ # required for docdir |
146 |
+ _cmake_check_build_dir init |
147 |
+ vigra_configure |
148 |
+ fi |
149 |
+} |
150 |
+ |
151 |
+src_compile() { |
152 |
+ local VIGRA_BUILD_DIR |
153 |
+ vigra_compile() { |
154 |
+ cmake-utils_src_compile |
155 |
+ VIGRA_BUILD_DIR="${BUILD_DIR}" |
156 |
+ } |
157 |
+ if use python; then |
158 |
+ python_foreach_impl vigra_compile |
159 |
+ else |
160 |
+ vigra_compile |
161 |
+ fi |
162 |
+ |
163 |
+ if use doc; then |
164 |
+ einfo "Generating Documentation" |
165 |
+ # use build dir from last compile command |
166 |
+ BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc |
167 |
+ fi |
168 |
+} |
169 |
+ |
170 |
+src_install() { |
171 |
+ if use python; then |
172 |
+ python_foreach_impl cmake-utils_src_install |
173 |
+ python_optimize |
174 |
+ else |
175 |
+ cmake-utils_src_install |
176 |
+ fi |
177 |
+} |
178 |
+ |
179 |
+src_test() { |
180 |
+ # perhaps disable tests (see #390447) |
181 |
+ vigra_test() { |
182 |
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test |
183 |
+ } |
184 |
+ if use python; then |
185 |
+ python_foreach_impl vigra_test |
186 |
+ else |
187 |
+ vigra_test |
188 |
+ fi |
189 |
+} |