gentoo resync : 14.12.2020

4 files changed, 282 insertions, 1 deletions

diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 1cd7952fe44a..41f7548855c0 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,3 +1,6 @@
+AUX calendarsupport-20.08.3-qt-5.15.2.patch 9234 BLAKE2B 6c4e33ba2f28077d68f660539b210597bf915559125b8b9078554e2d559443a0edfcfabcfc67328e5c5f20145d1182de1cab3a95e11b2845d902de8e3a880107 SHA512 ab4428b95fefd022bea802eacf312ee2cc0a143d44728d840d16e2634d01bc87ce63070ff82c19fcf3d07a682c1cad7e1320feeba96b5837291a4421d27d0fe8
 DIST calendarsupport-20.08.3.tar.xz 661708 BLAKE2B cf7ef77afe14db2e5eddd48617f47f3d32c93b6d2697ed35f8dfacb73ca50d39e04ab459f8fb5ba18f48068034828c5d6fdd1af2604ae97586bfa4bac33b3029 SHA512 dc1f1eb8b633f19edf841e9b4d50b78afea9297918a4b3d8bab47352b53caec2737566504c9487fe1e36a01873e6e4bda8e257f997742d244d276992ddcc77f5
-EBUILD calendarsupport-20.08.3.ebuild 1261 BLAKE2B 49ac2aa42dcf68057600685942ef4e5448f42e920c153b52c0e32b36415a1d70a799b936ce01fb8174bdb908b2653c701ba5f8e8fbb31c870235a7a361e29d0f SHA512 bd7d3b02b60bffc7cc304c8ee77d93626917168825630691c6f2e0a9fc2b20e822b9aefd08e70cf9d14d7737b7fa336cf89d76d6a1695251e705e10c4df7aeaf
+DIST calendarsupport-20.12.0.tar.xz 664776 BLAKE2B 57b99b7928f43b33a1ab22b681e47e51e5c735f64a42a08c2ee9709523ec0bd42e6cc2fe6c94520425903ad8202ea44434c4137cc252f68e5fd476824d0e40f3 SHA512 550392817d9daee99074c8b86847d52d9006a2434e0cf326371e173181014b2757b7e76091f281a4f668c19bd443da13aea75054e3412536302cce97cc6b1e00
+EBUILD calendarsupport-20.08.3.ebuild 1309 BLAKE2B 48d9be2fdf5d264f8e8196f66a7bb9afa843cf0944a5eba19ab183cc8e49099fa9fe664d201b6ed1fb9c1fb4b6f2ad4433f421f62a5ddbf881d021e560bcb113 SHA512 072af5a079dd5a9687764bcf8abe5c67905fa076494b803e69b2b1e1da002b4e048729fc7c6b7c3f2ac051907c0207e27a53d4fe46ac63b5a5bf32aed4584751
+EBUILD calendarsupport-20.12.0.ebuild 1264 BLAKE2B 11c5c8f62af7a1485d1ca28bfec5aa17bc6e8c897c57c3b3cbb5205912d4e7eaf498fbaa810a0c624685038c9fd0afb015d4a804dd712c07329be8271d8c754f SHA512 820e552c76a136b9e5be685e79fb6388a76619cd0363aec9faaa15677dc612bbb8b3338276338b3ae6d8414e9f8437a1d9189ed5c64189c3e6e6c4c337e23dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
index 0bd817ac07c4..58478c498820 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
@@ -45,3 +45,5 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
diff --git a/kde-apps/calendarsupport/calendarsupport-20.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-20.12.0.ebuild
new file mode 100644
index 000000000000..1aad88ae935b
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+KFMIN=5.75.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Calendar support library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libical
+	>=dev-qt/designer-${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-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
new file mode 100644
index 000000000000..af94c2e7a0de
--- /dev/null
+++ b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
@@ -0,0 +1,229 @@
+From b4193facb223bd5b73a65318dec8ced51b66adf7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 9 Sep 2020 17:26:46 +0200
+Subject: [PATCH] Port away from deprecated QPrinter functions
+
+This implies changing from QPrinter::Orientation to QPageLayout::Orientation. The actual values are the same tough.
+---
+ src/printing/calprintdefaultplugins.cpp | 14 +++++++-------
+ src/printing/calprintdefaultplugins.h   | 10 +++++-----
+ src/printing/calprinter.cpp             |  6 +++---
+ src/printing/calprintpluginbase.cpp     |  8 ++++----
+ src/printing/calprintpluginbase.h       |  2 +-
+ src/printing/printplugin.h              |  4 ++--
+ src/printing/yearprint.cpp              |  6 +++---
+ src/printing/yearprint.h                |  2 +-
+ 8 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp
+index 862b74d..e3d802d 100644
+--- a/src/printing/calprintdefaultplugins.cpp
++++ b/src/printing/calprintdefaultplugins.cpp
+@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
+         QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
+         QString line2 = local.toString(mToDate, QLocale::ShortFormat);
+         QString title;
+-        if (orientation() == QPrinter::Landscape) {
++        if (orientation() == QPageLayout::Landscape) {
+             title = i18nc("date from-to", "%1 - %2", line1, line2);
+         } else {
+             title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
+@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig()
+     }
+ }
+ 
+-QPrinter::Orientation CalPrintWeek::defaultOrientation() const
++QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
+ {
+     if (mWeekPrintType == Filofax) {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     } else if (mWeekPrintType == SplitWeek) {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     } else {
+-        return QPrinter::Landscape;
++        return QPageLayout::Landscape;
+     }
+ }
+ 
+@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
+         do {
+             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
+             line2 = local.toString(curWeek, QLocale::ShortFormat);
+-            if (orientation() == QPrinter::Landscape) {
++            if (orientation() == QPageLayout::Landscape) {
+                 title = i18nc("date from-to", "%1 - %2", line1, line2);
+             } else {
+                 title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
+@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
+         do {
+             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
+             line2 = local.toString(curWeek, QLocale::ShortFormat);
+-            if (orientation() == QPrinter::Landscape) {
++            if (orientation() == QPageLayout::Landscape) {
+                 title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
+                               line1, line2, curWeek.weekNumber());
+             } else {
+diff --git a/src/printing/calprintdefaultplugins.h b/src/printing/calprintdefaultplugins.h
+index 4df72f6..3f62d0b 100644
+--- a/src/printing/calprintdefaultplugins.h
++++ b/src/printing/calprintdefaultplugins.h
+@@ -53,9 +53,9 @@ public:
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
++    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
+     {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     }
+ 
+ public:
+@@ -166,7 +166,7 @@ public:
+     /**
+       Returns the default orientation for the eWeekPrintType.
+     */
+-    QPrinter::Orientation defaultOrientation() const override;
++    QPageLayout::Orientation defaultOrientation() const override;
+ 
+ public:
+     void print(QPainter &p, int width, int height) override;
+@@ -222,9 +222,9 @@ public:
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    QPrinter::Orientation defaultOrientation() const override
++    QPageLayout::Orientation defaultOrientation() const override
+     {
+-        return QPrinter::Landscape;
++        return QPageLayout::Landscape;
+     }
+ 
+ public:
+diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp
+index 182e0e3..10e9db6 100644
+--- a/src/printing/calprinter.cpp
++++ b/src/printing/calprinter.cpp
+@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
+     QPrinter printer;
+     switch (dlgorientation) {
+     case eOrientPlugin:
+-        printer.setOrientation(selectedStyle->defaultOrientation());
++        printer.setPageOrientation(selectedStyle->defaultOrientation());
+         break;
+     case eOrientPortrait:
+-        printer.setOrientation(QPrinter::Portrait);
++        printer.setPageOrientation(QPageLayout::Portrait);
+         break;
+     case eOrientLandscape:
+-        printer.setOrientation(QPrinter::Landscape);
++        printer.setPageOrientation(QPageLayout::Landscape);
+         break;
+     case eOrientPrinter:
+         break;
+diff --git a/src/printing/calprintpluginbase.cpp b/src/printing/calprintpluginbase.cpp
+index e96f3b2..9db198e 100644
+--- a/src/printing/calprintpluginbase.cpp
++++ b/src/printing/calprintpluginbase.cpp
+@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter)
+     mPrintFooter = printFooter;
+ }
+ 
+-QPrinter::Orientation CalPrintPluginBase::orientation() const
++QPageLayout::Orientation CalPrintPluginBase::orientation() const
+ {
+-    return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
++    return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
+ }
+ 
+ QColor CalPrintPluginBase::getTextColor(const QColor &c) const
+@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const
+ {
+     if (mHeaderHeight >= 0) {
+         return mHeaderHeight;
+-    } else if (orientation() == QPrinter::Portrait) {
++    } else if (orientation() == QPageLayout::Portrait) {
+         return PORTRAIT_HEADER_HEIGHT;
+     } else {
+         return LANDSCAPE_HEADER_HEIGHT;
+@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const
+ 
+     if (mFooterHeight >= 0) {
+         return mFooterHeight;
+-    } else if (orientation() == QPrinter::Portrait) {
++    } else if (orientation() == QPageLayout::Portrait) {
+         return PORTRAIT_FOOTER_HEIGHT;
+     } else {
+         return LANDSCAPE_FOOTER_HEIGHT;
+diff --git a/src/printing/calprintpluginbase.h b/src/printing/calprintpluginbase.h
+index ff1113c..b3d41ac 100644
+--- a/src/printing/calprintpluginbase.h
++++ b/src/printing/calprintpluginbase.h
+@@ -108,7 +108,7 @@ public:
+     */
+     static int weekdayColumn(int weekday);
+ 
+-    QPrinter::Orientation orientation() const;
++    QPageLayout::Orientation orientation() const;
+ 
+     /** Returns the height of the page header. If the height was explicitly
+         set using setHeaderHeight, that value is returned, otherwise a
+diff --git a/src/printing/printplugin.h b/src/printing/printplugin.h
+index 57afdfe..73bf467 100644
+--- a/src/printing/printplugin.h
++++ b/src/printing/printplugin.h
+@@ -140,9 +140,9 @@ public:
+       config settings), implement this function in your subclass and
+       return the desired orientation.
+     */
+-    virtual QPrinter::Orientation defaultOrientation() const
++    virtual QPageLayout::Orientation defaultOrientation() const
+     {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     }
+ 
+     /**
+diff --git a/src/printing/yearprint.cpp b/src/printing/yearprint.cpp
+index 3287ca6..e57a1c4 100644
+--- a/src/printing/yearprint.cpp
++++ b/src/printing/yearprint.cpp
+@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig()
+     }
+ }
+ 
+-QPrinter::Orientation CalPrintYear::defaultOrientation() const
++QPageLayout::Orientation CalPrintYear::defaultOrientation() const
+ {
+-    return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
++    return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
+ }
+ 
+ void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
+@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height)
+         QString stdate = locale.toString(start, QLocale::ShortFormat);
+         QString endate = locale.toString(end, QLocale::ShortFormat);
+         QString title;
+-        if (orientation() == QPrinter::Landscape) {
++        if (orientation() == QPageLayout::Landscape) {
+             title = i18nc("date from - to", "%1 - %2", stdate, endate);
+         } else {
+             title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
+diff --git a/src/printing/yearprint.h b/src/printing/yearprint.h
+index e59bf87..cd46a50 100644
+--- a/src/printing/yearprint.h
++++ b/src/printing/yearprint.h
+@@ -48,7 +48,7 @@ public:
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
++    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
+ 
+ public:
+     void print(QPainter &p, int width, int height) override;
+-- 
+GitLab
+