gentoo resync : 20.11.2017

20 files changed, 92 insertions, 452 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 105124c3726c..370c7e822b2c 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,15 +1,7 @@
-AUX exiv2-0.25-fix-docs.patch 2164 SHA256 8d50b058fcaefc15455cae9c5e5edb2a5217acfe1c8de7f4d572bc3cfa2f17cd SHA512 be4e2077a52f54384ef6660e045c6eedda06bdacc3ca804cc6b9554b47be717bf50c4ac1ca42fa452f204e784a2f863ffba7276b17342bde67f9a53db5749d8b WHIRLPOOL 60f86dddcbe67f63ddb7d0332be05505024878c5cbbee99c8a4c9567906e9da94b95b64a7655f913f5e86a4e0917c849840f8d9e91eb1864cdfb095d7c844412
-AUX exiv2-0.25-fix-install-dirs.patch 2415 SHA256 a627484a3960071f01eb6f656f9af0f9a0b2771d9d9f6cd8a3429f378823a48a SHA512 402f9aacb8b6af95e94ea3d31f0c438da4407fc037004a3e99408ba5cce8cde5dd1d0c98d1e619fff56b0051516e20610a98899e5ff22d00b3827384f82e7493 WHIRLPOOL f58aa8122e207f0271a7f3a0fb6ff0297b630e187a65622ea55b0159d03acbbf09132f8a6c836485730ec5a4d085ad55e53dfe86fe08e47b449f44b68bb28a5f
-AUX exiv2-0.25-fix-without-zlib.patch 662 SHA256 66618de00ba07ec660675e2dff99138ba56fb0a8cbdab6a8a024b4f3ca93db3c SHA512 c15173bc687c2008a1e3cd04623167dd085f3e9f7655107fc75880df3d5bb51688572d2d3fc7a722763eaa5ff45bcb769f4090c615f8b3ffbf6d0417dccab8d0 WHIRLPOOL d2842c00569f578b41f543f944757b72963ac4d521017701db75c630ead80295bbb8fc39091f6ac34661e21b6910ef78d12db6f35659d79e1c25ec437d0ef7d7
-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-fix-docs.patch 2532 SHA256 57c5033858334a7590592f60fbd0461f96a998b11d36255a2710378382d37561 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4 WHIRLPOOL 8f13c9e536a51e465e6496879487a61f36713439ae274cae2000c7c4969b3b69fd3b94f60db4b5a6e23380b8a9a134d959542b7fdba1338b8d32270373eec01f
 AUX exiv2-0.26-tools-optional.patch 1386 SHA256 6d036435885f0b9be480410732e4a8a0d787903c25f4b9dd89a1bf69a37012d2 SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483 WHIRLPOOL f40003b04f3b5b751dba392e07b06c97a5a41eada24154e962ca41cd2473ecf43f866808ac930a0c9da8c2b82a85416a47c8e298e01723e3cd2f217fd4bf3667
-DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
 DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09
-EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f
-EBUILD exiv2-0.26_p20171104.ebuild 3158 SHA256 269fe84c9575b1972f0156f3f92c0a8e526ab1786e2fa095971d7e79335da2f2 SHA512 1b3ecc06790fd265932282635cf12c26e947b9cdfb33d6bba30f47a70bb764f33789c35375ccfd20fef331bf771b98bff7208c1f7754abb752e4f929dc4feaf6 WHIRLPOOL ca5c8c7a708d8521f635e6564b6a24d1a799e66a3308236cb0fdbfa353a15024c4f0f2c43cc886a4801f46733cd612b21bac6f29a8dd9e3408fc36ffbdcc42f3
+EBUILD exiv2-0.26_p20171104.ebuild 3156 SHA256 a40746c6e6252e3136a0001bce52673f66c0cb7d5123d5acaa3b6d678c51faca SHA512 28faa24036404ccc8452ef3af5f793a634b0236697f9fb727f95778b0d5a2e0729410118f0ec15f157b0c32562fccadc5536d4afe9faeebbcd497664239a870b WHIRLPOOL 3d5f83199a8b54ea781d848f0afb1f72262e473cdea893cc5e6f732a5b3696efa36178e477ecc6268a41646b2ea1f2ae733ff16e6f6b4d45127d33d813761781
 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.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
