gentoo resync : 25.08.2020

4 files changed, 53 insertions, 17 deletions

diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index b9388f2723da..a7075e6104f6 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,6 @@
-DIST kitinerary-19.12.3.tar.xz 1179152 BLAKE2B 628242b1dc7a5f4f4ac4140e5cd6174a19fc0e03dbbb0d3fe41a4530b8b2af7ea96ca8900d858be04e0bc5c98918ff680d694a3692135fe0aa96dc9281317748 SHA512 3c546d5154eccbbb46a7d21787c12cadd282b46bddf11d773857f34e03b221fc70ac6e7a630dc143e31e25deedbda1fb66088c9a0b461a54ae960b1019082917
-DIST kitinerary-20.04.2.tar.xz 1282012 BLAKE2B 0f478a07afb003538013c583caaa33efbe26c763c87ab4648dd59c7e823444aaae8d8884ba3692b9706c03bdaf8f0671c61f5b63e0ff24c7c223e5bd444d9e6b SHA512 e3d2ee23e6d139d2606c19488cb99dfb0a7598329f8f32f1d1979e4100db3850b62400d3c487db3e61fe8d725094641435aa7493eb4dfc216887809dfc4a0eae
-EBUILD kitinerary-19.12.3.ebuild 975 BLAKE2B 953e18336bf4008c38465ae8bc21e9b4aacc4bb28d414ce78a615b5c7c5a2d208b36cf667b6bed5b9bf9f6d08b20e2f01f9937b1d8bf58dd06a203d7cb14fde3 SHA512 44e0ea3a9471ba01213caee0de72217721b77db1e85088c9e7b836b6a5f0938e4b5a561c7c3d1d57e943a7f43895bb4eb4c11f77c8c08a588565ae4d961899ba
-EBUILD kitinerary-20.04.2.ebuild 1022 BLAKE2B b275d6652c85958c68be89effc027a9a75332d0a6f6efb3c200ed7c70ba2dfa6ad09ae4cf9aab249646620e205c401aef7ac89e4bacf452cc0136a4331bcc1d5 SHA512 cc97a70b9cfbdeae36be8811450b59f2fde17db63dc365015f064b4fe20dbab4fa6f0d0fe184b7a26dc56dd82398478d6c2dd27ff04d753c103884ec1811a577
+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.0.tar.xz 1755504 BLAKE2B 9771f5d104bf05f8869408d754c316c9736b7642a63eebc24b20910a8ec1ceed8098d00cf3e8a93455136fb45ced2750a36f40007cd4eacd7a79fec8addc6c78 SHA512 c568992c165ae8cfd48b19141f3bfd0755cdf1a516e816791fc94533a75a4c431fa6528d0322afc56400b33d38f72bbc3febfe0923397e0de25289e2a90a2e5d
+EBUILD kitinerary-20.04.3.ebuild 1091 BLAKE2B f7ab0838e92215cf2e435d086b0fe74aae97960d57be02da4eaffde866adc672354bdeca3ec1a273325b68dfa9132af073a62c98126261f584fa7ca3efa75fa0 SHA512 ac4d28d69baed98b5724af39166508cc9ef202b8bdecd4a8cb166ed5e7def1e93eaad591e7bd23315591926cd0048f226595bab9044a321f5caaff4f35cec5a9
+EBUILD kitinerary-20.08.0-r1.ebuild 1030 BLAKE2B 8d5bf464363e9a5366d90f249393cede74fb7e73134c3b6cc6b749632e6bafe4b0424eeb752703182cb4bb53f22b0a2764510bdaae74b832d2863aa57229b661 SHA512 0408ed0482f35f0845ed3fd7d08043ff2cf32f9792865bb4357c642a868699c67fbb33b0f322e875b81336948c2dc83c7aa2ae63f015afc0ec53cb9a3570cd7d
 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
new file mode 100644
index 000000000000..768cf5dc5097
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch
@@ -0,0 +1,32 @@
+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-19.12.3.ebuild b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
index cb63f07326e2..3018a3aa73bb 100644
--- a/kde-apps/kitinerary/kitinerary-19.12.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional"
+ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,28 +16,31 @@ HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
 LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE="+barcode"
+IUSE="+barcode pdf"
 
 DEPEND="
-	app-text/poppler:=[qt5]
 	>=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
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
 	sys-libs/zlib
-	barcode? ( media-libs/zxing-cpp )
+	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.04.2.ebuild b/kde-apps/kitinerary/kitinerary-20.08.0-r1.ebuild
index 5ba96ee9d2c1..b8c2bbbd91dc 100644
--- a/kde-apps/kitinerary/kitinerary-20.04.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.08.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -21,14 +21,14 @@ 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
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
 	sys-libs/zlib
-	barcode? ( media-libs/zxing-cpp )
+	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
 	pdf? ( app-text/poppler:=[qt5] )
 "
 RDEPEND="${DEPEND}