Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 96 insertions, 2 deletions

diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 0fa41599ddd7..2d229f3da4e7 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,4 +1,7 @@
+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.3.tar.xz 64524 BLAKE2B d3b97e338021e2705ade94383054651c3ce2a8c08682f702f44b3cfdbf348487fcbfebc20854008854bdd844e5c6433d640f4c76be7e71cbae69884f3aa22f38 SHA512 ce2bab29a1059e4be498472b2713e813c8eb5ace4cd928eeff3c6e50a656afda651a57a3877d9388163096e575c897f4f84eee914db101cb8dcd1eb614242898
-EBUILD libkexiv2-18.12.3.ebuild 398 BLAKE2B 3ca64b666ff3f7db3e3e80053b29378f180b29bb340fdb897a3e88cb4c6e46356c4c0e35639392bf8b5ed4a4f45cda39f0b41e930db04e21b914d20dc4d93307 SHA512 ba8e181b100e4a828e31cc1ad1d4730deb185a03ce5f0ffe79e01de60b1a480c77665ee63df0ecccfbffb40b813db06022c1a754fbf9045a3e34fb4609d9df60
+EBUILD libkexiv2-18.08.3-r1.ebuild 472 BLAKE2B 8cda70ec63c78e243c56a0e38665b39db7bf4720374e0cbf73ed98258b7f05aaed70938bddc7d1f9dae767cbe4d57eb04d3805ca25cb763995ead9526c14e58d SHA512 66821af154c2320fb4f7dd7645e265afe8a39c2484c08c7728ea323b66332047b627b360d78b2e1286d97b4b2569928c83719039c9b13b71d0797b903a9e0f8c
+EBUILD libkexiv2-18.12.3.ebuild 400 BLAKE2B 139852e9bc0cf65ca20d52cab6dcfb0f3aad8355e523783fed612430a9fa5c14a5b89ff221c12ee478699a5f1722335ea6647db742b4de4bf56b74d915936b33 SHA512 7e2f441323bdf200ed1d39502748d6b40f39a825a0b814d448ebb127f493296fdd806119b781719f357ea6e16dbe92481568039b227b9c629017fc9b9d7817b0
 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..c7c48af34841
--- /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.3.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild
index 38139512925b..901fcf5c20ab 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Wrapper around exiv2 library"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+xmp"
 
 DEPEND="