Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/, media-gfx/exiv2/files/
Date: Wed, 06 Jul 2016 10:32:09
Message-Id: 1467801110.725674a32b62aac3abfed25b31d1ab85d7516e55.kensington@gentoo
1 commit: 725674a32b62aac3abfed25b31d1ab85d7516e55
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 10:30:55 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 10:31:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725674a3
7
8 media-gfx/exiv2: remove old
9
10 Package-Manager: portage-2.3.0
11
12 media-gfx/exiv2/Manifest | 1 -
13 media-gfx/exiv2/exiv2-0.24-r1.ebuild | 136 ---------------
14 media-gfx/exiv2/exiv2-0.25-r1.ebuild | 125 --------------
15 .../exiv2/files/exiv2-0.23-boost-fs-contrib.patch | 182 ---------------------
16 .../exiv2/files/exiv2-0.24-CVE-2014-9449.patch | 27 ---
17 media-gfx/exiv2/files/exiv2-0.24-python3.patch | 27 ---
18 media-gfx/exiv2/metadata.xml | 1 -
19 7 files changed, 499 deletions(-)
20
21 diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
22 index 5cd1ff1..8fdb578 100644
23 --- a/media-gfx/exiv2/Manifest
24 +++ b/media-gfx/exiv2/Manifest
25 @@ -1,2 +1 @@
26 -DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
27 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
28
29 diff --git a/media-gfx/exiv2/exiv2-0.24-r1.ebuild b/media-gfx/exiv2/exiv2-0.24-r1.ebuild
30 deleted file mode 100644
31 index 723e7dc..0000000
32 --- a/media-gfx/exiv2/exiv2-0.24-r1.ebuild
33 +++ /dev/null
34 @@ -1,136 +0,0 @@
35 -# Copyright 1999-2015 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -AUTOTOOLS_IN_SOURCE_BUILD=1
41 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
42 -
43 -inherit eutils multilib toolchain-funcs python-any-r1 autotools-multilib
44 -
45 -DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
46 -HOMEPAGE="http://www.exiv2.org/"
47 -SRC_URI="http://www.exiv2.org/${P}.tar.gz"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0/13"
51 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
52 -IUSE_LINGUAS="de es fi fr pl ru sk"
53 -IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
54 -
55 -RDEPEND="
56 - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
57 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
58 - xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
59 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
60 -"
61 -
62 -DEPEND="${RDEPEND}
63 - contrib? ( >=dev-libs/boost-1.44 )
64 - doc? (
65 - app-doc/doxygen
66 - dev-libs/libxslt
67 - virtual/pkgconfig
68 - media-gfx/graphviz
69 - ${PYTHON_DEPS}
70 - )
71 - nls? ( sys-devel/gettext )
72 -"
73 -
74 -DOCS=( README doc/ChangeLog doc/cmd.txt )
75 -
76 -PATCHES=( "${FILESDIR}/${P}-CVE-2014-9449.patch" )
77 -
78 -pkg_setup() {
79 - use doc && python-any-r1_pkg_setup
80 -}
81 -
82 -src_prepare() {
83 - # convert docs to UTF-8
84 - local i
85 - for i in doc/cmd.txt; do
86 - einfo "Converting "${i}" to UTF-8"
87 - iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
88 - done
89 -
90 - if use doc; then
91 - einfo "Updating doxygen config"
92 - doxygen 2>&1 >/dev/null -u config/Doxyfile
93 - fi
94 -
95 - if use contrib; then
96 - # create build environment for contrib
97 - ln -snf ../../src contrib/organize/exiv2
98 - sed -i -e 's:/usr/local/include/.*:'"${EPREFIX}"'/usr/include:g' \
99 - -e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
100 - contrib/organize/boost.mk || die
101 - fi
102 -
103 - epatch "${FILESDIR}/${PN}-0.24-python3.patch"
104 -
105 - # set locale to safe value for the sed commands (bug #382731)
106 - sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile || die
107 -
108 - autotools-multilib_src_prepare
109 -}
110 -
111 -multilib_src_configure() {
112 - local myeconfargs=(
113 - $(use_enable nls)
114 - $(use_enable xmp)
115 - $(use_enable static-libs static)
116 - )
117 -
118 - # plain 'use_with' fails
119 - use zlib || myeconfargs+=( --without-zlib )
120 -
121 - # Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
122 - if [[ ${ABI} == amd64 && $(gcc-major-version) -lt 4 ]]; then
123 - myeconfargs+=( --disable-visibility )
124 - fi
125 -
126 - autotools-utils_src_configure
127 -}
128 -
129 -multilib_src_compile() {
130 - # Needed for Solaris because /bin/sh is not a bash, bug #245647
131 - sed -i -e "s:/bin/sh:${EPREFIX}/bin/sh:" src/Makefile || die "sed failed"
132 - emake
133 -
134 - if multilib_is_native_abi; then
135 - if use contrib; then
136 - emake -C contrib/organize \
137 - LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
138 - CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
139 - fi
140 -
141 - if use doc; then
142 - emake samples
143 - emake doc
144 - fi
145 - fi
146 -}
147 -
148 -multilib_src_install() {
149 - autotools-utils_src_install
150 -
151 - if multilib_is_native_abi; then
152 - if use contrib; then
153 - emake DESTDIR="${D}" -C contrib/organize install
154 - fi
155 -
156 - use doc && dohtml -r doc/html/.
157 - fi
158 -}
159 -
160 -multilib_src_install_all() {
161 - einstalldocs
162 - prune_libtool_files --all
163 -
164 - use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
165 - if use examples; then
166 - insinto /usr/share/doc/${PF}/examples
167 - docompress -x /usr/share/doc/${PF}/examples
168 - doins samples/*.cpp
169 - fi
170 -}
171
172 diff --git a/media-gfx/exiv2/exiv2-0.25-r1.ebuild b/media-gfx/exiv2/exiv2-0.25-r1.ebuild
173 deleted file mode 100644
174 index bc2577b..0000000
175 --- a/media-gfx/exiv2/exiv2-0.25-r1.ebuild
176 +++ /dev/null
177 @@ -1,125 +0,0 @@
178 -# Copyright 1999-2015 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -# $Id$
181 -
182 -EAPI=5
183 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
184 -
185 -inherit eutils cmake-multilib python-any-r1
186 -
187 -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
188 -HOMEPAGE="http://www.exiv2.org/"
189 -SRC_URI="http://www.exiv2.org/${P}.tar.gz"
190 -
191 -LICENSE="GPL-2"
192 -SLOT="0/14"
193 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
194 -IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
195 -IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
196 -
197 -RDEPEND="
198 - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
199 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
200 - png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
201 - webready? (
202 - net-libs/libssh[${MULTILIB_USEDEP}]
203 - net-misc/curl[${MULTILIB_USEDEP}]
204 - )
205 - xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
206 -"
207 -
208 -DEPEND="${RDEPEND}
209 - doc? (
210 - app-doc/doxygen
211 - dev-libs/libxslt
212 - virtual/pkgconfig
213 - media-gfx/graphviz
214 - ${PYTHON_DEPS}
215 - )
216 - nls? ( sys-devel/gettext )
217 -"
218 -
219 -DOCS=( README doc/ChangeLog doc/cmd.txt )
220 -
221 -PATCHES=(
222 - "${FILESDIR}/${PN}-0.25-fix-docs.patch"
223 - "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
224 - "${FILESDIR}/${PN}-0.25-tools-optional.patch"
225 - "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
226 -)
227 -
228 -pkg_setup() {
229 - use doc && python-any-r1_pkg_setup
230 -}
231 -
232 -src_prepare() {
233 - rm -r msvc* build || die "Failed to remove msvc dirs"
234 -
235 - if [[ ${PV} != *9999 ]] ; then
236 - if [[ -d po ]] ; then
237 - pushd po > /dev/null || die
238 - for lang in *.po; do
239 - if ! has ${lang%.po} ${LINGUAS} ; then
240 - rm -rf ${lang} || die
241 - fi
242 - done
243 - popd > /dev/null || die
244 - else
245 - die "Failed to prepare LINGUAS - po directory moved?"
246 - fi
247 - fi
248 -
249 - # convert docs to UTF-8
250 - local i
251 - for i in doc/cmd.txt; do
252 - einfo "Converting "${i}" to UTF-8"
253 - iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
254 - mv -f "${i}.tmp" "${i}" || die
255 - done
256 -
257 - if use doc; then
258 - einfo "Updating doxygen config"
259 - doxygen &>/dev/null -u config/Doxyfile || die
260 - fi
261 -
262 - cmake-utils_src_prepare
263 -}
264 -
265 -multilib_src_configure() {
266 - local mycmakeargs=(
267 - -DEXIV2_ENABLE_BUILD_PO=YES
268 - -DEXIV2_ENABLE_BUILD_SAMPLES=NO
269 - -DEXIV2_ENABLE_CURL=$(usex webready)
270 - -DEXIV2_ENABLE_NLS=$(usex nls)
271 - -DEXIV2_ENABLE_PNG=$(usex png)
272 - -DEXIV2_ENABLE_SSH=$(usex webready)
273 - -DEXIV2_ENABLE_WEBREADY=$(usex webready)
274 - -DEXIV2_ENABLE_XMP=$(usex xmp)
275 - -DEXIV2_ENABLE_LIBXMP=NO
276 - $(multilib_is_native_abi || \
277 - echo -DEXIV2_ENABLE_TOOLS=NO)
278 - )
279 -
280 - cmake-utils_src_configure
281 -}
282 -
283 -multilib_src_compile() {
284 - cmake-utils_src_compile
285 -
286 - if multilib_is_native_abi; then
287 - use doc && emake -j1 doc
288 - fi
289 -}
290 -
291 -multilib_src_install_all() {
292 - einstalldocs
293 - prune_libtool_files --all
294 -
295 - use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
296 - use doc && dodoc -r "${S}"/doc/html
297 -
298 - if use examples; then
299 - docinto examples
300 - dodoc samples/*.cpp
301 - fi
302 -}
303
304 diff --git a/media-gfx/exiv2/files/exiv2-0.23-boost-fs-contrib.patch b/media-gfx/exiv2/files/exiv2-0.23-boost-fs-contrib.patch
305 deleted file mode 100644
306 index f5ffc47..0000000
307 --- a/media-gfx/exiv2/files/exiv2-0.23-boost-fs-contrib.patch
308 +++ /dev/null
309 @@ -1,182 +0,0 @@
310 ---- work/exiv2-0.23/contrib/organize/organize.cpp 2009-03-08 09:26:30.000000000 +0100
311 -+++ work/exiv2-0.23/contrib/organize/organize.cpp 2009-03-08 09:26:30.000000000 +0100
312 -@@ -294,7 +294,7 @@
313 - bool md5sum(const fs::path &path, md5digest &digest)
314 - {
315 - try {
316 -- Exiv2::FileIo io(path.file_string());
317 -+ Exiv2::FileIo io(path.string());
318 - if (io.open() != 0)
319 - return false;
320 - Exiv2::IoCloser closer(io);
321 -@@ -568,8 +568,8 @@
322 -
323 - fs::path uniquify(const fs::path &dest)
324 - {
325 -- std::string ext = dest.extension();
326 -- std::string fname = dest.stem();
327 -+ std::string ext = dest.extension().string();
328 -+ std::string fname = dest.stem().string();
329 - fs::path parent = dest.parent_path();
330 -
331 - unsigned number = 1;
332 -@@ -600,13 +600,13 @@
333 - std::vector<std::string>::const_iterator x_iter = params.excludes.begin();
334 - std::vector<std::string>::const_iterator x_end = params.excludes.end();
335 - for( ; x_iter != x_end; ++x_iter ) {
336 -- if(boost::contains(directory.file_string(), *x_iter)) {
337 -+ if(boost::contains(directory.string(), *x_iter)) {
338 - exclude = true;
339 - break;
340 - }
341 - }
342 - if(exclude) {
343 -- info(std::string("excluding directory: ") + directory.file_string() +
344 -+ info(std::string("excluding directory: ") + directory.string() +
345 - " matched: " + *x_iter);
346 - ++params.dir_ex_count;
347 - return;
348 -@@ -621,7 +621,7 @@
349 - process_directory(p_iter->path(), depth + 1, params);
350 - else {
351 - info(std::string("depth reached, skipping: ") +
352 -- p_iter->path().file_string());
353 -+ p_iter->path().string());
354 - }
355 - }
356 - else if( is_regular_file(*p_iter) ) {
357 -@@ -630,13 +630,13 @@
358 - exclude = false;
359 - x_iter = params.excludes.begin();
360 - for( ; x_iter != x_end; ++x_iter ) {
361 -- if(boost::contains(p_iter->path().file_string(), *x_iter)) {
362 -+ if(boost::contains(p_iter->path().string(), *x_iter)) {
363 - exclude = true;
364 - break;
365 - }
366 - }
367 - if(exclude) {
368 -- info(std::string("excluding file: ") + p_iter->path().file_string() +
369 -+ info(std::string("excluding file: ") + p_iter->path().string() +
370 - " matched: " + *x_iter);
371 - ++params.file_ex_count;
372 - continue;
373 -@@ -648,45 +648,45 @@
374 - if(!dest_subdir.empty())
375 - dest_file = params.dest_dir / dest_subdir;
376 - else if(params.ignore_unsorted) {
377 -- info(std::string("ignoring unsorted: ") + p_iter->path().file_string());
378 -+ info(std::string("ignoring unsorted: ") + p_iter->path().string());
379 - ++params.unsorted_ignored_count;
380 - continue;
381 - }
382 - else {
383 -- info(std::string("unsorted file (missing metadata): ") + p_iter->path().file_string());
384 -+ info(std::string("unsorted file (missing metadata): ") + p_iter->path().string());
385 - dest_file = params.unsorted_dir;
386 - ++params.unsorted_count;
387 - }
388 -
389 -- dest_file /= p_iter->filename();
390 -+ dest_file /= p_iter->path().filename();
391 -
392 - if(fs::exists(dest_file)) {
393 - if(params.ignore_dups) {
394 -- info(std::string("ignoring: ") + p_iter->path().file_string() +
395 -- " duplicates: " + dest_file.file_string());
396 -+ info(std::string("ignoring: ") + p_iter->path().string() +
397 -+ " duplicates: " + dest_file.string());
398 - ++params.dups_ignored_count;
399 - continue;
400 - }
401 - else {
402 - if(params.force) {
403 -- info(std::string("force removing: ") + dest_file.file_string() + " for: "
404 -- + p_iter->path().file_string());
405 -+ info(std::string("force removing: ") + dest_file.string() + " for: "
406 -+ + p_iter->path().string());
407 - if(!params.dry_run)
408 - fs::remove(dest_file);
409 - }
410 - else if(params.rename) {
411 -- info(std::string("renaming: ") + p_iter->path().file_string() +
412 -- " duplicates: " + dest_file.file_string());
413 -+ info(std::string("renaming: ") + p_iter->path().string() +
414 -+ " duplicates: " + dest_file.string());
415 - dest_file = uniquify(dest_file);
416 - }
417 - else {
418 -- info(std::string("duplicate file: ") + p_iter->path().file_string() +
419 -- " of: " + dest_file.file_string());
420 -- dest_file = params.dups_dir / dest_subdir / p_iter->filename();
421 -+ info(std::string("duplicate file: ") + p_iter->path().string() +
422 -+ " of: " + dest_file.string());
423 -+ dest_file = params.dups_dir / dest_subdir / p_iter->path().filename();
424 - // Ugh, more dup possibilities
425 - if(fs::exists(dest_file)) {
426 -- info(std::string("renaming: ") + p_iter->path().file_string() +
427 -- " duplicates: " + dest_file.file_string());
428 -+ info(std::string("renaming: ") + p_iter->path().string() +
429 -+ " duplicates: " + dest_file.string());
430 - dest_file = uniquify(dest_file);
431 - }
432 - }
433 -@@ -698,8 +698,8 @@
434 - fs::create_directories(dest_file.parent_path());
435 -
436 - if(params.symlink) {
437 -- info(std::string("linking from: ") + p_iter->path().file_string() +
438 -- " to: " + dest_file.file_string());
439 -+ info(std::string("linking from: ") + p_iter->path().string() +
440 -+ " to: " + dest_file.string());
441 - if(!params.dry_run) {
442 - // The target of a symlink must be either absolute (aka complete) or
443 - // relative to the location of the link. Easiest solution is to make
444 -@@ -713,8 +713,8 @@
445 - }
446 - }
447 - else {
448 -- info(std::string("copying from: ") + p_iter->path().file_string() +
449 -- " to: " + dest_file.file_string());
450 -+ info(std::string("copying from: ") + p_iter->path().string() +
451 -+ " to: " + dest_file.string());
452 - if(!params.dry_run) {
453 - // Copy the file and restore its write time (needed for posix)
454 - std::time_t time = fs::last_write_time(*p_iter);
455 -@@ -730,8 +730,8 @@
456 - if(!ok) {
457 - // Should probably find a more appropriate exception for this
458 - throw std::runtime_error(std::string("File verification failed: '")
459 -- + p_iter->path().file_string() + "' differs from '" +
460 -- dest_file.file_string() + "'");
461 -+ + p_iter->path().string() + "' differs from '" +
462 -+ dest_file.string() + "'");
463 - }
464 - else {
465 - info(std::string("verification passed"));
466 -@@ -740,7 +740,7 @@
467 - }
468 - }
469 - if(params.move) {
470 -- info(std::string("removing: ") + p_iter->path().file_string());
471 -+ info(std::string("removing: ") + p_iter->path().string());
472 - if(!params.dry_run)
473 - fs::remove(*p_iter);
474 - }
475 -@@ -752,14 +752,14 @@
476 - ++params.ok_count;
477 - }
478 - catch(fs::filesystem_error& e) {
479 -- error(e, std::string("skipping file: " + p_iter->path().file_string()));
480 -+ error(e, std::string("skipping file: " + p_iter->path().string()));
481 - ++params.file_err_count;
482 - }
483 - }
484 - }
485 - }
486 - catch(fs::filesystem_error& e) {
487 -- error(e, std::string("skipping directory: " + directory.file_string()));
488 -+ error(e, std::string("skipping directory: " + directory.string()));
489 - ++params.dir_err_count;
490 - }
491 - }
492
493 diff --git a/media-gfx/exiv2/files/exiv2-0.24-CVE-2014-9449.patch b/media-gfx/exiv2/files/exiv2-0.24-CVE-2014-9449.patch
494 deleted file mode 100644
495 index cf1b46f..0000000
496 --- a/media-gfx/exiv2/files/exiv2-0.24-CVE-2014-9449.patch
497 +++ /dev/null
498 @@ -1,27 +0,0 @@
499 -diff -up exiv2-0.24/src/riffvideo.cpp.CVE-2014-9449 exiv2-0.24/src/riffvideo.cpp
500 ---- exiv2-0.24/src/riffvideo.cpp.CVE-2014-9449 2013-12-01 06:13:42.000000000 -0600
501 -+++ exiv2-0.24/src/riffvideo.cpp 2015-01-05 11:21:42.306728309 -0600
502 -@@ -856,7 +856,7 @@ namespace Exiv2 {
503 -
504 - void RiffVideo::infoTagsHandler()
505 - {
506 -- const long bufMinSize = 100;
507 -+ const long bufMinSize = 10000;
508 - DataBuf buf(bufMinSize);
509 - buf.pData_[4] = '\0';
510 - io_->seek(-12, BasicIo::cur);
511 -@@ -879,10 +879,14 @@ namespace Exiv2 {
512 - if(infoSize >= 0) {
513 - size -= infoSize;
514 - io_->read(buf.pData_, infoSize);
515 -+ if(infoSize < 4)
516 -+ buf.pData_[infoSize] = '\0';
517 - }
518 -
519 - if(tv)
520 - xmpData_[exvGettext(tv->label_)] = buf.pData_;
521 -+ else
522 -+ continue;
523 - }
524 - io_->seek(cur_pos + size_external, BasicIo::beg);
525 - } // RiffVideo::infoTagsHandler
526
527 diff --git a/media-gfx/exiv2/files/exiv2-0.24-python3.patch b/media-gfx/exiv2/files/exiv2-0.24-python3.patch
528 deleted file mode 100644
529 index 405a7d3..0000000
530 --- a/media-gfx/exiv2/files/exiv2-0.24-python3.patch
531 +++ /dev/null
532 @@ -1,27 +0,0 @@
533 -diff -ub -r exiv2-0.23.org/doc/templates/gen.py exiv2-0.23/doc/templates/gen.py
534 ---- exiv2-0.23.org/doc/templates/gen.py 2005-05-28 19:35:08.000000000 +0400
535 -+++ exiv2-0.23/doc/templates/gen.py 2013-12-21 03:03:54.000000000 +0400
536 -@@ -7,9 +7,9 @@
537 - # ----------------------------------------------------------------------
538 - # functions
539 - def usage():
540 -- print """Usage: gen.py file.in [...]
541 -+ print("""Usage: gen.py file.in [...]
542 - Substitute placeholders in input files with content
543 -- """
544 -+ """)
545 -
546 - def gen_html(file):
547 - """Replace variables in the file with their content"""
548 -@@ -49,9 +49,9 @@
549 - vars.sort()
550 -
551 - # Substitute variables in all input files
552 --print "Substituting variables", vars
553 -+print("Substituting variables {0}".format(vars))
554 - for file in input:
555 -- print "Processing", file, "..."
556 -+ print("Processing {0}...".format(file))
557 - text = gen_html(file)
558 - file = file.replace(".in", "")
559 - open(file, 'w').write(text)
560
561 diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
562 index 3d5537f..934a5a6 100644
563 --- a/media-gfx/exiv2/metadata.xml
564 +++ b/media-gfx/exiv2/metadata.xml
565 @@ -14,7 +14,6 @@
566 write EXIF, IPTC and XMP image metadata.
567 </longdescription>
568 <use>
569 - <flag name="contrib">Build additional contrib components</flag>
570 <flag name="webready">Support reading metadata over the internet</flag>
571 </use>
572 </pkgmetadata>
Report Message
Find on MARC Find on Google Groups