gentoo resync : 14.12.2020

4 files changed, 150 insertions, 1 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index a13873807e99..b4fc395f0813 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,3 +1,6 @@
+AUX kaddressbook-20.08.3-qt-5.15.2.patch 3034 BLAKE2B 36c5c81b6e1764fe57eec1a465e1258ada25234e6f89d1d5bd247f26d57f5dedea2b07ca77822e6e7a1afe06fbe2432dbb92f4c106f01ab3d3a33d2377a32d4b SHA512 ad7c53a13f5a21d21380d53767c483d39479cf63b889596f61819d2ad0c4289fbf57f300098e4063a76eb0c43356433b52505ed9405f032cb3ed290b8af5f2d2
 DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052
-EBUILD kaddressbook-20.08.3.ebuild 2082 BLAKE2B 7bfc3ab231a6b2279ea670816ad348a1b96372da4eb9d625315b8f852bc266a6cbe053d005a2dea2d07bcc85701825b8788b3092fc5bec7b47c0c20ff3dd8e65 SHA512 3d12ca7a644d6d7749972dd351efda245c2bad847ee25d15e143167b692f908c5b424ec75ffdd99e70bff17a9e4fd1365a7d0f08b42ad500f712f0858ad96e85
+DIST kaddressbook-20.12.0.tar.xz 3256028 BLAKE2B 2be9a1fa6be34f3d616866560c8b78945ce1c512c9e6e9f065d21c26e090ccfe6d96fde4ef34e88265c341e685ff7c6c60d8a4c4f89ea75b8620139d5e5e46ca SHA512 4729711ecf84ea3fc701394e70ba146cc0130edece4a2cb5ee0f7aeb7ea6508436fda51c53fbf6eea9da08d8d07547e1ce5e4194422cea047f29af0a266df7be
+EBUILD kaddressbook-20.08.3.ebuild 2130 BLAKE2B c9501d04436666316273d5cc62f93397fcccfd98c7db14580732c277bdaead7bcd841b4def04041204e3f13299e65fd2fbcfb315904441af96901d32fcda2183 SHA512 b8ebd00d7ae3c56ff373d75c5b8c6b49a0276e19e00cffb9ee61685eb81e4d44a015086574ac6841ab4409177c560436e3243c43baa9aef003e99c8d18933aea
+EBUILD kaddressbook-20.12.0.ebuild 2045 BLAKE2B 86fd96a18ad57ec5c58a6fbd507c94cdf02179d46bdc4e117d2ff6d381daf71ee6492680d393d7d97f992058fec0018b4f2f8506c8ae619cf18aa8ad4585dcc1 SHA512 30733edde3f88b86afdc4555e0944ba6a510c4fadfc72c2b6fff88cc284fd954f593c800dbabe4bb733196740bee3c44da727459c05c175801d2d30fdf4a333c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
new file mode 100644
index 000000000000..888febed0fa3
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
@@ -0,0 +1,69 @@
+From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sun, 25 Oct 2020 18:22:58 +0100
+Subject: [PATCH] Compile with recent Qt 5.15
+
+More QPrinter methods got deprecated there. DevicePixel no longer exists
+as a unit, visually Point looks pretty much the same though.
+---
+ src/printing/compact/compactstyle.cpp        | 2 +-
+ src/printing/grantlee/grantleeprintstyle.cpp | 2 +-
+ src/printing/mike/mikesstyle.cpp             | 2 +-
+ src/printing/ringbinder/ringbinderstyle.cpp  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp
+index d950a963..71e74c0f 100644
+--- a/src/printing/compact/compactstyle.cpp
++++ b/src/printing/compact/compactstyle.cpp
+@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
+ 
+     // print
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp
+index d7afe8ef..49b5e494 100644
+--- a/src/printing/grantlee/grantleeprintstyle.cpp
++++ b/src/printing/grantlee/grantleeprintstyle.cpp
+@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
+ void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp
+index 9f698c53..81a4bd6f 100644
+--- a/src/printing/mike/mikesstyle.cpp
++++ b/src/printing/mike/mikesstyle.cpp
+@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
+ void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp
+index 60a39c86..5f600d6a 100644
+--- a/src/printing/ringbinder/ringbinderstyle.cpp
++++ b/src/printing/ringbinder/ringbinderstyle.cpp
+@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
+     config.sync();
+ 
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
index 7da1971f7284..4a9f7e41299e 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-20.12.0.ebuild
new file mode 100644
index 000000000000..3db970099dcd
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-20.12.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.75.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/kaddressbook"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="telemetry"
+
+DEPEND="
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
+	fi
+	ecm_pkg_postinst
+}