gentoo resync : 19.10.2017

13 files changed, 139 insertions, 146 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index cd5df633840c..1483f2efcb60 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -4,12 +4,12 @@ AUX exiv2-0.25-fix-without-zlib.patch 662 SHA256 66618de00ba07ec660675e2dff99138
 AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e9421f63e575c2812d0b3980e0af29d03d96 SHA512 7dd251fa6e09ecc0493899fdc24431f636e56bf86d33fd4cf4b46fc27b14ce7a68cb4021a3799260398f48b256f403e00b86d143a012d3871e0de5bf57db9205 WHIRLPOOL af10468fad08e51f16141e70409e5ec718d5d669db8203df6a09de2fd824eb46376f87195cf1e744c60c567943c24d54afe388d54eeb5c240f876ebbcbd59514
 AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033
 AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998
-AUX exiv2-0.26_p20171013-ccache.patch 2615 SHA256 863f2c71bc93ff51cdd4748b6299b5e81b48ce141a3659e848ffbade9a0a318c SHA512 5ad182d374d56a83f8edb5d33333f971d5f266934258db545f1f8e2a7d55aa9835105d43cd718810126c7f560b0e6d2e0f8e4feda55dcf6760b9ad407b2e44bc WHIRLPOOL d7152400bb675b41e8e59026871f087aa69202686142237e2e76ccf1740a7941b91739ee34d313c7a8ade5d7fdae8d14305c92a770618dfc18654781c7128736
-AUX exiv2-0.26_p20171013-cmake.patch 1633 SHA256 1e1d09e876b78e77b4fccccda19cbf3ed4ca782b06805cb4f43a0c6c83af0961 SHA512 7b168242c6524107bafb13b7675d74cb87e20205568e80259d99c46d7328d8c48295977a2f08cc5195bbbaf865ff1e751a22dc7ba0dadbe32d1dbba7b908f9b7 WHIRLPOOL db047f78aaf48cb6d1963175441f0641f5ee29df15312df3726b3b8f306b3f16c3fb3ee75b4c752243e98f1936182337cea786444b2c13d2878cfd53ab5499b3
+AUX exiv2-0.26-fix-docs.patch 2532 SHA256 57c5033858334a7590592f60fbd0461f96a998b11d36255a2710378382d37561 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4 WHIRLPOOL 8f13c9e536a51e465e6496879487a61f36713439ae274cae2000c7c4969b3b69fd3b94f60db4b5a6e23380b8a9a134d959542b7fdba1338b8d32270373eec01f
+AUX exiv2-0.26-tools-optional.patch 1364 SHA256 2436bd8bd809eeafeb017e4f880674090fa4d6281f7912f149e8b0a1bb6dd05b SHA512 04c4add39da691d59543c3c28667fbf817c5b71c1d2ee28fe9863685fe525e47bd5c6ba8072bf7e63840f8f195b4c7505278ce24610a09e4fc9b9f9c0603383f WHIRLPOOL 7e541bb95f35e7785405bd06990fd0601ee91ddc0aa9b05dabec3e00352c196ab70384b1308a411d55b0e05999800b0ae19de1951f94a4c906a14d3621346266
 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
-DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe
+DIST exiv2-0.26_p20171018.tar.gz 28370645 SHA256 7dea665ff7e58a7a858b1aa624d75f27f8b8b154cce645ef970344982c9de449 SHA512 fb4c867a5879ab46f31a1a8a7f8d24395620d6ff2a1088bc9d8d589ca110fad063e19266f4e2b75ad7bebc5b87141ed95db8e214220670a4d11092dfe654558c WHIRLPOOL b2c5060fbbb177479ffd8fbf68957d2329c0383da673b3555f602e574ee90672f55dd6105dcb25e47c9efde97dd4721d05596b22ab9f954bf9e502ffac0ee45c
 EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f