deleted file mode 100644
index 5f2ca76c7da1..000000000000
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/14"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-		${PYTHON_DEPS}
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
-	"${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
-	"${FILESDIR}/${PN}-0.25-hide-symbols.patch"
-	"${FILESDIR}/${PN}-0.25-fvisibility-hidden.patch"
-	# TODO: Take to upstream
-	"${FILESDIR}/${PN}-0.25-fix-docs.patch"
-	"${FILESDIR}/${PN}-0.25-tools-optional.patch"
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r msvc* build || die "Failed to remove msvc dirs"
-
-	if [[ ${PV} != *9999 ]] ; then
-		if [[ -d po ]] ; then
-			pushd po > /dev/null || die
-			for lang in *.po; do
-				if ! has ${lang%.po} ${LINGUAS} ; then
-					rm -rf ${lang} || die
-				fi
-			done
-			popd > /dev/null || die
-		else
-			die "Failed to prepare LINGUAS - po directory moved?"
-		fi
-	fi
-
-	# convert docs to UTF-8
-	local i
-	for i in doc/cmd.txt; do
-		einfo "Converting "${i}" to UTF-8"
-		iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
-		mv -f "${i}.tmp" "${i}" || die
-	done
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_ENABLE_BUILD_PO=YES
-		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_LIBXMP=NO
-		$(multilib_is_native_abi || \
-			echo -DEXIV2_ENABLE_TOOLS=NO)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dodoc -r "${S}"/doc/html
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
index dc05f6aaed6e..9450566668f1 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
 	SRC_URI="https://github.com/Exiv2/${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"
