gentoo resync : 10.02.2019

4 files changed, 96 insertions, 4 deletions

diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 5d6a3f4ad2aa..001e36ae1d26 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,6 +1,8 @@
+AUX libkexiv2-18.08.3-cmake.patch 2151 BLAKE2B c813294901b3c73eabbca6ad7d9986faa55ce780c52b32dbceebb8f80f385ebb0cbc320fe2d0f24204189b1922b53148940fcb29f8277aa4f7611a96caee0f85 SHA512 875a75a6953df981b85f352c843c34e3423e6b918dae6905813233367ddf77ea722b70c3c88ad107f4d89d39b5690e79571085f8e63e6025886ed3c92170cfb7
 AUX libkexiv2-18.12.0-exiv2-0.27.patch 7827 BLAKE2B b16eef536dd2517a62de9561bf810cc2b2c404baa6b6c17750bba4f1880b1615cfaa0301983a009654bbcc8cc7b6f19704992e5a7dcb4151f266e6b83b4d38c4 SHA512 aa23336c5667c9bb6610e5c88f713c14f5aae187526faf1e65f92e5258faf50d6f7926b1b0b6deeed9874cc024061a0adae0ff6f4896ede1495678cadd9b368f
 DIST libkexiv2-18.08.3.tar.xz 64504 BLAKE2B b29645239bc1523bb363e04ab0449563f4c9550887c359b9a55414682e850289f80e85088c043a756d34dc83bb3b0c6cc9975cd4e5a513b80fbf4d6f93870d6e SHA512 eef3fbb5942823d23d276f56a1e9187b5142331485a4fb7d7e419f4af5504659c5a755f64e4cdf2a9bef6ae499126672ed5627c0fca7ef56fac7dc6a12794143
-DIST libkexiv2-18.12.1.tar.xz 64508 BLAKE2B 2e8a6e36236cc090a33c5f16d5b8949208ad4a12cf4ec4ae845cdca1953e4230d71d795c47dcd5f073590eb8d6d95f104eecd75f65f25b6a4c509ba75039a067 SHA512 f89d105c4e081311851d649065640ed9b53761d8eaf273afc734a34dae52df9e834806a6d71299312f95e5c8267414efee1b30671b4469a1b6b604b0de90e6a0
+DIST libkexiv2-18.12.2.tar.xz 64500 BLAKE2B 9b94e6e1578fc25066f2a60b0baa27725257bf9105b681e2699127828df4cd84362ff2bf90742af7049b95f7b0af05dcb597b95452fd21c7af1d6813d9289a2e SHA512 381da5818ffa73546424e1c998e4ee3d9348ec5f46619e2968d1214d7804716d3cbc722a092bffad74dec7b0dfe0167fd844a0e4ba5301e6ed89ae142f93a1fd
+EBUILD libkexiv2-18.08.3-r1.ebuild 474 BLAKE2B b1c208b36fc46a755e438e0a9efe24b46009d25d789aade2e9a4ec60e75fc70a9d1798fe5d98bfad42d8f8ac8634b63fc72ca37f86f6e5a3f009e1f898175d62 SHA512 88ced57ed33ff5956c834751c972aaea292bb679e91b01a2a8c9c5a4b01cf1489d5a0788bd71bc898504749173dd4ba013fbe69155d6fd3e8ec06f39664e75ee
 EBUILD libkexiv2-18.08.3.ebuild 353 BLAKE2B 2e6b4be08764403b6fe046b37908a1684e3a95f4f23a9c5e4fbc3f1c2e870362f43b7528d8e433940c6b40879eab4820616f28a1956dd7ef6d05dfbd6237b7ea SHA512 33ba8badebe5fa55e2dc648ddb2a304274ebf6a5ab71de0ea23712757ee7e8e9133027d77b283cc46e45f07a1779eb325e7dcd33c03979f370c6ec10ee769fff
-EBUILD libkexiv2-18.12.1.ebuild 417 BLAKE2B 65fbadc0a74f99b455121bba24fe9be13b31a367a2bcc86ddb8ba5a978b1cacbed8c6c2ab7f1d95b50206d6d623683033f265494ab8276b4b6229053302562ea SHA512 86a3ec66c5755e003bb91ced8c3bfe28925eb6f7472bd739ce6b5ba03a135d1cca8a0e793fb885067c86f93f04fb455d3dc5bdb05cfdda6a44af260a43143fc7
+EBUILD libkexiv2-18.12.2.ebuild 393 BLAKE2B 8558358d10992ccb5ac65cc3206c5ead127caf6ea23bce64a24823794609df17258927ac098aa9ed69dde1aa05c266a74af9bf97f49bcd8fe65a9328208fa13d SHA512 87d63b80bb6d84684975e5566217efeff58cc81b024404b0165362071931ca1589ebc89bf1caa8189a20e1b1f6fe0ce6a853cb6823ab8d04dccd92ab5bd5cde4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/files/libkexiv2-18.08.3-cmake.patch b/kde-apps/libkexiv2/files/libkexiv2-18.08.3-cmake.patch
new file mode 100644
index 000000000000..5b8ce9c30c0d
--- /dev/null
+++ b/kde-apps/libkexiv2/files/libkexiv2-18.08.3-cmake.patch
@@ -0,0 +1,67 @@
+From d7e3f14367acaefae38d28ba8d82f2e7aa7a2091 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 25 Sep 2018 16:27:02 +0200
+Subject: [PATCH 1/2] Make cmake 3.0 the minimum cmake version
+
+Should fix the build on macOS.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b1f345..4d3b585 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,7 @@ project(libkexiv2)
+ message(STATUS "----------------------------------------------------------------------------------")
+ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
+ 
+-set(CMAKE_MIN_VERSION   "2.8.12")
++set(CMAKE_MIN_VERSION   "3.0.0")
+ set(ECM_MIN_VERSION     "1.1.0")
+ set(REQUIRED_QT_VERSION "5.2.0")
+ set(EXIV2_MIN_VERSION   "0.24")
+-- 
+2.20.1
+
+
+From 2772f91f2a494ed1219f1bb7c6cf3e317892e3c4 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <vonreth@kde.org>
+Date: Tue, 25 Sep 2018 16:59:20 +0200
+Subject: [PATCH 2/2] Initialize cmake project after cmake_minimum_required was
+ set
+
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d3b585..d13ef27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,11 +4,6 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-project(libkexiv2)
+-
+-message(STATUS "----------------------------------------------------------------------------------")
+-message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
+-
+ set(CMAKE_MIN_VERSION   "3.0.0")
+ set(ECM_MIN_VERSION     "1.1.0")
+ set(REQUIRED_QT_VERSION "5.2.0")
+@@ -16,6 +11,11 @@ set(EXIV2_MIN_VERSION   "0.24")
+ 
+ cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION})
+ 
++project(libkexiv2)
++
++message(STATUS "----------------------------------------------------------------------------------")
++message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
++
+ # =======================================================
+ # Information to update before to release this library.
+ 
+-- 
+2.20.1
diff --git a/kde-apps/libkexiv2/libkexiv2-18.08.3-r1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.08.3-r1.ebuild
new file mode 100644
index 000000000000..abc3e4145964
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-18.08.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.54.0"
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${PN}-18.12.0-exiv2-0.27.patch"
+)
diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.2.ebuild
index f44487230a99..fa9294bd8fe9 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.12.1.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.12.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FRAMEWORKS_MINIMAL="5.53.0"
-KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Wrapper around exiv2 library"