gentoo resync : 19.10.2017

3 files changed, 3 insertions, 18 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 80c807bae39c..9173876a3f97 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,10 +1,9 @@
 AUX krita-3.1.4-qt-5.9.patch 722 SHA256 9180d7841675832b2d55f5b18755d926699963fbbf8853d0cad99321f7fc5733 SHA512 265b4bdc3b75ac346dac24fad6824dd713f7c40855bb10ab8373b18a55943a67c1b203676689a49d1a34cd682059c70d9371ba463a0e0e16496c67d5b19389c7 WHIRLPOOL 55f103ea73b638cb5ccce60cd48dc85a66751cf4578be4c7974a5223878031c357a2ad09c92e584d5ea11e9119aed80abfad22cd1a5d552f34f7b0b6745393f8
 AUX krita-3.2.0-tests-optional.patch 8806 SHA256 839bf01eccee18c6dec2cf2b0ab5d47884648edc7dab872ddd9c0162cb6f30ca SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34 WHIRLPOOL bc84ebb1803065672285047e76dcea2357b461b83779c138db3ca3462c0ad626b9820ed2dab333087d23709590f82f14ffdb07eb35794e2807a5bcdd10c18b0e
-AUX krita-3.2.1-exiv2-0.26.1.patch 298 SHA256 a0fdc9b00abbbf4afa5b42a2494c093995069f03ce383c39cd27c5346b5d910e SHA512 3188f4903dccd2e18ebcd7847a9d56e0291495bcf3fca9ec06af768068b69452e7e0116ed5ef8827071a3380aa0ad39f401fbb993bf8265dbdcfba84e65a0080 WHIRLPOOL bda16d8a2bd67d84474d58ab444a72b490f8ad3da988488e2c5b4e0574f86673c0ea01758630696dbafc0da41981b0fae771c2e339a8f2b54cfab0f1c0e27054
 AUX krita-vc-fix-gcc49-abi.patch 539 SHA256 c2d38b00853df1fccd2b161b53f8b7b65cc81777ef33a6ee6a9e62d6bac76615 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b WHIRLPOOL f47005d4446f5986517b54fc1979138119ffd99edeb7f7f4cf17967e979fe97fe30eb8dca2a71d3d35c02b791de58d63069f18edc35abea4e07775cc5275e45a
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
 DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e
 EBUILD krita-3.1.4.ebuild 2551 SHA256 d56beb770f09e4ddd3907dad4aab1ed3dbb13a0dc36bddf2beca1b64315d6b9c SHA512 74661e02ea49dac6f78a996f839520ebd9e29787293b3585c78c4c5b4faa46f13d31a2dd26765c058f964b925e59fa5ebdf81b95cbc24c7093ae61e84afec022 WHIRLPOOL 629c8eb72b3ebca52674ad569e17558f5337cfbe3e49f551ad4393cc3231d34d1ecfddd187c96ddf47c7088760585b0067d98673e4d01a6bb07835309253e0e3
-EBUILD krita-3.2.1.ebuild 2589 SHA256 1a7fa580aeed5be3bc709268ceef102d0c155c682080c02ad32acb9f90dc1dff SHA512 68bcebb3e4677f487613266cd10c46f36ee6e03275e264d803c64ac787849697a1f3084280d4d7e8edb1d0809ccd6582ec173fe165c863420a0b8cf6a4e64ac3 WHIRLPOOL 66ef1a9852958dfd59b7d27ac3b5f07f16dfdb7574d9d69332bf809ad7aa85ec7648d829c2d28e05bc6ba13da900b760a45b2b143824cba6a11c8ecc202a16c0
+EBUILD krita-3.2.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
 MISC ChangeLog 1347 SHA256 0842c6da6c74f58c2bf65ea5842f75857f7339daaa702947fef7625893487030 SHA512 51fbe12ec66ca91dcb60cb00d8c0563a7d033da26b9ada5188e94bcaac9852648191e700b62ec8a6f40af2773b1b566bc3de394bccf0d96b716dcc8f72a9460e WHIRLPOOL 8b7a12f8c82b8fcad1bb59e9438a722c5da203a386b97b8b8970b09cc3450fa53887f6354c027fbf0802887b678276dddb76db163e3548a6c702637d3105196b
 MISC metadata.xml 569 SHA256 734de7cdb3cd12de975cf7fa2a02370178fbe8ec8c9f6ea3b424f5bff1fed336 SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 WHIRLPOOL 67a8f8f9c346a040683a568a63cd3230bcf1a9fa613ceebd3d185179d750d8a050c8b1abb96758e5bd27e70c08683c6727d52c266e63fb22292e3619a4283a39
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
deleted file mode 100644
index 22c3858f4c66..000000000000
--- a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp	2017-10-15 22:09:56.908903726 +0200
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp	2017-10-15 22:10:23.956192118 +0200
-@@ -17,7 +17,7 @@
- #include "kis_xmp_io.h"
- 
- #include <string>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/xmp_exiv2.hpp>
- 
- #include "kis_exiv2.h"
- 
diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild
index 12b520bc5c56..7c6ab717abaa 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
 	dev-libs/boost:=
-	>=media-gfx/exiv2-0.26_p20170713:=
+	media-gfx/exiv2:=
 	media-libs/lcms
 	media-libs/libpng:0=
 	sys-libs/zlib
@@ -72,10 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
-	"${FILESDIR}"/${P}-exiv2-0.26.1.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
 
 src_configure() {
 	local mycmakeargs=(