+	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
 
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
deleted file mode 100644
index e2bf677b5125..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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
-@@ -20,7 +20,11 @@
- endif()
- 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 @@
- SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
- TARGET_LINK_LIBRARIES( exiv2json exiv2lib )
- INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
-+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/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch
deleted file mode 100644
index bca79dd4d471..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-USE GNUInstallDirs to fix man page and multilib install
-
-See also: http://dev.exiv2.org/issues/1125
-Patch based on: http://pkgs.fedoraproject.org/cgit/exiv2.git/tree/exiv2-0.25-cmake_LIB_SUFFIX.patch
-
---- b/config/CMakeChecks.txt	2015-07-19 14:23:11.606686135 +0200
-+++ b/config/CMakeChecks.txt	2015-06-22 08:41:22.913094633 -0500
-@@ -37,6 +37,8 @@
- INCLUDE( CheckCSourceCompiles )
- INCLUDE( CheckCXXSourceCompiles )
- 
-+INCLUDE( GNUInstallDirs )
-+
- INCLUDE( FindIconv )
- 
- SET( STDC_HEADERS ON )
-@@ -289,9 +291,9 @@
- 
- IF( NOT MSVC )
-     CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY )
--    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig )
-+    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-     CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm)
--    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig )
-+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
- ENDIF( NOT MSVC )
- 
- # ******************************************************************************
---- a/src/CMakeLists.txt	2015-07-19 14:06:54.104906589 +0200
-+++ b/src/CMakeLists.txt	2015-07-19 14:12:37.982607526 +0200
-@@ -321,7 +321,7 @@
- 
- # ******************************************************************************
- # Man page
--INSTALL( FILES exiv2.1 DESTINATION man/man1 )
-+INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
- 
- # That's all Folks!
- ##
---- a/CMakeLists.txt	2015-06-15 10:32:21.000000000 -0500
-+++ b/CMakeLists.txt	2015-06-22 08:48:19.486245765 -0500
-@@ -25,7 +25,7 @@ if( POLICY CMP0042 )
- else()
-     SET(CMAKE_MACOSX_RPATH 1)
- endif()
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- 
- 
- SET( PACKAGE_COPYRIGHT      "Andreas Huggel" )
-@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt )
- 
- SET( INSTALL_TARGET_STANDARD_ARGS
-      RUNTIME DESTINATION bin
--     LIBRARY DESTINATION lib
--     ARCHIVE DESTINATION lib
-+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- 
- ##
- # add sources from XMPSDK directory
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch
deleted file mode 100644
index c6d435d68bb8..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix exiv2.hpp if built with PNG support disabled (--without-zlib)
-
-Fixed upstream in >=0.26
-
-See also: http://dev.exiv2.org/issues/1103
-Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046
-Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836
-
-Index: exiv2.hpp
-===================================================================
---- a/include/exiv2/exiv2.hpp	(revision 3887)
-+++ b/include/exiv2/exiv2.hpp	(revision 3888)
-@@ -52,7 +52,9 @@
- #include "mrwimage.hpp"
- #include "orfimage.hpp"
- #include "pgfimage.hpp"
-+#ifdef   EXV_HAVE_LIBZ
- #include "pngimage.hpp"
-+#endif
- #include "preview.hpp"
- #include "properties.hpp"
- #include "psdimage.hpp"
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch b/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch
deleted file mode 100644
index 26c5c1d39d74..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/xmpsdk/CMakeLists.txt	(revision 3974)
-+++ b/xmpsdk/CMakeLists.txt	(revision 3975)
-@@ -20,6 +20,14 @@
-     ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS)
- ENDFOREACH()
- 
-+if(NOT MSVC)
-+  # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang
-+  if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
-+    # 1123 - hide xmpsdk symbols
-+    add_definitions( -fvisibility=hidden -fvisibility-inlines-hidden )
-+  endif()
-+endif()
-+
- IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
-     ADD_LIBRARY( xmp STATIC ${XMPSRC} )
-     GET_TARGET_PROPERTY( XMPLIB xmp LOCATION )
diff --git a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch b/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch
deleted file mode 100644
index 7c8613db5e82..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Index: a/samples/CMakeLists.txt
-===================================================================
---- a/samples/CMakeLists.txt	(revision 3972)
-+++ b/samples/CMakeLists.txt	(revision 3973)
-@@ -52,7 +52,7 @@
-     STRING( REPLACE ".cpp" "" target ${entry})
-     ADD_EXECUTABLE( ${target} ${target}.cpp )
-     ADD_TEST( ${target}_test ${target} )
--    TARGET_LINK_LIBRARIES( ${target} exiv2lib )
-+    TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${EXPAT_LIBRARIES})
-     #INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
- ENDFOREACH(entry ${SAMPLES})
- 
-Index: a/src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt	(revision 3972)
-+++ b/src/CMakeLists.txt	(revision 3973)
-@@ -240,20 +240,20 @@
- 
- if ( MSVC )
-     source_group("Header Files" FILES ${LIBEXIV2_HDR} )
--    TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} )
-     source_group("Header Files" FILES ${LIBCURL_HDR} )
--    TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} )
-     source_group("Header Files" FILES ${SSH_HDR} )
--    TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} )
- else()
-     if ( NOT MINGW )
--        TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
--        TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} )
--        TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} )
-     else()
--        TARGET_LINK_LIBRARIES( exiv2lib    ${EXPAT_LIBRARIES} )
--        TARGET_LINK_LIBRARIES( exiv2lib    ${CURL_LIBRARIES} )
--        TARGET_LINK_LIBRARIES( exiv2lib    ${SSH_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} )
-     endif()
- endif()
- 
-@@ -262,33 +262,33 @@
-     if  ( MSVC )
-         LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
-     endif(MSVC)
--    TARGET_LINK_LIBRARIES( exiv2lib xmp )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE xmp )
- ENDIF()
- 
- IF( EXIV2_ENABLE_PNG )
-     IF( ZLIB_FOUND )
-         IF( MSVC )
-             if ( EXIV2_ENABLE_SHARED )
--                TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES} debug ${ZLIB_LIBRARIES}d )
-+                TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib )
-             else()
--                TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib )
-+                TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized zlibstatic.lib debug zlibstaticd.lib )
-             endif()
-         ELSE()
--            TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} )
-+            TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
-         ENDIF()
-     ENDIF()
- ENDIF()
- 
- IF( EXIV2_ENABLE_NLS )
--    TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} )
- ENDIF( EXIV2_ENABLE_NLS )
- 
- IF( ICONV_FOUND )
--    TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} )
- ENDIF( ICONV_FOUND )
- 
- IF (CYGWIN OR MINGW)
--    TARGET_LINK_LIBRARIES( exiv2lib psapi )
-+    TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi )
- ENDIF(CYGWIN OR MINGW)
- 
- 
-@@ -303,7 +303,7 @@
- # ******************************************************************************
- # connection test application
- ADD_EXECUTABLE( conntest ${CONNTEST} )
--TARGET_LINK_LIBRARIES( conntest exiv2lib )
-+TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES})
- 
- # ******************************************************************************
- # exifprint application
diff --git a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
deleted file mode 100644
index 2bb030a4c4f2..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CMakeLists.txt	2015-06-15 17:32:21.000000000 +0200
-+++ b/CMakeLists.txt	2015-10-04 14:37:05.319679836 +0200
-@@ -55,6 +55,7 @@
- OPTION( EXIV2_ENABLE_WEBREADY      "Build webready support into library"                   OFF )
- OPTION( EXIV2_ENABLE_CURL          "USE Libcurl for HttpIo"                                ON  )
- OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                                  ON  )
-+OPTION( EXIV2_ENABLE_TOOLS         "Build exiv2 executable"                                ON  )
- 
- IF( MINGW OR UNIX )
-     IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" )
---- a/src/CMakeLists.txt	2015-06-14 11:12:19.000000000 +0200
-+++ b/src/CMakeLists.txt	2015-10-04 14:33:27.784399402 +0200
-@@ -296,9 +296,11 @@
- 
- # ******************************************************************************
- # exiv2 application
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
--INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
-+IF( EXIV2_ENABLE_TOOLS )
-+    ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )
-+    TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
-+    INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
-+ENDIF( EXIV2_ENABLE_TOOLS )
- 
- # ******************************************************************************
- # connection test application
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index cec0ce1cc8de..683dbbb35f41 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -4,4 +4,4 @@ DIST gqview-2.1.5.tar.gz 1685061 SHA256 12fea494e607a69eff31cdca13d306ef1b0b3b78
 EBUILD gqview-2.1.5-r1.ebuild 969 SHA256 ab43eadc362902f6c15c9ba3db0877f546bf68f287febcfe2dac15ef0b49a071 SHA512 a2ad1697208f0f963886e6551ab455cfa002ab2461bac416ea7e53134d0d50e31c5bf7c4b4ef72655c485773b42842d11fc657897f1c8ebf07909cee23a4d1d0 WHIRLPOOL 4dd563b57b70992cd3ea049de3e0a446370d3e970b67668270f87c49e08c9c323b0397f98de105b401b3fa48718ca7dbb16a1bccdd26adc69d3b3f600b35e2e3
 MISC ChangeLog 2501 SHA256 8b483068dad30e16c43e2d41c6713410586a072f2cf70adceb31ac4fc6bc93d9 SHA512 b999eb8c4772ac62ff08e243cd2f02ad9a55aafb46a47bb0aebe9c3b08aa20bd4685a80fca9045dfa9b3c5568dcadae2eec654da4933b12820e4e319c79223f8 WHIRLPOOL cd8be5cf67681ddc8316400493539ca34e822cc090f84f1b0b6087ce00a06b96ce50cea73ed520851518a4e34f619caea4c79f59785dea9b5f636aac38fa1ac2
 MISC ChangeLog-2015 14132 SHA256 67e1f528533e2e3991608c8dce4e59fb4a0d95ef6b8b33d8326ff360c567c07f SHA512 b9e9637bd5fb661886d6197f64156210d83e00e8ccd0bb3d3353e1e6e236bbdd1e5934195d597cfca1422e70f91941c2e3a3e02b55d7096e6d808d8ea263679b WHIRLPOOL eb599106561e21713a5e630eca7e71cb2aa6119b2f2e8be357e2d3c062f1c8d8856d75bc900581976c5d9357f8f0fa5b54ce306ee06b7bc336565ab692e5956b
