gentoo resync : 02.08.2019

4 files changed, 2 insertions, 235 deletions

diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index fb26992233a7..1f7dd8536746 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,6 +1,3 @@
-AUX libkexiv2-18.12.0-exiv2-0.27.patch 7827 BLAKE2B b16eef536dd2517a62de9561bf810cc2b2c404baa6b6c17750bba4f1880b1615cfaa0301983a009654bbcc8cc7b6f19704992e5a7dcb4151f266e6b83b4d38c4 SHA512 aa23336c5667c9bb6610e5c88f713c14f5aae187526faf1e65f92e5258faf50d6f7926b1b0b6deeed9874cc024061a0adae0ff6f4896ede1495678cadd9b368f
-DIST libkexiv2-18.12.3.tar.xz 64524 BLAKE2B d3b97e338021e2705ade94383054651c3ce2a8c08682f702f44b3cfdbf348487fcbfebc20854008854bdd844e5c6433d640f4c76be7e71cbae69884f3aa22f38 SHA512 ce2bab29a1059e4be498472b2713e813c8eb5ace4cd928eeff3c6e50a656afda651a57a3877d9388163096e575c897f4f84eee914db101cb8dcd1eb614242898
 DIST libkexiv2-19.04.3.tar.xz 64144 BLAKE2B d02da0630c062f599f9d467ae3b866126175f0034bac978badbf17849102f36f661ac02060d9037fbe038529c32e62867f44f55d5ca9b8ec12c5eea14a281023 SHA512 9e59a9c4d5975bf1744cf5ee8ec65ff1e81fd60a338025debb4d0e1670bd9c4c2d42043e0ce5497770024ef08a169861d7c2b509a274c5aa8722783b49abf525
