From 77be078f05083c774eb0194c89ae2830a9d7931a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 13 Oct 2017 10:47:24 +0200 Subject: media-gfx/exiv2: Drop 0.26 Package-Manager: Portage-2.3.11, Repoman-2.3.3 --- media-gfx/exiv2/Manifest | 1 - media-gfx/exiv2/exiv2-0.26.ebuild | 133 --------------------- .../exiv2/files/exiv2-0.26-CVE-2017-9239.patch | 22 ---- media-gfx/exiv2/files/exiv2-0.26-cmake1.patch | 22 ---- media-gfx/exiv2/files/exiv2-0.26-cmake2.patch | 65 ---------- media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | 53 -------- media-gfx/exiv2/files/exiv2-0.26-cmake4.patch | 24 ---- media-gfx/exiv2/files/exiv2-0.26-cmake5.patch | 33 ----- media-gfx/exiv2/files/exiv2-0.26-cmake6.patch | 27 ----- media-gfx/exiv2/files/exiv2-0.26-cmake7.patch | 38 ------ media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 70 ----------- .../exiv2/files/exiv2-0.26-tools-optional.patch | 27 ----- 12 files changed, 515 deletions(-) delete mode 100644 media-gfx/exiv2/exiv2-0.26.ebuild delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake1.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake2.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake3.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake4.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake5.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake6.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-cmake7.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch (limited to 'media-gfx/exiv2') diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 1cfa3b2b873b..d2ca2261e265 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,3 +1,2 @@ DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac -DIST exiv2-0.26-trunk.tar.gz 5699163 SHA256 0c625cbeb494aa1b9221280a5b053b54d0c9720d48fa9120cef7c6f93efd4dc3 SHA512 d9f354f8458d7803140b442b2a8de3c8904b1e20916cf62d7176f51524e6ff7def26d3b6fa016abc49f8140295eea624151c54dbae0676a61529c2cf33335b0c WHIRLPOOL 0d36063ee659d0a798957e9a2478337f5e8061b467df8fb86b194830ac6ec751a75e1492ad7cbf4ed31c836b9c320f037af3708920b28b07c8970840e255d711 DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe diff --git a/media-gfx/exiv2/exiv2-0.26.ebuild b/media-gfx/exiv2/exiv2-0.26.ebuild deleted file mode 100644 index c63f2a26e986..000000000000 --- a/media-gfx/exiv2/exiv2-0.26.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit 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/builds/${P}-trunk.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_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 - media-gfx/graphviz - virtual/pkgconfig - ${PYTHON_DEPS} - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README doc/ChangeLog doc/cmd.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-cmake{1,2,3,4,5,6,7}.patch - "${FILESDIR}"/${P}-CVE-2017-9239.patch - # TODO: Take to upstream - "${FILESDIR}"/${P}-fix-docs.patch - "${FILESDIR}"/${P}-tools-optional.patch -) - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_unpack() { - # FIXME @upstream: MacOS cruft is breaking the buildsystem, so don't let it in... - tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null || - elog "${my_tar}: tar extract command failed at least partially - continuing" - mv "${PN}-trunk" "${S}" || die "Failed to create source dir ${S}" -} - -src_prepare() { - if [[ ${PV} != *9999 ]] ; then - if [[ -d po ]] ; then - pushd po > /dev/null || die - local lang - for lang in *.po; do - 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 - else - die "Failed to prepare LINGUAS - po directory moved?" - fi - fi - - # 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" - 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_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) - ) - - 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() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - use doc && HTML_DOCS=( "${S}"/doc/html/. ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch b/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch deleted file mode 100644 index 2a3e20c9fac2..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2f8681e120d277e418941c4361c83b5028f67fd8 Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Sat, 27 May 2017 10:18:17 +0100 -Subject: [PATCH] #1296 Fix submitted. - ---- - src/tiffcomposite.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp -index c6b860d8..0c9b9c4a 100644 ---- a/src/tiffcomposite.cpp -+++ b/src/tiffcomposite.cpp -@@ -1611,6 +1611,8 @@ namespace Exiv2 { - uint32_t TiffImageEntry::doWriteImage(IoWrapper& ioWrapper, - ByteOrder /*byteOrder*/) const - { -+ if ( !pValue() ) throw Error(21); // #1296 -+ - uint32_t len = pValue()->sizeDataArea(); - if (len > 0) { - #ifdef DEBUG diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch deleted file mode 100644 index 672017e404b6..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d5ae1a7502cc3a19f2ca45f5f17f1ee8fc6ad979 Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Tue, 30 May 2017 20:25:28 +0200 -Subject: [PATCH] Use CMAKE_INSTALL_LOCALEDIR - ---- - config/CMakeChecks.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index 77922930..b3a888f2 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -98,7 +98,7 @@ IF( EXIV2_ENABLE_NLS ) - #FIND_PACKAGE(Intl REQUIRED) - #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) - IF( NOT LOCALEDIR ) -- SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" ) -+ SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) - IF( WIN32 ) - STRING( REPLACE "/" "\\\\" LOCALEDIR ${LOCALEDIR} ) - ENDIF( WIN32 ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch deleted file mode 100644 index 76a194424866..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3af0d1a6b2c12b7f62a293d19bdf235db75d6b07 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 3 Jun 2017 17:18:24 +0200 -Subject: [PATCH] cmake: fix gettext support - -Building exiv2 with uclibc and gettext fails currently as detected -by the buildroot autobuilders: -http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log ---- - config/CMakeChecks.txt | 12 ++++++++++-- - src/CMakeLists.txt | 6 +++--- - 2 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index b3a888f2..f7621a92 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -95,8 +95,16 @@ ELSE( EXIV2_ENABLE_SHARED ) - ENDIF( EXIV2_ENABLE_SHARED ) - - IF( EXIV2_ENABLE_NLS ) -- #FIND_PACKAGE(Intl REQUIRED) -- #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -+ FIND_PACKAGE(Intl) -+ if(Intl_FOUND) -+ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -+ find_library(LIBINTL_LIBRARY NAMES intl libintl) -+ if(libintl_FOUND) -+ SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) -+ else(libintl_FOUND) -+ SET(LIBINTL_LIBRARIES) -+ endif() -+ endif() - IF( NOT LOCALEDIR ) - SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) - IF( WIN32 ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index aecd6215..e2904c6f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -316,13 +316,13 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME}) - # ****************************************************************************** - # exiv2 application - ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) --TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) -+TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) - INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) - - # ****************************************************************************** - # connection test application - ADD_EXECUTABLE( conntest ${CONNTEST} ) --TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) -+TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} ) - - # ****************************************************************************** - # exifprint application -@@ -332,7 +332,7 @@ TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH - # ****************************************************************************** - # remotetest application - ADD_EXECUTABLE( remotetest ${REMOTETEST} ) --TARGET_LINK_LIBRARIES( remotetest exiv2lib ) -+TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} ) - - # ****************************************************************************** - # Headers diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch deleted file mode 100644 index 7a78d1c8bd86..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8af901ce05aeeaa4f5033da99670091f857d5931 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 3 Jun 2017 18:25:05 +0200 -Subject: [PATCH] cmake: always depend on threads, not only in the xmp case - ---- - CMakeLists.txt | 1 - - config/CMakeChecks.txt | 2 ++ - src/CMakeLists.txt | 2 ++ - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7034bb67..64604c6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP ) - IF (NOT MINGW) - set(THREADS_PREFER_PTHREAD_FLAG ON) - ENDIF() -- find_package(Threads REQUIRED) - ENDIF( EXIV2_ENABLE_XMP ) - - INCLUDE( config/CMakeChecks.txt ) -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index f7621a92..0dfe96b7 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -51,6 +51,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_C - LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) - SET( CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ) - -+find_package(Threads REQUIRED) -+ - IF( EXIV2_ENABLE_PNG ) - FIND_PACKAGE( ZLIB REQUIRED ) - INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e2904c6f..dcfb37e1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -268,10 +268,12 @@ else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} ) - else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} ) - endif() - endif() - diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch deleted file mode 100644 index 3824a5740005..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 23ac3eeced6a4de0d34ae162ac7784ab9b7e4310 Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Sat, 3 Jun 2017 20:58:08 +0100 -Subject: [PATCH] #7 Fix for libintl - ---- - config/CMakeChecks.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index 0dfe96b7..8c88aa27 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -103,8 +103,8 @@ IF( EXIV2_ENABLE_NLS ) - find_library(LIBINTL_LIBRARY NAMES intl libintl) - if(libintl_FOUND) - SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) -- else(libintl_FOUND) -- SET(LIBINTL_LIBRARIES) -+ else() -+ SET(LIBINTL_LIBRARIES -lintl) - endif() - endif() - IF( NOT LOCALEDIR ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch deleted file mode 100644 index 0df4a19689fb..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4e86c1d61c4b8ab2cbbb31db0031b8e1d1872231 Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Sun, 4 Jun 2017 07:41:03 +0100 -Subject: [PATCH] Fix https://github.com/Exiv2/exiv2/pull/6 for - Linux/Cygwin/MacOSX - ---- - config/CMakeChecks.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index 8c88aa27..e6100c0f 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -98,13 +98,16 @@ ENDIF( EXIV2_ENABLE_SHARED ) - - IF( EXIV2_ENABLE_NLS ) - FIND_PACKAGE(Intl) -- if(Intl_FOUND) -+ if(Intl_FOUND AND NOT MSVC) - INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) - find_library(LIBINTL_LIBRARY NAMES intl libintl) - if(libintl_FOUND) - SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) - else() -- SET(LIBINTL_LIBRARIES -lintl) -+ SET(LIBINTL_LIBRARIES) -+ if ( APPLE OR CYGWIN ) -+ SET(LIBINTL_LIBRARIES -lintl) -+ endif() - endif() - endif() - IF( NOT LOCALEDIR ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch deleted file mode 100644 index 105b5889fea6..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 88cf58613ffde4c907011bea82f61daae6006c3c Mon Sep 17 00:00:00 2001 -From: clanmills -Date: Sun, 4 Jun 2017 09:07:14 +0100 -Subject: [PATCH] #8 Adding INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) - ---- - config/CMakeChecks.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index e6100c0f..b90d4fde 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -102,11 +102,12 @@ IF( EXIV2_ENABLE_NLS ) - INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) - find_library(LIBINTL_LIBRARY NAMES intl libintl) - if(libintl_FOUND) -+ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) - SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) - else() - SET(LIBINTL_LIBRARIES) - if ( APPLE OR CYGWIN ) -- SET(LIBINTL_LIBRARIES -lintl) -+ SET(LIBINTL_LIBRARIES -lintl) - endif() - endif() - endif() diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch deleted file mode 100644 index 0eff32a80d57..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 15e0b9052eacd3438c8b39bf3fdda5da69ec068a Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 4 Jun 2017 10:13:14 +0200 -Subject: [PATCH] cmake: simplify libintl check - -According to https://cmake.org/cmake/help/v3.4/module/FindIntl.html -the FindIntl module already checks for libintl.so. ---- - config/CMakeChecks.txt | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index b90d4fde..0cd28ec7 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -98,18 +98,11 @@ ENDIF( EXIV2_ENABLE_SHARED ) - - IF( EXIV2_ENABLE_NLS ) - FIND_PACKAGE(Intl) -- if(Intl_FOUND AND NOT MSVC) -+ if(Intl_FOUND) - INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -- find_library(LIBINTL_LIBRARY NAMES intl libintl) -- if(libintl_FOUND) -- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) -- else() -- SET(LIBINTL_LIBRARIES) -- if ( APPLE OR CYGWIN ) -- SET(LIBINTL_LIBRARIES -lintl) -- endif() -- endif() -+ SET(LIBINTL_LIBRARIES ${Intl_LIBRARIES}) -+ else() -+ SET(LIBINTL_LIBRARIES) - endif() - IF( NOT LOCALEDIR ) - SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch deleted file mode 100644 index a88867173df7..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch +++ /dev/null @@ -1,70 +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 -@@ -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/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch deleted file mode 100644 index 045e9dc58f03..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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,9 +317,11 @@ - - # ****************************************************************************** - # exiv2 application --ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) --TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) --INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) -+IF(EXIV2_ENABLE_TOOLS) -+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) -+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) -+ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) -+ENDIF( EXIV2_ENABLE_TOOLS ) - - # ****************************************************************************** - # connection test application -- cgit v1.2.3-65-gdbad