-MISC metadata.xml 448 SHA256 00183337dd107a48006a6bddfab78a18764b6e2ee8bf8f9f7af57e4e0d4301ed SHA512 ec3a30d414e66064cb7345123ea0762c89cf33b6cd61dd50a1ab330be22070d7fd0d76122ecbb3fbf094015feacf7b673fcbf19bbb027bfd4d15f715346d80d9 WHIRLPOOL b49c752f1e2bd0921dab328c0aca74f5c1af4f6bb06c25eaa6bae30cd80c49a30e53ec2bca960662757b81accc903c034be6468fa808f9e131ea48bd7862a063
+MISC metadata.xml 335 SHA256 ddb4ce2779f34a38af99fdabbae2b06226070d698aff9d6a51edcb8a5cd5b379 SHA512 215bd29dfc21273c0baaa99c68d373ed8166b40dcc02a19c283935061564036b7f23dba2ea2036556e3fa93689caf679bd535d4bc84517f0b804a55371c010b7 WHIRLPOOL dd14780f93e6b07020ae0e03edf9be06ba51f4a5ff6baff2c00cf91cad212b9d03ca2dd1fdca67450284ea31952bfe2156b75410f5f31070624953cbf08fc3f2
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index 3a1ad9f3f3f4..7a971df73744 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mr_bones_@gentoo.org</email>
-		<name>Michael Sterrett</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f2d586df35b4..ddb28c855fa8 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -7,7 +7,7 @@ DIST ImageMagick-7.0.7-6.tar.xz 8556160 SHA256 52ae1acad9cfbba871b9d3cf033235067
 DIST ImageMagick-7.0.7-8.tar.xz 8797060 SHA256 547826f95a23ad3a1a6a514c0bff16ae875f6b7211809dff566e5994f65a0313 SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2 WHIRLPOOL 13a6baf033b4caa0543fa36e4d91d82dc03b7875582e63a0803f152796041870b798ee8fdb0a923b6da08836fd7f1be5faffe36cf5e3241cb8154c3287ce294d
 EBUILD imagemagick-6.9.9.0.ebuild 5158 SHA256 4822fa883719ae3c6bb7d9e0056326f7a4970483c617c1becb7db7fac2068f7d SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c WHIRLPOOL 6e34e09dffaeaa9da599cc2b3536f16a455c6dd0fc872ff3ac7b8b07040ca77f487bdb7d09d54992356584bfc7203c7124952dbf7467f46f9fff2620bae82abb
 EBUILD imagemagick-6.9.9.18.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
