gentoo resync : 10.11.2017

4 files changed, 58 insertions, 2 deletions

diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 11bcf384aa02..0e470de2bf69 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,9 +1,10 @@
+AUX gexiv2-0.10.3-exiv-0.26.patch 1487 SHA256 ac4c5f24e1ee0dbaa7b6c3145e2ca85c191efbc5a43e9dc7b356dde3764f0951 SHA512 2c36f1a805ffd789672dd1dfe0c6404e7c38ac7935c6cb62819fe8d58c0eb536c92ea1430948e91c746e803ef3d57868f17b83918d2b1d9667886292e42d0257 WHIRLPOOL c86c8125d3497be992f876a036e713c76d2d9c6254290cea7918d0d722e672a110f34a36266981c950aad646a53371181027cb7dce81ba72157bbe53746455db
 AUX gexiv2-0.10.5-stdexcept.patch 461 SHA256 e5eb73234a5e0dbb9c3e66fca99dbd26aaf5aa7ff83ca5be15213e010f318fce SHA512 fa88869142b5efe87980109ac21d3e23c279d4f1dbf4a32921c20350868c2d95301e3b9c52924232ff1a6d8c2e11701a0f8a83dcdd991b6dec2be53995e592bb WHIRLPOOL 3ad7fc5546a08840a07cbf6d5ed2ac515db78004ab099d21b4106a02dc1c1254004f5da1279d6373f243387b4291da289cc31d9cef7194ab2d9cdff8a2edeb7c
 DIST gexiv2-0.10.3.tar.xz 244816 SHA256 390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f WHIRLPOOL e50401f642a2252cad664716004038fdd364e9a42b93c7b9748e0f93b652cad31432f7f58571dd0ff67c8dcb1deca590eaaf42ad287d8d27110d0626a352154b
 DIST gexiv2-0.10.5.tar.xz 591752 SHA256 318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06 WHIRLPOOL 8177d284941d72346e87b8b463cd84e86aafe84d63fc9f4b01e5c9c3e7bd01999c7eace5b4179918033a2cc72cd2d14b07104413f59fda86bbb3a5bdc1839e4b
 DIST gexiv2-0.10.6.tar.xz 629872 SHA256 132788919667254b42c026ab39ab3c3a5be59be8575c05fa4b371ca8aed55825 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca WHIRLPOOL 94a618f1eedf51cae6ea9cbb9754fa6bcc7fe6d100928711f588446e6d179d358e687858ac3681aab845e79021f20a13c6baf1f356874f35bcc1e782b90b6f4b
