gentoo resync : 25.11.2020

4 files changed, 6 insertions, 87 deletions

diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 3dd719b4b466..441d50f00c39 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,6 +1,3 @@
-AUX kitinerary-20.04.3-poppler-20.08.patch 1115 BLAKE2B a368b6c91b0ad14e99fbdb94110f64692217b51ece3fa592372e3dc9ffcd62fefea0eb7e9f91481b3eacf1c425d0e8d53e5db9d57c6ed5a3d20382326d51cef4 SHA512 d4ee7f4423e2943575925fdde7c8e7056562d5ad485191a38c5a0183a46c2a71d9f6957db334d576be07ff03ad484c535a821cf616a57b37b8de1ae075d384c4
-DIST kitinerary-20.04.3.tar.xz 1280676 BLAKE2B 17e02987ed40985b8adcec81f6499ca968a89f22919cd6af2f16d6c5623b8b767fb43142aa4ff93e8d24c6ba483b553e7817d0e74c68bebe8b897d689704e2ca SHA512 eee734fc06373aed09e0eadd7ef232cde5ba07adf4d0996117bc4a0ee16cf80fc7f607ae1dc92033ea404e70eb8afcf5a676ff71e286613272c0d1051d7b7168
-DIST kitinerary-20.08.1.tar.xz 1756104 BLAKE2B 8e34aaeb25f0f89c012ba33c68282a263905a30bf6e91d8feff59c90d48b8a0e6b0a5d0c58c47cdf7ff8b732176ed0d29cc0316461d3ec7147a889cfd7c13e4d SHA512 20e218a988c54be15432ac4a070647901547383416001178c2151a20e8d3044caf98bbdbb82fc87379ef620069409a7f0026de2112f4e35cd6c51a3ac14c7760
-EBUILD kitinerary-20.04.3.ebuild 1091 BLAKE2B f7ab0838e92215cf2e435d086b0fe74aae97960d57be02da4eaffde866adc672354bdeca3ec1a273325b68dfa9132af073a62c98126261f584fa7ca3efa75fa0 SHA512 ac4d28d69baed98b5724af39166508cc9ef202b8bdecd4a8cb166ed5e7def1e93eaad591e7bd23315591926cd0048f226595bab9044a321f5caaff4f35cec5a9
-EBUILD kitinerary-20.08.1.ebuild 1060 BLAKE2B 608c65c5a507c20d5fec6d9ae48a2796af62d2225852cc982598a0378a7728ef8031b411578bb46c8f0c6ae3d71d5b356fc146e6be6308ccc7b7d3c39f223f88 SHA512 fa55c4c1e96959a69ec7ce0b89fb02edbdeb516a6623f9bf5bdcc123a651963fb0c08613a8960caeb807bdb935c840a54682063737e52d84fc0b81584c54a48a
+DIST kitinerary-20.08.3.tar.xz 1756240 BLAKE2B 2c25e6befd0f3924fb80c7ec5de6526b1f45e663104fc8e3637456354f25984a2bc3d4d00c94f163781aa9e55f365887774d586f01ef1c5e9d27bc3cdbfd2e8a SHA512 d48dbb2153662352f7abb0a615f4a88b5f55c783e9aaab92b38c65b15dd22c4f7ab328e3d372ba8a23620711676785f7aaf69b50aa3c73d46adf15045f53f4ea
+EBUILD kitinerary-20.08.3.ebuild 1044 BLAKE2B f543b62aa9b97f13c9426a229f8ff571bbc6621d9be047e7f4ed6e8fe5d1df2d0cd4a16ad5b997b1f419cdfdc0e82f56ce209b9cdf0b8816a4b1ca7115f2d70a SHA512 7b7caa7a62cabaceea2122bf03937b7c59ad6b72375dbc24dd9311d2e449fb6fba3e87d0bb31ec2c62b4ea3f3b5cb789bda81fca3eff81ab33759b932e36d1b0
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch
deleted file mode 100644
index 768cf5dc5097..000000000000
--- a/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7098c8be9a5e7fabf74543308bfaf11a2ebe5484 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Wed, 5 Aug 2020 17:18:13 +0200
-Subject: [PATCH] Fix build with latest Poppler
-
-That now has a leading 0 in its minor version number.
----
- CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4d40f2..37787d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,10 +71,10 @@ if(TARGET Poppler::Core)
-     endif()
- endif()
- if (HAVE_POPPLER)
--    string(REPLACE "." ";" _poppler_version_components ${Poppler_VERSION})
--    list(GET _poppler_version_components 0 POPPLER_VERSION_MAJOR)
--    list(GET _poppler_version_components 1 POPPLER_VERSION_MINOR)
--    list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH)
-+    string(REGEX MATCH "([0-9]+)\.0*([0-9]+)\.0*([0-9]+)" _match ${Poppler_VERSION})
-+    set(POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1})
-+    set(POPPLER_VERSION_MINOR ${CMAKE_MATCH_2})
-+    set(POPPLER_VERSION_PATCH ${CMAKE_MATCH_3})
- endif()
- 
- if (TARGET ZXing::ZXing OR TARGET ZXing::Core)
--- 
-GitLab
-
diff --git a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
deleted file mode 100644
index 3018a3aa73bb..000000000000
--- a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+barcode pdf"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( ~media-libs/zxing-cpp-1.0.8 )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-PATCHES=( "${FILESDIR}/${P}-poppler-20.08.patch" ) # bug 735800
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-20.08.1.ebuild b/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
index 9b4521dd1575..4cea276fca34 100644
--- a/kde-apps/kitinerary/kitinerary-20.08.1.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"