-EBUILD imagemagick-6.9.9.20.ebuild 5121 SHA256 eeb95a45207132d1e5e053257ae6fe19d72fe9f71c7f3ed5751f845829f1d5b4 SHA512 fa91aa9cdd96721a7c42abac41840b95058c1984ad66d55189a8dca1a412d3572a1f551557775369c915794c38c66c60e8c1c8080e846ed9db513b9711f1d464 WHIRLPOOL 50ace3d355af67d79f8e2997a39b807c1dfca6e339c1dead14afe5c7f77aebb7bb7808593e123eca8e67264ff285c945edd8782f62e2ae480c8cb61f77fe20d4
+EBUILD imagemagick-6.9.9.20.ebuild 5120 SHA256 c2100c94a507c71e318a74bde7dc998ddebbdfe786dd7df7bb8030f0083cbb10 SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422 WHIRLPOOL 74f256be3de10020890fb1581e6d56866b4c97f21eaec9c7e9e7615f2721943f108e504076937f6ec342cd305b19072f27cceebd5bd8b03250968c51f28e06fb
 EBUILD imagemagick-6.9.9.9.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
 EBUILD imagemagick-7.0.6.9.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
 EBUILD imagemagick-7.0.7.6.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
index 3ab93cf18a42..acace20a0871 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index dafef5c3a2a8..3ef969642871 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,5 @@
 DIST kphotoalbum-5.2.tar.xz 9549504 SHA256 9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89 SHA512 a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548 WHIRLPOOL 0747045ef07eb9afb540ea6978db15b783d4db21ba4a9c63d9a7b5e0a823aafe71bc2bcec9d7d6831df188a297083ed2a85c52c71d555f8ff8f2e144cca194a9
