Fix building with USE=doc by Benjamin Southall (bug #512468).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index ade75ae20ed565c0de4927427b47cb2bcd991aba..0fb57c2c14d791b13bfd49e089a91af767bf991b 100644 (file)
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.125 2014/11/26 06:51:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.126 2014/12/12 15:59:32 jer Exp $
+
+  12 Dec 2014; Jeroen Roovers <jer@gentoo.org> exiv2-0.24.ebuild:
+  Fix building with USE=doc by Benjamin Southall (bug #512468).
 
   26 Nov 2014; Ian Delaney <idella4@gentoo.org> exiv2-0.24.ebuild:
   clean old python impls

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index d8b4726156af66d7e770892b3492fd56189c4434..375d5f98a9f754b4819d9b49d889f56b3af2b8e1 100644 (file)
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -7,13 +7,13 @@ DIST exiv2-0.23.tar.gz 3524381 SHA256 81fa50900be7ab16e24c6551252c21fc97abcfe855
 DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
 EBUILD exiv2-0.23-r1.ebuild 2971 SHA256 54408b5d3ead00b89fdb2d35a1e64ed23b3c7a0027c2b288cb9b62f828b98792 SHA512 6ae58afa22b3d8dde7d8e0b94393e31fd054825dc80c288baf44e30fa8d4ae1bd44bf697934d79ec2ec544f0ec527301d7acd1b2fac20d8562d33a0c24561a7b WHIRLPOOL 49a2083b8e8926e70714ac291983b1adfb48196bc76087e427c13b7f093440378cb07682d9fac19159b089baaabd5893a8e21a5dad6deae29473962ad9a6d197
 EBUILD exiv2-0.23-r2.ebuild 3234 SHA256 7113c6ca0bfe85aa523eadd7eb615ac26189dea8a91028275c6b714259c81a6b SHA512 20b0affcf7e50683289706a8820c9c7dc1484b6e4f574b06ea256a21a549b93ed8b5c6575d92095c3b68b8177437a030f030344233f1c347ba6f9dab90a88098 WHIRLPOOL 75618fca6c031a15e210b45f411995b2ba33a7548fa74451d22275694a52bf71a965ab2cfff7c1f8e671894565556efa8f9bd2dfc174768e63e0d30c27602987
-EBUILD exiv2-0.24.ebuild 3449 SHA256 2575f9aa26089d20adbc5e3ef5fd311692c88fde3b98ed71ac6360561d734c21 SHA512 f051f3bd5dadb6fbea8f7ae337e3fc1fe9a43361966e1ebf438123e12659597de5435465ad1c2b00fe1dd7cc2a1e3112a4ca711da3768ad9532ddb9e86900295 WHIRLPOOL bf4cc158d5853d339733340a25cb9189af8241f4289ca1089b4348824b10002088e3ec6052a0262915f26ae091b7a6d2572091e815edce779e9a27f7292b95c4
-MISC ChangeLog 16248 SHA256 7eafcdeab3630659d6955c4558187f2b6eaf7515558528d414c31a063a21fc14 SHA512 9db082e1daf4668c351e1ea54a1456f98db65355c4eb61f418b0001a944c038b0775e11cf0393e801dade62466449b4f976caeb70b34c7b1c9ab6e54f44e5b4d WHIRLPOOL 8813bc408dceaceb6b91ed78910837ea54583e15ca4ffd8664bc19c241a0f07de703b077e9fb6a46750d85dc56598b21fbb7192cc7ef234721fba58bef1b8b86
+EBUILD exiv2-0.24.ebuild 3476 SHA256 bddb090e4a7e6c8b57be83bd15932c9fa3ec81aae20af62117c50af418e71bac SHA512 b7ab8e8a3092c1e58482cd2805cce10f584a078753f8e52d2ef3f7ade1c8829ec76d2f675d3a01fdd1e32c66a5cb6e491d5715a0326d61cc5de8bd19abae7943 WHIRLPOOL a126f824ae23492ddcd06de46723c19858c8f04a363f186a7615911a5e05d67a87a7f005ed4c5c2c2121d8db6aae57e890e2b388ad0a4ba36be7de92d85eefe2
+MISC ChangeLog 16375 SHA256 1d66f8b60739af49d2321b31a91b4974c7b309d946413778aecf426c90fbf70a SHA512 63dde5170373d073c0041cc92b4ee4258cc2d81a155259ca0ef4d29b2baf01c4466c923c3e03667527b8ecf4f0b4636c85291a19601ffe120c45258492b498d4 WHIRLPOOL 8c8a9c4ad365ff295c70a34165b19cad36bff1b1045765bb20750518df200bd8b443f1120cd104b6db793d4c6cc5b5cf85027d379e45671bf2f6f43e3f023241
 MISC metadata.xml 419 SHA256 b23b53944ad27145ff517ae6e120a7788b6417358e340aaba5322897b697c810 SHA512 020bb5dd8b13580d300d7931e0d3acc9ef3d43881e06a3548dd887c05a4867493b9ee20464327d007841a5d793576008c464fed384d9dbe25a4ae6be0ccaf073 WHIRLPOOL 46b25df6e357034b8ddbe150cbd9c2da15f65866c4b8ce360d88941be536e39cde8c6189f7c18355dc15ef782ff96d3c7a387d92f28c01137d48aeb90509ae51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR1eG0ACgkQso7CE7gHKw3KpgCfXTvler4r79rzB8GI66R4zC51
-OTIAnR6KbHcTx2Ezs+6KdYaQ82SP3hce
-=xT5j
+iEYEAREIAAYFAlSLEOYACgkQVWmRsqeSphN1DACePlWEQMdDqQvKnqQOwxMuHxYa
++awAnifQKOPgasTA2vJ+Avh/bQpO7n+t
+=BE09
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/exiv2/exiv2-0.24.ebuild b/media-gfx/exiv2/exiv2-0.24.ebuild
index b5e101760783557554484d116c062a1f90016acf..00d79624ce30eb9ffd1bf25e2fba1514d9ebb0db 100644 (file)
--- a/media-gfx/exiv2/exiv2-0.24.ebuild
+++ b/media-gfx/exiv2/exiv2-0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.5 2014/11/26 06:51:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.6 2014/12/12 15:59:32 jer Exp $
 
 EAPI=5
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -102,7 +102,10 @@ multilib_src_compile() {
                                CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
                fi
 
-               use doc && emake doc
+               if use doc; then
+                       emake samples
+                       emake doc
+               fi
        fi
 }