-EBUILD gexiv2-0.10.3.ebuild 1220 SHA256 4fc915c00ce39b3b54d5c1cefcfb83d9485d9cb8fe55a76d36a7fd583c9f3266 SHA512 b508d52ff97354d2739994146e22c312e1cb9c08a157850851bc606ae77d0e0c35fdb53e5ce75901d21b1c0ed5e0da096a81270cef2831b245eaefc7cfb2de42 WHIRLPOOL 4e7dd2e44c71e195245798438e5e2e51044f084affd0150b35784de3de93b40f0bd0a60304647957996ff0e998691c862c0316ec9b992daa495d0823a68b09ca
-EBUILD gexiv2-0.10.5-r1.ebuild 1344 SHA256 c518beb7274528d5bd5fec82f69a44fc6fc83d2997072a8f0dca539226f305d0 SHA512 7573ba2365eb95cc9ba138eb9dd01b031234ae3c769df8ba7be54b6dfbaf7168601b9ce85624af9a2d26ab9ff096c0bb64ab6d5fff6eb82a5050ea129fe11483 WHIRLPOOL e9d0156a4d60bfce4c22490762669121215e3396be7f8325722ad438cbc42d46b14edeba407768bc72f6562429950345a6f582ffcabdaa51b8ad7c69d52ea661
+EBUILD gexiv2-0.10.3.ebuild 1263 SHA256 82acbcb2237e27c03cd00efe0da4a907508b7e3ef373991b70470b8b4d6c7799 SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f WHIRLPOOL d2af4b18b8f90fcffbac144189b18bcaa2771ecfbafec9bbc29cff0ebe42ec196b6a644a7c6b431990d7a69fbbb8c48021200339822b6e60669e4323a61c3c6c
+EBUILD gexiv2-0.10.5-r1.ebuild 1388 SHA256 11a02aff20f94f58ec96c4fe5c115b5fd3051271dad999bac43265c3debcbbc1 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451 WHIRLPOOL 7101da1ba22b107122f7c0e403cfe215ccdb5d7da8b89a33e34193936b075504258204d5f87c6faf9f011787974882b3ba2b67ca370fe5035bb4a0b4325fe253
 EBUILD gexiv2-0.10.6.ebuild 1287 SHA256 ed360b0e4a4370b834e3f875894e286ccbb5f004b5ffd3efbf7b12d94792c513 SHA512 e63a5e7c7928913f8ee1ad51c2a48133fedb6d78e784c02ad21135f657fed85135e290a09a28955e89fc4ed7bba19d54f97e7ec0be84d03661a14b7923c306dd WHIRLPOOL 8331d06854e22d3e5580461bc5d440774868aff4f7d9bc0987223211802d4059329cf3cfa3ce36b489ebaddb74f4e6143ce87afde1add595b421d74350efeace
 MISC ChangeLog 5342 SHA256 539e68847c6a5d7320a9af438c802aaa7406938157f045aeb37184dc31779163 SHA512 e463d3c38cc95f3c89994e17e846710baed528e6f0fadf0e1353a96ea24fd1761b064bd35308dc7053d930ac85169a58a1a82a9b0bc9a4d0e4861c09f9f8dfd5 WHIRLPOOL f845984a48dec947c6b938a6de5b6935738d7741d31e3e9a82c3a6ebc03e3793bfb71e6c92436e7125c7e3f7769770dfe1a86a93b211d83d95f067a4b0f3d2e3
 MISC ChangeLog-2015 5029 SHA256 20706ce60ff1d1455efc3cdc4575aa3781dbc43492fbff1b225ac8a21d93f619 SHA512 1c2ed3076bdee3f033106268a3ea381b15797c8a681629555d08d964aea396fda8f6c7ac95a6609557e5b98f75e099da3148910c693fbbd2ff931909a71c240d WHIRLPOOL d6b89500b6d3ac3c33dc5a6eee6af180258e7d10867a2988bc03fa716b267102e0f8e1c504ab2d22a0c30a6006f661d722e2b4d2fc2a11211eb6d09f1427b4be
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
new file mode 100644
index 000000000000..c3fd932e2a21
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
@@ -0,0 +1,53 @@
+From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Fri, 12 May 2017 19:50:58 +0200
+Subject: iostream: Adapt to new Exiv2 API in 0.26
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782449
+---
+ gexiv2/gexiv2-stream-io.cpp | 4 ++--
+ gexiv2/gexiv2-stream-io.h   | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
+index 0ae3324..abfb843 100644
+--- a/gexiv2/gexiv2-stream-io.cpp
++++ b/gexiv2/gexiv2-stream-io.cpp
+@@ -142,7 +142,7 @@ long StreamIo::tell () const {
+     return cb->Position (cb->handle);
+ }
+ 
+-long StreamIo::size () const {
++StreamIo::size_type StreamIo::size () const {
+     return cb->Length (cb->handle);
+ }
+ 
+diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
+index 76621a9..a26f4e6 100644
+--- a/gexiv2/gexiv2-stream-io.h
++++ b/gexiv2/gexiv2-stream-io.h
+@@ -25,6 +25,12 @@ public:
+ 
+ 	StreamIo (ManagedStreamCallbacks* cb);
+ 
++#if EXIV2_TEST_VERSION(0,26,0)
++    typedef size_t size_type;
++#else
++    typedef long size_type;
++#endif
++
+ 	virtual ~StreamIo ();
+ 	virtual int open ();
+ 	virtual int close ();
+@@ -39,7 +45,7 @@ public:
+ 	virtual Exiv2::byte* mmap (bool isWriteable = false);
+ 	virtual int munmap ();
+ 	virtual long tell () const;
+-	virtual long size () const;
++	virtual size_type size () const;
+ 	virtual bool isopen () const;
+ 	virtual int error () const;
+ 	virtual bool eof () const;
+-- 
+cgit v0.12
+
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
index 6941e825179e..4efc11740ce3 100644
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	xdg_environment_reset
 	tc-export CXX
+	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
 }
 
 src_configure() {
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
index 8ba9a36dfbaa..888a67d1ee91 100644
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.5-stdexcept.patch
+	"${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch
 )
 
 src_prepare() {