-EBUILD kphotoalbum-5.2.ebuild 1677 SHA256 ffccc44c2283f4db86b2dbcfd7eaede7bb55a29ffce1712c8683064de40a313b SHA512 76ed868e2bc8d20e97bc8313c030ff73bba7783ef88fe97026988ff12d34526415a7bef9548568c6c212d799bf257cdf59ae704023635049c91435547eab219c WHIRLPOOL aabe9ec6337de525da170de3d7a335e2cc279b1eb33abac2b287af5e542fdd2a8f8219ae2b734773a403d9cb3ff9657e8ab5997e74b9467ab8c50448aa22d6c4
+EBUILD kphotoalbum-5.2.ebuild 1628 SHA256 5073b645d1158142a37a77a7026b1592fe8d315b1862eb9625ab9df8ff6203d9 SHA512 2c79fb27977390bdea7ae9ee8622be9d287b627849ded59e2afa8bff9f86e9622fcf34ef96d24ab31a5803ff1f2d4ac6a7a4bb19160659e443cc48073ad3cb86 WHIRLPOOL 2f6f3c7da706b6cc198411367822dbdae72e259c4e777ede440677e4934c1af5fee1e5b777f3b86220eaa9bf68a238f3836e83304ccf91495be7ae574228156a
 MISC ChangeLog 6031 SHA256 0d714cefae4191e24bc162e29a4fceaab16af2135e334ef95b1d4d9e89055414 SHA512 24af1db598e77c1bbe683c6e89a708a577df21d436ee2518915f4a227803fa3505c5221b5cab51ee82ba2a0625658b9727950b93a9a8b0cfb6635a4516208184 WHIRLPOOL c960f7f5946f97496a163ee97b1a3516748cce91b67ac30974fe1c9bb188c4c8c7b3426e449204d125865ab282c416b1e4166131b9ef62bdf7f9f2d6cbd8c457
 MISC ChangeLog-2015 12061 SHA256 a0717c84b7d9f7ae46d500d3afb96f3a4cdd893cc1795027e7d2bcc6f625a127 SHA512 4758d51ca2c0bb40da32b4ab0cf2107f44b69c09bf5e148c46d3f33e8521af6b84111562eeba259aa47efa33ff55a9b087200e457ddd44280066624a44a43c32 WHIRLPOOL a92b466541c2f98b12c4eb23a93ae9b2a713c9acee4e453c33447a10884958cada0822e896fc58abe8a09e308fbaf82315dc224ae659af0f131f3a4416eda402
-MISC metadata.xml 524 SHA256 63ab50b327fca4ad25ef498bdbfc6143c34fb932a39517662fbe158d3808e38b SHA512 052a4374ed0dd9f0f577b0632370385d8c7d313b3d50ae4eb69052058ba26a09856f85174f7c9c6447ba1a7ef13b5ae1909ceba88f7293aeabd78f60eb69e741 WHIRLPOOL affc768fd1232d1289b7aa058df961e6df183150505f51b97068bd9ca2647482cc5a40074aa26621bcdd4ba0b9d16083b145e04f083506597f5101aa9cf71e69
+MISC metadata.xml 424 SHA256 9da51a4d2f688dca21958d21560bde481bdf3fc50981090c9d10c65ade4cdc35 SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca WHIRLPOOL fc177589feebd469c3d36e093aefc6c62228bfe03c0582573b2bd219dc64198acfcf98f7328d8936805c1787c307437f4822908d5888fd5c6d34e31836db519d
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index eee7ec2bb485..b251424a6ca1 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
 KEYWORDS="amd64 x86"
-IUSE="face +kipi +map +raw"
+IUSE="+kipi +map +raw"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -37,7 +37,6 @@ COMMON_DEPEND="
 	media-gfx/exiv2:=
 	media-libs/phonon[qt5(+)]
 	virtual/jpeg:0
-	face? ( $(add_kdeapps_dep libkface) )
 	kipi? ( $(add_kdeapps_dep libkipi) )
 	map? ( $(add_kdeapps_dep libkgeomap) )
 	raw? ( $(add_kdeapps_dep libkdcraw) )