-EBUILD libkexiv2-18.12.3.ebuild 398 BLAKE2B 3ca64b666ff3f7db3e3e80053b29378f180b29bb340fdb897a3e88cb4c6e46356c4c0e35639392bf8b5ed4a4f45cda39f0b41e930db04e21b914d20dc4d93307 SHA512 ba8e181b100e4a828e31cc1ad1d4730deb185a03ce5f0ffe79e01de60b1a480c77665ee63df0ecccfbffb40b813db06022c1a754fbf9045a3e34fb4609d9df60
-EBUILD libkexiv2-19.04.3.ebuild 314 BLAKE2B 52f7078a8755e4bc423466b756470e94267f513db380604e23614b8134a3cbcbd66e8d77ceeff74b2189fa8620160574195b64c195e58346f8b52157981e729b SHA512 5ac1808a850f335a1dd5a374cb1f354bc096879062c14e19c497e6532c88f3f2373dae9eb73540213d0e056b96e034298b7a2f0526909217a4520e45b28cfb55
+EBUILD libkexiv2-19.04.3.ebuild 311 BLAKE2B 3bc9060b47e14179d456f643bfbae1f917a3fffedb88299332ec7e59de4aa82580a187258a4feece07c8228388b6650a1d44408398a7143c4c6b75e7dfc30435 SHA512 3bb8ee26e2a8fd0886e3fa66efce40ba9e9705d30b8451168c098a0732d3fab177398c076eb89842399ffa8053b6f027f8bc6978d6428a214b3b16c5a7b83c63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch b/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch
deleted file mode 100644
index 176fcb3ba123..000000000000
--- a/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 3b697b880877c29cd865f101bddca6ce21bf8953 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 27 Dec 2018 01:05:17 +0100
-Subject: [PATCH] Fix building against exiv2-0.27
-
-Summary:
-Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
-
-Test Plan: Tested build with exiv2-0.26 and 0.27
-
-Reviewers: #kde_applications, cgilles
-
-Subscribers: heikobecker
-
-Differential Revision: https://phabricator.kde.org/D17799
----
- CMakeLists.txt                        |  30 ++-----
- cmake/templates/libkexiv2.pc.cmake.in |   2 +-
- src/CMakeLists.txt                    |   3 +-
- src/kexiv2.cpp                        |   2 +-
- src/kexiv2_p.cpp                      |  17 +---
- src/kexiv2_p.h                        |   1 +
- src/kexiv2exif.cpp                    |   4 +
- 7 files changed, 136 insertions(+), 118 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d13ef27..e9cd06e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(EXIV2_MIN_VERSION   "0.24")
- 
- cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION})
- 
--project(libkexiv2)
-+project(libkexiv2 VERSION "5.0.0")
- 
- message(STATUS "----------------------------------------------------------------------------------")
- message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
-@@ -47,18 +47,12 @@ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
- # 2.4.0 => 11.3.0                              - Add new method to access on text edit widget from AltLangStrEdit
- # 5.0.0 => 15.0.0    (Released with KDE 5.x)
- 
--# Library API version
--set(KEXIV2_LIB_MAJOR_VERSION "5")
--set(KEXIV2_LIB_MINOR_VERSION "0")
--set(KEXIV2_LIB_PATCH_VERSION "0")
--
- # Library ABI version used by linker.
- # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
- set(KEXIV2_LIB_SO_CUR_VERSION "15")
- set(KEXIV2_LIB_SO_REV_VERSION "0")
- set(KEXIV2_LIB_SO_AGE_VERSION "0")
- 
--set(LIBKEXIV2_LIB_VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}")
- set(LIBKEXIV2_SO_VERSION  "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}")
- 
- ############## ECM setup ######################
-@@ -77,6 +71,13 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(GenerateExportHeader)
- include(FeatureSummary)
- 
-+ecm_setup_version(${libkexiv2_VERSION}
-+                  VARIABLE_PREFIX      KEXIV2
-+                  VERSION_HEADER       "src/libkexiv2_version.h"
-+                  PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
-+                  SOVERSION            ${LIBKEXIV2_SO_VERSION}
-+)
-+
- ############## Find Packages ###################
- 
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
-@@ -84,20 +85,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
-              Gui
- )
- 
--find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED)
--set_package_properties("Exiv2"     PROPERTIES
--                       DESCRIPTION "Required to build libkexiv2"
--                       URL         "http://www.exiv2.org"
--                       TYPE        RECOMMENDED
--                       PURPOSE     "Library to manage image metadata"
--)
--
--ecm_setup_version(${LIBKEXIV2_LIB_VERSION}
--                  VARIABLE_PREFIX      KEXIV2
--                  VERSION_HEADER       "src/libkexiv2_version.h"
--                  PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
--                  SOVERSION            ${LIBKEXIV2_SO_VERSION}
--)
-+find_package(LibExiv2 ${EXIV2_MIN_VERSION} REQUIRED)
- 
- ############## Targets #########################
- 
-diff --git a/cmake/templates/libkexiv2.pc.cmake.in b/cmake/templates/libkexiv2.pc.cmake.in
-index 1df60df..e80e0ec 100644
---- a/cmake/templates/libkexiv2.pc.cmake.in
-+++ b/cmake/templates/libkexiv2.pc.cmake.in
-@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME}
- Description: A C++ library to manipulate EXIF/IPTC/XMP metadata using Exiv2 library.
- URL: https://cgit.kde.org/libkexiv2.git/
- Requires:
--Version: ${KEXIV2_LIB_VERSION_STRING}
-+Version: ${libkexiv2_VERSION}
- Libs: -L${LIB_INSTALL_DIR} -lkexiv2
- Cflags: -I${INCLUDE_INSTALL_DIR}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2b2df03..8ac18f5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,7 +6,6 @@
- 
- kde_enable_exceptions()
- 
--include_directories(${EXIV2_INCLUDE_DIR})
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
- 
- add_definitions(${EXIV2_DEFINITIONS})
-@@ -55,7 +54,7 @@ target_include_directories(KF5KExiv2 INTERFACE
- 
- target_link_libraries(KF5KExiv2
-                       PRIVATE
--                      ${EXIV2_LIBRARIES}
-+                      LibExiv2::LibExiv2
-                       PUBLIC
-                       Qt5::Core
-                       Qt5::Gui
-diff --git a/src/kexiv2.cpp b/src/kexiv2.cpp
-index 04c4aa4..b7bbc1a 100644
---- a/src/kexiv2.cpp
-+++ b/src/kexiv2.cpp
-@@ -153,7 +153,7 @@ QString KExiv2::Exiv2Version()
-     // Since 0.14.0 release, we can extract run-time version of Exiv2.
-     // else we return make version.
- 
--    return QString::fromLatin1(Exiv2::version());
-+    return QString::fromStdString(Exiv2::versionString());
- }
- 
- QString KExiv2::version()
-diff --git a/src/kexiv2_p.cpp b/src/kexiv2_p.cpp
-index cb6b134..2a287ab 100644
---- a/src/kexiv2_p.cpp
-+++ b/src/kexiv2_p.cpp
-@@ -124,19 +124,15 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
- 
-     QStringList rawTiffBasedSupported, rawTiffBasedNotSupported;
- 
--    // Raw files supported by Exiv2 0.21
-+    // Raw files supported by Exiv2 0.23
-     rawTiffBasedSupported << QString::fromLatin1("dng")
-                           << QString::fromLatin1("nef")
-                           << QString::fromLatin1("pef")
-                           << QString::fromLatin1("orf")
--                          << QString::fromLatin1("srw");
-+                          << QString::fromLatin1("srw")
-+                          << QString::fromLatin1("cr2");
- 
--    if (Exiv2::testVersion(0,23,0))
--    {
--        rawTiffBasedSupported << QString::fromLatin1("cr2");
--    }
--
--    // Raw files not supported by Exiv2 0.21
-+    // Raw files not supported by Exiv2 0.23
-     rawTiffBasedNotSupported << QString::fromLatin1("3fr")
-                              << QString::fromLatin1("arw")
-                              << QString::fromLatin1("dcr")
-@@ -149,11 +145,6 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
-                              << QString::fromLatin1("srf")
-                              << QString::fromLatin1("rw2");
- 
--    if (!Exiv2::testVersion(0,23,0))
--    {
--        rawTiffBasedNotSupported << QString::fromLatin1("cr2");
--    }
--
-     QString ext = finfo.suffix().toLower();
- 
-     if (!writeRawFiles && (rawTiffBasedSupported.contains(ext) || rawTiffBasedNotSupported.contains(ext)) )
-diff --git a/src/kexiv2_p.h b/src/kexiv2_p.h
-index ddf8f6d..c73fbbf 100644
---- a/src/kexiv2_p.h
-+++ b/src/kexiv2_p.h
-@@ -71,6 +71,7 @@
- #include <exiv2/properties.hpp>
- #include <exiv2/types.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <exiv2/xmpsidecar.hpp>
- 
- // Check if Exiv2 support XMP
-diff --git a/src/kexiv2exif.cpp b/src/kexiv2exif.cpp
-index 11c8948..52cd1a4 100644
---- a/src/kexiv2exif.cpp
-+++ b/src/kexiv2exif.cpp
-@@ -987,7 +987,11 @@ bool KExiv2::setTiffThumbnail(const QImage& thumbImage, bool setProgramName) con
- 
-         if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
-         {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
-+#else
-             throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
-+#endif
-         }
- 
-         // Remove sub-IFD tags
--- 
-2.20.1
-
diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild
deleted file mode 100644
index 38139512925b..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FRAMEWORKS_MINIMAL="5.53.0"
-inherit kde5
-
-DESCRIPTION="Wrapper around exiv2 library"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+xmp"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.0-exiv2-0.27.patch" )
diff --git a/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild
index 3b36b390a757..54c8cbe13e0c 100644
--- a/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Wrapper around exiv2 library"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+xmp"
 
 DEPEND="