-EBUILD exiv2-0.26_p20171013.ebuild 2994 SHA256 5968a6ebd00409a9fc73cabf0edd724683c07c449debbbba9a527df7a00a4088 SHA512 0b007508c22ff48b294e8acf8d0a256da56873221ce76bffaa946cfa7e6fd93de14ba021523721f0d27d22b6a319c342dae747ca41c1e76b07a833470b66f84d WHIRLPOOL e58971af6351d34e5cd0066c6f47f053ff79d61c863001db7cc3b11851d4007d1259a9975a5a8024aa960b062a35580f535b400bd2b237526c7ea1301f03803d
+EBUILD exiv2-0.26_p20171018.ebuild 3163 SHA256 c85c727b9f2cb2052d58bfd164f5c94a4113ba5d67be35df757565664b77ef18 SHA512 a78716618c8cfbd3c551198becdf8c30ca2c22e57dccae5fab0a716dcee9da5fd582e663d006cb410588d355543bb3538413729b75b8e47043c6851969f7805a WHIRLPOOL c24edb36250c3e9b61808d60be59c4788c6fc51dc3897f37050cc7a2075a440195c53fbad2ec00576396eba8af2437f2bd91b06dc42db48090d9f1041138a729
 MISC ChangeLog 6407 SHA256 169192c62c5737f3e30c0f97815a85216ef6c50714d94759089db57cc60468c4 SHA512 dbadbe62c5c985e88553f788bf6b22c98f9c4001d53882d8cff3a0e7fd23aa49dbc9e9dc72854578e711f5041f2f0182226d236946042f349a9ebc015b2a89fb WHIRLPOOL eb2926f593eb897554b5e4c77d4287f7718134e5d88b56ba4c48161d04834a8cd706989b456ba1c707303d6603270ae4cfb6d358c8c2f91bc8f3209caa9e2947
 MISC ChangeLog-2015 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c
 MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171018.ebuild
index edc5b1631383..aa1eeec5560b 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171018.ebuild
@@ -3,18 +3,24 @@
 
 EAPI=6
 
-COMMIT=269370863ecd61dd038eed3b96ecd65898d3bb6e
 LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	EGIT_BRANCH="0.26"
+	GIT_ECLASS=git-r3
+else
+	COMMIT=0a9962f5879335e4eb539ce419fce45a41de2770
+	SRC_URI="https://github.com/a17r/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
 inherit cmake-multilib python-any-r1 vcs-snapshot
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
 HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
 
 RDEPEND="
@@ -27,7 +33,6 @@ RDEPEND="
 	)
 	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
 "
-
 DEPEND="${RDEPEND}
 	doc? (
 		${PYTHON_DEPS}
@@ -39,11 +44,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
 
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+DOCS=( README doc/ChangeLog doc/cmd.txt )
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-ccache.patch" # bug 634302
+	# TODO: Take to upstream
+	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
+	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
 )
 
 pkg_setup() {
@@ -85,16 +91,16 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WITH_CCACHE=OFF
-		-DEXIV2_BUILD_SAMPLES=OFF
-		-DEXIV2_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
+		-DEXIV2_ENABLE_BUILD_PO=$(usex nls)
 		-DEXIV2_ENABLE_NLS=$(usex nls)
 		-DEXIV2_ENABLE_PNG=$(usex png)
 		-DEXIV2_ENABLE_CURL=$(usex webready)
 		-DEXIV2_ENABLE_SSH=$(usex webready)
 		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
 		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+		-DEXIV2_ENABLE_LIBXMP=NO
+		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
 	)
 
 	cmake-utils_src_configure
diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
new file mode 100644
index 000000000000..05ea18d6eb0c
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
@@ -0,0 +1,83 @@
+--- a/CMakeLists.txt	2015-07-19 16:04:35.363628707 +0200
++++ b/CMakeLists.txt	2015-07-19 16:28:31.051680136 +0200
+@@ -216,9 +216,7 @@
+ ADD_SUBDIRECTORY( xmpsdk )
+ ADD_SUBDIRECTORY( src )
+ 
+-IF( EXIV2_ENABLE_BUILD_SAMPLES )
+-    ADD_SUBDIRECTORY( samples )
+-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
++ADD_SUBDIRECTORY( samples )
+ 
+ IF( EXIV2_ENABLE_BUILD_PO )
+     ADD_SUBDIRECTORY( po )
+--- a/samples/CMakeLists.txt	2015-07-19 16:04:35.360628744 +0200
++++ b/samples/CMakeLists.txt	2015-07-19 16:30:46.415987850 +0200
+@@ -21,6 +21,10 @@
+ include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src")
+ 
+-SET( SAMPLES addmoddel.cpp
++SET( SAMPLES taglist.cpp )
++
++IF( EXIV2_ENABLE_BUILD_SAMPLES )
++    SET( SAMPLES ${SAMPLES}
++             addmoddel.cpp
+              convert-test.cpp
+              easyaccess-test.cpp
+              exifcomment.cpp
+@@ -38,7 +42,6 @@
+              mmap-test.cpp
+              prevtest.cpp
+              stringto-test.cpp
+-             taglist.cpp
+              tiff-test.cpp
+              werror-test.cpp
+              write-test.cpp
+@@ -47,6 +50,7 @@
+              xmpparser-test.cpp
+              xmpsample.cpp
+    )
++ENDIF()
+ 
+ FOREACH(entry ${SAMPLES})
+     STRING( REPLACE ".cpp" "" target ${entry})
+@@ -63,6 +67,7 @@
+     SET( MC_SRC            ${MC_SRC}       ../src/getopt_win32.c )
+ ENDIF( MSVC )
+ 
++IF( EXIV2_ENABLE_BUILD_SAMPLES )
+ SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
+ ADD_EXECUTABLE( metacopy ${MC_SRC} )
+ TARGET_LINK_LIBRARIES( metacopy exiv2lib )
+@@ -79,6 +84,7 @@
+ # ******************************************************************************
+ # Man page
+ INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
++ENDIF()
+ 
+ # That's all Folks!
+ ##
+--- a/doc/templates/Makefile	2015-07-19 16:50:50.589933604 +0200
++++ b/doc/templates/Makefile	2015-07-19 16:51:07.686719864 +0200
+@@ -143,7 +143,7 @@
+          xmp_mwg-rs \
+          xmp_mwg-kw
+ 
+-TAGLIST = ../../bin/taglist
++TAGLIST = ../../src/bin/taglist
+ 
+ # **********************************************************************
+ # ======================================================================
+diff --git a/doc/cmake_doc.sh b/doc/cmake_doc.sh
+index 44dd6760..5910a86d 100755
+--- a/doc/cmake_doc.sh
++++ b/doc/cmake_doc.sh
+@@ -16,7 +16,7 @@ if [ $# == 1 ]; then
+         mv src/exv_conf.h.keep src/exv_conf.h
+     fi
+     mkdir -p  src/bin/
+-    cp    -f  "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/
++    cp    -f  "${CMAKE_BINARY_DIR}/samples/taglist" src/bin/
+     make doc
+ fi
+ 
diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
new file mode 100644
index 000000000000..36920cd0dc49
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt	2017-06-07 00:14:25.374608170 +0200
++++ b/CMakeLists.txt	2017-06-07 00:17:00.680483299 +0200
+@@ -60,6 +60,7 @@
+     OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                              ON  )
+     SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF )
+ ENDIF()
++OPTION( EXIV2_ENABLE_TOOLS         "Build exiv2 executable"                                ON  )
+ 
+ # set include path for FindXXX.cmake files
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
+--- a/src/CMakeLists.txt	2017-06-07 00:14:25.368608098 +0200
++++ b/src/CMakeLists.txt	2017-06-07 00:16:06.710831682 +0200
+@@ -317,10 +317,12 @@
+ 
+ # ******************************************************************************
+ # exiv2 application
+-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC}  ${EXIV2_HDR} )
++IF(EXIV2_ENABLE_TOOLS)
++    ADD_EXECUTABLE( exiv2 ${EXIV2_SRC}  ${EXIV2_HDR} )
+ target_compile_definitions(exiv2 PRIVATE EXV_LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" )
+-TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
+-INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
++    TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
++    INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
++ENDIF( EXIV2_ENABLE_TOOLS )
+ 
+ # ******************************************************************************
+ # connection test application
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
deleted file mode 100644
index ece62cedce9c..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9686aa8857bcd992ee4f23d20e80dfc31679f67a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 15 Oct 2017 09:28:09 +0200
-Subject: [PATCH] Add build switch to disable auto ccache
-
-Current usage of ccache leads to sandbox issues.
-Be able to switch it off for package managers that already can
-make use of ccache for build.
----
- CMakeLists.txt                |  1 +
- config/findDependencies.cmake | 12 +++++++-----
- config/printSummary.cmake     |  1 +
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80fa907c..a60d4b2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,6 +41,7 @@ option( EXIV2_ENABLE_SSH              "USE Libssh for SshIo"
- option( EXIV2_BUILD_SAMPLES           "Build sample applications"                             ON  )
- option( EXIV2_BUILD_PO                "Build translations files"                              OFF )
- option( EXIV2_BUILD_EXIV2_COMMAND     "Build exiv2 command-line executable"                   ON  )
-+option( BUILD_WITH_CCACHE             "Use ccache to speed up compile time"                   ON  )
- 
- if ( EXIV2_ENABLE_WEBREADY )
-     set ( EXIV2_ENABLE_CURL ON )
-diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
-index 16967763..d6af9488 100644
---- a/config/findDependencies.cmake
-+++ b/config/findDependencies.cmake
-@@ -58,9 +58,11 @@ if( EXIV2_ENABLE_BUILD_PO )
-     endif()
- endif()
- 
--find_program(CCACHE_FOUND ccache)
--if(CCACHE_FOUND)
--    message(STATUS "Program ccache found")
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-+if( BUILD_WITH_CCACHE )
-+    find_program(CCACHE_FOUND ccache)
-+    if(CCACHE_FOUND)
-+        message(STATUS "Program ccache found")
-+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-+    endif()
- endif()
-diff --git a/config/printSummary.cmake b/config/printSummary.cmake
-index 21e444a4..62ba4e98 100644
---- a/config/printSummary.cmake
-+++ b/config/printSummary.cmake
-@@ -40,6 +40,7 @@ endif()
- OptionOutput( "Building exiv2 command:             " EXIV2_BUILD_EXIV2_COMMAND       )
- OptionOutput( "Building samples:                   " EXIV2_BUILD_SAMPLES             )
- OptionOutput( "Building PO files:                  " EXIV2_BUILD_PO                  )
-+OptionOutput( "Using ccache:                       " BUILD_WITH_CCACHE               )
- 
- 
- message( STATUS "------------------------------------------------------------------" )
--- 
-2.14.2
-
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
deleted file mode 100644
index c10f125415b2..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Fri, 13 Oct 2017 18:54:11 +0200
-Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF
-
----
- src/CMakeLists.txt | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fe49a0a6..f75cbf1b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
-     if ( BUILD_SHARED_LIBS )
-         target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL )
-     endif()
-+    # modify source lists to suit environment
-+
-+    # TODO This should not be needed here! we need to fix the previous TODO
-+    target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
-+
-+    if(NOT EXV_HAVE_TIMEGM )
-+        target_sources(exiv2    PRIVATE localtime.c)
-+    endif()
-+
-+    if (MSVC)
-+        target_sources(exiv2    PRIVATE getopt_win32.c)
-+    endif()
-     install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
--# TODO This should not be needed here! we need to fix the previous TODO
--target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
--
- # modify source lists to suit environment
- if(NOT EXV_HAVE_TIMEGM )
-     target_sources(exiv2lib PRIVATE localtime.c)
--    target_sources(exiv2    PRIVATE localtime.c)
- endif()
- 
- if (MSVC)
-     target_sources(exiv2lib PRIVATE getopt_win32.c)
--    target_sources(exiv2    PRIVATE getopt_win32.c)
- endif()
- 
- # ******************************************************************************
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 15fbd333b399..f15c6775e18f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 SHA256 98899a22071a112e332bbe2dfec119e0
 DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
 DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
 EBUILD graphicsmagick-1.3.25.ebuild 3162 SHA256 9772c4d5ffdfbe07e98e4e9597f845925a1b5a29c8890e4c7e64f130bc9d5f8a SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 WHIRLPOOL 617d7a9a3c1ad531e39107a9c1dcf3497e6adee6cb72e4f515afb70e2e273ff9e7f8e320253bed59cb028f913aaa1fc6bec36e96380237cc2583f8a67f8c7bb0
-EBUILD graphicsmagick-1.3.26.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
+EBUILD graphicsmagick-1.3.26.ebuild 3282 SHA256 3778b309dff47b0b9d2a8b149b2154a36b1903d2d9adb2792f8809934ce21cc3 SHA512 d3b3e7ad5fda12c5690f2fe565cd5dcd82477c3b35b7af78387d84d707e25688b453c9da5193f188434ff3e86ae8d7da0ab97b5f525b2cba412106f26f538b61 WHIRLPOOL 8b712f6b02acc08eb996e897fd37594a900b0b34b43cbc7c9b541943b25e0a3380b4d5667289b4df3d8f270d96be85c8a67f91f9919bf23c3b6f903d7b0525c7
 EBUILD graphicsmagick-9999.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
 MISC ChangeLog 8279 SHA256 942d53bb0df3374e5a890ba0fa3b6410a4570e4f32a6140422760aca294f2729 SHA512 4e57e7d633fa10818e13e5b66cbd914a8d359bd1982d828c11328cb52eb00994b0ae62e1917722085736c16e06677da0e67e76b92eb38cb130f13adaec362e05 WHIRLPOOL 21c6e65a2aa94a1588479e9b42943c774507f49127db5c056c3b9d6652562cec97d32e68817052c5a8e95fdfa4f36e710a22e3c55e08fcf88ab31e32005d3b3e
 MISC ChangeLog-2015 14451 SHA256 22b7127860406f4d3c6e56317c76c6765e1fe46a790f238506c83101199c9a92 SHA512 50e9a3c6b90e6ec809048762d154a075f4e3c9468bdfd8d1cebdd4cda067f82a9e58380c7c74565058de80cc4a180558613d9c5c7459bb5b13335b6a84db0cc0 WHIRLPOOL 7820861ab3397fc23dd4a497cc4860beef98393d0e6ed95b82dc35bae54357f8ab4bf2ac6c270fa7bfb6fbcea959f955272cee989b0ae8cc4715226464d6a741
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
index aecb472c7108..d1958488f431 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
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=(
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 973a766e2dd2..87ecbd599afc 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -3,7 +3,7 @@ DIST potrace-1.14.tar.gz 649685 SHA256 db72b65311cfdcb63880b317f610d84485f086e15
 DIST potrace-1.15.tar.gz 650840 SHA256 a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02 WHIRLPOOL 6b5718dea33fb5597a56d8a8893198a342f6cf1c612ed4ea7b94417b9aabf31b3ecfec69a2dfcedb48430cfa09fdf987ab083a4b1298e73c4d163de93d48c8ee
 EBUILD potrace-1.13.ebuild 830 SHA256 38039d47f32b3a609d55ec3172bf468149ef3c9a5da63c4cff09e09da8858768 SHA512 50d4a9ae0d69dd85cbc22aed2a862e649b2bc17883e1bd782e9d4976d97807dbb7e69b67c073c800bd14bd92eb024af2f42b58e58c57f1d156e1ec72403fc268 WHIRLPOOL 26df7fed083ea4b31bc12d43dec22b47fe96c5d3e69344db19a709f49bd37b4b9b5c9722d28b99d4dd5a820d9a95fba706abba6fe1cfcbd435b921898447c7b9
 EBUILD potrace-1.14.ebuild 837 SHA256 72f311d037a3543576f28bdd7172a71988635440e8f76def597508dfb948e431 SHA512 93cecd52cab437f70eed160a7b8f12789aaf98e3c9d9adf4615b64924806dfa16a80747678d97d9343eefdeaae30e6c1d951f562f6911a0ea45f28a571132c08 WHIRLPOOL 9f8aebe38abef0c0586a3fdc4036669cbbfe08aca0301d5e3324c491febd821484f0401f5b145b2b7b942ca253e265819b11e89f17ee81163853650e679c68a6
-EBUILD potrace-1.15.ebuild 833 SHA256 a3bdd3a97cfcd5bba54fd94fbd122569ce735c4fe165404712a0fef64ca75883 SHA512 36f6cfe6f7644b1fc460bd21a59274179397dbdbe151b87459b9b2250d795bcf75714262dff441351e48759c5ae24bc6cb4c0dae99fc01ae97648e84c1c14a0c WHIRLPOOL 5165b34652cd4714e64815114832c8aade1e5c8b9cc57fa7aa4a452213b4f4cf77490d7a423bc9dedf88b817cb36d606c80968bac6e9c25ad29294ff0fdffee3
+EBUILD potrace-1.15.ebuild 831 SHA256 50cebf6d70620edb7f5b235c46f269fdca1be44bb660683c522e07a45d67a8b0 SHA512 4cbe72be607378a8ee7e69e341910d3bf375b1b7678f4893d9ce6f6bfe0fd9f9020f471b4dd737038ff5641ed9cdf2931a0b15485e81fd050667b2775d733e22 WHIRLPOOL 80b21b0c3b7fb5f1affe41788eb4837a12398c1ad48e7a98e2d38ef48b5ea1dfae3180bff8b6dbad3389d138695f7cf6177809ca911bcaaf963cbe43bc131e03
 MISC ChangeLog 5086 SHA256 64488097ac31f9a46d377e30ea525b4aee1be34dd0379f5f085e07cf50048497 SHA512 cbefb651a0d1ae719eac60f5c3f99ba687afae36fc78ca65bd639bd4cdc0b8ff79b70e7438024ac07b4927e3e34aa92381b3086e231119a798a9b55b21d99c01 WHIRLPOOL 4670fdeaed00a769216a5d2a62500b49389c72acbbcd4416539f4373e2ddd092dee1651a05212306f6482bf3cba181cc1d0205a0064c5aa484b8eae9bfb6ef37
 MISC ChangeLog-2015 7442 SHA256 94d6987bdff3012328e7b4a6990d5af3401780651106d75e8261f08920216984 SHA512 d125d31f06c6466804296fd42d445a97908bb1074c04cd478ce5080dedddaa5a462b908be002351e84d88aaef3895c587cf389fd8d1501b46bf074e77f84be4a WHIRLPOOL 20bd35440fc87380d77e3ffc581f50ea215a85173b3f7f2603aaa776b68a660e37abfe4d5587550d6fc7fac091ffab5009b225b9ae98320a93cb6266af208785
 MISC metadata.xml 534 SHA256 7c0c57bc2be2d8b0466ec1c0f2fb3b3636990b35914fab0d6921d16e510817b5 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3 WHIRLPOOL 0d2ab5e46df97eb4af4d7b94e9c54746e72dc73307eeea103385eaa55f1c1e6a2bf3b4cd092813913bfcb46068a2df4ea8d6b8759b0b768f88f63f92891fae16
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index 874baa1736b1..b5dd43149dd3 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"