@@ -56,7 +55,7 @@ DOCS=( ChangeLog README )
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PLAYGROUND=ON
-		$(cmake-utils_use_find_package face KF5KFace)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KFace=ON
 		$(cmake-utils_use_find_package kipi KF5Kipi)
 		$(cmake-utils_use_find_package map KF5KGeoMap)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 22ab0f0e1eff..2a675ce364ee 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="face">Enable face detection and recognition using <pkg>kde-apps/libkface</pkg></flag>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
 		<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
 	</use>
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index e439a8d755b8..e3495b151bd5 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,6 @@
+DIST pqiv-2.10.1.tar.gz 138129 SHA256 8f24ff072c17201703f68f139d31d82e239001b9612be4ad09c31e495372468d SHA512 9850f6693e7fd2942d105736a7d6a274388875770e194ac6bd8a5a8291db8fec1ee3a0262f911f2b8e5d115aa11d520c44d80cc8218e2c87d6935dea4dfcb97e WHIRLPOOL 904e53c204ed301fe250150a6d32f542d61a1ad0719dc128527e91a072004240510ee301e2385889c83f96e642d407a28b74465e510b0bbea0faa3171822f972
 DIST pqiv-2.9.tar.gz 133823 SHA256 e57298ae7123bd6b01b751f6ef2d7a7853e731a3271b50095683442a406da99c SHA512 0a509d5d4b41682f86f4b813d63f3f7f8f3977ede0b8b1649a2adc188ed83923147b8bb741ba7f85b4c1dd7a9612fca3fec44169364042be4db44ef53d813ab7 WHIRLPOOL e40e4aab7b4df92cc7bed911531be4e84062196ca1fdae867b05da38f28c448a34475a31865275f0d38f3efedf1f07af42f305fcb6621a16a73f7050cb327652
+EBUILD pqiv-2.10.1.ebuild 1801 SHA256 a7d06ef805c230065decf1b520d3cdd8b08cb28f2690ff734c1ffc48f955e00e SHA512 626d80674d7314ca9fdd8ff9e2da9e4282ccfc7d82c7686618bb2342035072106e4e8102dd12d82802eb46ab5af97595d39131f8c4c0471c69ae8f01c5b13b9a WHIRLPOOL 45d49d8e34f9391d23891ad7495dc9e140254e1df6326529d5d1651e7973ff14d4143e123b2b20527fa429a8d3b2e254f784ac2a13154c6795ab1df960f3a9de
 EBUILD pqiv-2.9.ebuild 1798 SHA256 ff4e3f73b73fa75cd0616c514c6090a115c16d4ace3b95ca23646b6061925d9c SHA512 1285d38a37bce7f5670f7e39136a834b60af8c71db12bf84a962636ca9da5c27e162fe71e243f9c30689f2f2eba5277c121305d8e4f11f50fddcf635a60dfae9 WHIRLPOOL 3816ba0dafeefc878cfce1db8f90e5d6d85ca69f6ca90d195e173f41263c8ba2f56dc5a5d4fa121d0c04df84501ac78d566f5e413593a282b850743b7416854d
 EBUILD pqiv-9999.ebuild 1800 SHA256 e1a23c600db43fc1573ac75b1fffc3ffc4dd13da7d385aafd1d2242209cad62b SHA512 33ddac017e8c65c6df0b91ee20483a8bb486031c306e992593fb72f60740f8ad832eb8b8200aa52f89d9467dedf652bcebfdec5cd70a6063a25f5962c468288a WHIRLPOOL 75d39744d940eb1d7397d97726f1b70782dfbc3249ec6d0c4628b7e2326244d7bfe3980b305d60502b39bb9072358d17b6a781adab25622a2a01c43827713b88
 MISC ChangeLog 2992 SHA256 41b025840c651ea0cf8c1f5d2e69867a40a858bc46ebe7692a03fcab32375f90 SHA512 e53bfc47eeb14806238b1ba22a4f3e3be0f195c413314659527b6448162405ba00ea120e6e9c6efbf8a614d7aebd74f62f40cfa142f91663ff21de3721c1d5dc WHIRLPOOL 878dbe91eebcbb9f4548475b6c24edd1df73d4a8adb63517c3c95d69de2d0178375f762da42746b2172bc212f708f5c1cc1240d4a7192e4e577b8151026300b4
