gentoo resync : 20.11.2017

9 files changed, 2 insertions, 437 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