[gentoo-commits] proj/musl:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/

[Aric Belsito]

commit:     b12c8f26c18cd4e88be389be4a801df424da51c8
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec  5 21:22:58 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Dec  5 21:22:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b12c8f26

media-gfx/exiv2: version bump to 0.26_p20171104-r1

 media-gfx/exiv2/Manifest                           |  3 +-
 ...25-r2.ebuild => exiv2-0.26_p20171104-r1.ebuild} | 76 ++++++++---------
 media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch    | 71 ----------------
 .../exiv2/files/exiv2-0.25-fix-install-dirs.patch  | 64 --------------
 .../exiv2/files/exiv2-0.25-fix-without-zlib.patch  | 22 -----
 .../files/exiv2-0.25-fvisibility-hidden.patch      | 19 -----
 .../exiv2/files/exiv2-0.25-hide-symbols.patch      | 97 ----------------------
 media-gfx/exiv2/files/exiv2-0.25-musl.patch        | 12 ---
 .../exiv2/files/exiv2-0.25-tools-optional.patch    | 27 ------
 .../exiv2/files/exiv2-0.26-pentaxnikon-crash.patch | 52 ++++++++++++
 10 files changed, 92 insertions(+), 351 deletions(-)

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index f37e023..a9b1bd7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-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
+DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474

diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
similarity index 59%
rename from media-gfx/exiv2/exiv2-0.25-r2.ebuild
rename to media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
index 8b34d48..e002cd0 100644
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
@@ -1,20 +1,27 @@
 # 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} )
+EAPI=6
 
-inherit eutils cmake-multilib python-any-r1
+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=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"
+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="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})"
+SLOT="0/26"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
 
 RDEPEND="
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -26,14 +33,13 @@ RDEPEND="
 	)
 	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
 "
-
 DEPEND="${RDEPEND}
 	doc? (
+		${PYTHON_DEPS}
 		app-doc/doxygen
 		dev-libs/libxslt
-		virtual/pkgconfig
 		media-gfx/graphviz
-		${PYTHON_DEPS}
+		virtual/pkgconfig
 	)
 	nls? ( sys-devel/gettext )
 "
@@ -41,14 +47,11 @@ DEPEND="${RDEPEND}
 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"
-	"${FILESDIR}/${PN}-0.25-musl.patch"
 	# TODO: Take to upstream
-	"${FILESDIR}/${PN}-0.25-fix-docs.patch"
-	"${FILESDIR}/${PN}-0.25-tools-optional.patch"
+	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
+	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
+	"${FILESDIR}"/${PN}-0.26-pentaxnikon-crash.patch
+	"${FILESDIR}"/${PN}-0.26-musl.patch
 )
 
 pkg_setup() {
@@ -56,14 +59,17 @@ 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
+			local lang
 			for lang in *.po; do
-				if ! has ${lang%.po} ${LINGUAS} ; then
-					rm -rf ${lang} || die
+				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+					case ${lang} in
+						CMakeLists.txt | \
+						${PN}.pot)      ;;
+						*) rm -r ${lang} || die ;;
+					esac
 				fi
 			done
 			popd > /dev/null || die
@@ -72,13 +78,10 @@ src_prepare() {
 		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
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
 	if use doc; then
 		einfo "Updating doxygen config"
@@ -90,17 +93,16 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DEXIV2_ENABLE_BUILD_PO=YES
 		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-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)
 		-DEXIV2_ENABLE_LIBXMP=NO
-		$(multilib_is_native_abi || \
-			echo -DEXIV2_ENABLE_TOOLS=NO)
+		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
 	)
 
 	cmake-utils_src_configure
@@ -115,11 +117,11 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
 
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dodoc -r "${S}"/doc/html
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
 
 	if use examples; then
 		docinto examples

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 e2bf677..0000000
--- 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 bca79dd..0000000
--- 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 c6d435d..0000000
--- 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 26c5c1d..0000000
--- 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 7c8613d..0000000
--- 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-musl.patch b/media-gfx/exiv2/files/exiv2-0.25-musl.patch
deleted file mode 100644
index a44e255..0000000
--- a/media-gfx/exiv2/files/exiv2-0.25-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/futils.cpp	2016-06-01 18:29:06.629998810 -0500
-+++ b/src/futils.cpp	2016-06-01 18:29:22.209998806 -0500
-@@ -332,8 +332,7 @@
-         std::ostringstream os;
- #ifdef EXV_HAVE_STRERROR_R
-         const size_t n = 1024;
--// _GNU_SOURCE: See Debian bug #485135
--# if defined EXV_STRERROR_R_CHAR_P && defined _GNU_SOURCE
-+# if defined EXV_STRERROR_R_CHAR_P && defined __GLIBC__
-         char *buf = 0;
-         char buf2[n];
-         std::memset(buf2, 0x0, n)

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 2bb030a..0000000
--- 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/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
new file mode 100644
index 0000000..a66af8d
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
@@ -0,0 +1,52 @@
+From 2dc166b04ca6152d01bff6627a332e89ddef24d1 Mon Sep 17 00:00:00 2001
+From: clanmills <robin@×××××××××.com>
+Date: Tue, 12 Sep 2017 09:14:42 +0100
+Subject: [PATCH 1/2] Fix http://dev.exiv2.org/issues/1305
+
+---
+ src/pentaxmn.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
+index 4fc38be0..b22cb43b 100644
+--- a/src/pentaxmn.cpp
++++ b/src/pentaxmn.cpp
+@@ -1167,6 +1167,8 @@ namespace Exiv2 {
+ 
+     std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata)
+     {
++        if ( ! metadata ) return os << "undefined" ;
++
+         ExifData::const_iterator dateIt = metadata->findKey(
+                 ExifKey("Exif.PentaxDng.Date"));
+         if (dateIt == metadata->end()) {
+-- 
+2.13.6
+
+
+From 3bc0b91bcecefdad531129b1a934be1251021c95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= <mn@××××××.lv>
+Date: Mon, 18 Sep 2017 23:37:40 +0300
+Subject: [PATCH 2/2] Fix crash on undefined metadata on some Nikon images.
+ Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
+
+---
+ src/nikonmn.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
+index 571ab806..34bf601c 100644
+--- a/src/nikonmn.cpp
++++ b/src/nikonmn.cpp
+@@ -299,6 +299,8 @@ namespace Exiv2 {
+                                                const Value& value,
+                                                const ExifData* exifData)
+     {
++        if ( ! exifData ) return os << "undefined" ;
++
+         if ( value.count() >= 9 ) {
+             ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian;
+             byte      p[4];
+-- 
+2.13.6
+