diff --git a/media-gfx/pqiv/pqiv-2.10.1.ebuild b/media-gfx/pqiv/pqiv-2.10.1.ebuild
new file mode 100644
index 000000000000..68f387141219
--- /dev/null
+++ b/media-gfx/pqiv/pqiv-2.10.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info toolchain-funcs xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/phillipberndt/pqiv.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
+HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.6
+	x11-libs/gtk+:3
+	archive? ( app-arch/libarchive:0= )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	imagemagick? ( media-gfx/imagemagick:0= )
+	pdf? ( app-text/poppler:0= )
+	postscript? ( app-text/libspectre:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local backends="gdkpixbuf"
+	use archive && backends+=",archive,archive_cbx"
+	use ffmpeg || use libav && backends+=",libav"
+	use imagemagick && backends+=",wand"
+	use pdf && backends+=",poppler"
+	use postscript && backends+=",spectre"
+	use webp && backends+=",webp"
+
+	doecho ./configure \
+		--backends-build=shared \
+		--backends=${backends} \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--destdir="${ED}"
+}
+
+src_compile() {
+	tc-export CC
+	emake VERBOSE=1 CFLAGS="${CFLAGS}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index b230d32cf9e9..45187745b9fd 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -9,7 +9,7 @@ AUX saned_at.service 434 SHA256 4892a381f3bc05679c4b20307046cf37c22bc2a17b141cb7
 DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711
 DIST sane-backends-1.0.27.tar.gz 6430188 SHA256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 WHIRLPOOL 62ac1f4d4601bb2189212f021c23a48067ebdb5d900c2259ae4acdb6f94292c20689d9889bb11861b78be5ea7c3f76e815154e032f4bda76efcf901a97895cdd
 EBUILD sane-backends-1.0.25-r1.ebuild 7883 SHA256 31a194a93efa46cbcfd597e3f4ec28298230b5bdfc69c6942698a4ab63ba3b78 SHA512 2f201d80d12b5138f979b23932101eee82b9379b3110265b02dc8cb2664b9ce803ea774f4278aa52f65a3cb8c3261dcae50183ddf1e2c64be5a79e5209d154f3 WHIRLPOOL ead801902f9f94b9717be3aa45e50727fa8a0823257fadae3fa8e54c586cb7d47689e26a380cba0f800cf7ff558e1c2f3972df7ab6965fe1d0cff9829e18231c
-EBUILD sane-backends-1.0.27.ebuild 7915 SHA256 e5c9dd6213982b632b9ca05b9ef1d7ba52e02e209c8f42ec6d0bfd0479200310 SHA512 f0868652b03b806763319d08e18ad283e7a642b874362cd910f263ddbdafc3fbb75f73a4c540d034b98f4ca4693e8bde0ff7a2afb24a400f1d5ebe93c5da10a8 WHIRLPOOL 7b37383035399674433359ba5287ad4815e644b86cb9e8ddbfff212f5930567b191dac0597aba2c94ee50c4a8f4f14870932e45f69a66b022150c4618fe90608
+EBUILD sane-backends-1.0.27.ebuild 7914 SHA256 e3f1ad03957b0634c2b9d30261a3c6cbf8aeb2895ac6c2d9a99303d2eb064b6d SHA512 0cbf7702c01736c43cdbef099e2b51fdff5482db3494f0df42e0e6bcee19729026b4654e05a6bf4f6586a75630b45fe11a8c44f3f672ca1257c2f32bd0f3d7d2 WHIRLPOOL 86d6e20f0c924f2da60d31339cc7f1d7609362549f869492678a516b1eeb84ad891dcf736dd0972f863efccd5d4ba24ad5612de44d5990a4d1c688f5a5282dcd
 MISC ChangeLog 5821 SHA256 fa6f96e052c8dfd3e34b0a775e9a2604c9f4b45bb3b2200c40f151e65a467773 SHA512 c8085e7371914acdca025efe83cf25226c32dc58213362b5292cfb54a36a7a8a3e91b196dbffacb5f7d3e886ac006da977a44cd697174dc747abdc8a4b6893ea WHIRLPOOL ebbe0fe42598e339f80cff820d7480be897f0311a5724d8aa7851c1f2b3e24191f35b10faf94d072b57016cb0d558353527202db56629fba288a0deb364ce38d
 MISC ChangeLog-2015 47640 SHA256 c6257e3d197ffa048e4c1e7f01ba4a2516965237fb15dcee476cc914573d3114 SHA512 fbc5f5ca0c8e3c0ad1f2ec241c13dbd5a17d42bd8fd38541f1fccd2effa6e858a996fb4758dbe9a8afefb7586df42094d78de936f22986d5138fbf20241a9e37 WHIRLPOOL ad673ba6b449c6cf6f93cf536fb8fdc8230a24d61048430f9c65bfb1a0b61ecc09543f846b0a838734034a383fd3f190af580175a507802c3fac067f6c88ec20
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
index af5b6083c411..76f70f9768c2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
@@ -137,7 +137,7 @@ esac
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 if [[ ${PV} != "9999" ]] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="