gentoo resync : 28.04.2021

4 files changed, 8 insertions, 55 deletions

diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index e7094c32152b..41aba10abb8d 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,6 +1,5 @@
-AUX kompare-20.08.3-qt-5.15.2.patch 1479 BLAKE2B 1389a0c1b4639941708cc3adf7960d3bc571cb1b19766e52de90f04a4eb7a3657987f635a4679bb68b4b831965a07d8100dd3eb6b137eeb9388c07a97c490bde SHA512 6205ca6c89690f0b28d37146d9604ae55e6664bcfd8b2305c4f0df260bbcde5a541e130014e049148ae86cd035e8eaea1b90cbf04f2cb3299e76309c00b5f764
-DIST kompare-20.08.3.tar.xz 924032 BLAKE2B 65940af6a4ef81ff0cdbf5b2e8ffc7b7ddf4b1baf71c5f6e7c7d55409085cfa7820e8b742f8d6b520cdae4c08585a4ff77bb3fbfa97710d729ad2f9f5c3492ef SHA512 0cb169296924e4dad2967052472fd7095092478819ba0925d82482f0e279719b2e29e75db9e732602cd845261918025ae9cf0e024c8ad0a250c04abe022deb4b
 DIST kompare-20.12.3.tar.xz 929648 BLAKE2B 14c2dbf52dc4075d4a57a39ab1f2c56b18d155abd24eb14f685fb2db365c1e2230287c8eebfb681f23b1700eee214a4dbef3f760283e2c096ce4a77454817f87 SHA512 0da525fd73629d3d092b0a61c8cae610989981ed3cf6ec5d47b94ee1a3a443ac37ec18e8c56f1888b03a480fe6a127e9711bf0f5a983febed3126dcd8787386d
-EBUILD kompare-20.08.3.ebuild 1149 BLAKE2B ec389ff787c6b6fb7c196e535f7652f813b7c0734c80dd37ca5ceedf8a2eb8c38916c3da0c221b48305792ecddba3f7d1e3370bd73cbf1f4258179a1efc920a1 SHA512 ea8219929bfdbd30cc627fa990c4c85fe18ff4d2299924e1aae64bc67ba57037d087f55979064cc3bd14b6fda27db2ffb8ef323f1e720da9585ca217a0939e14
-EBUILD kompare-20.12.3.ebuild 1104 BLAKE2B cc51573e668ab56785bc8a46edbe84668f9f6c3c0b041a840372f4b27e0e47816c1606d0975b771c351813a147848a979b9ee17258d813dbb0589851c7e221b4 SHA512 842045ca7c6226a779367c9249af471fb17a09ae2293661e4220c5b821b3532418cbadf04ad802f9f2830d97db203e2b961fa0a56fd037f45ae8c71fdf79f71f
+DIST kompare-21.04.0.tar.xz 927076 BLAKE2B 148d4f68d5d28285dc94f2a953d6cfe7ce36c0809275f5f244b2ef7cbd5664862ff322f2889b083cfa0ff8df70ddb374b4c446b8fa97ceef3b76f8068f005c5a SHA512 e42f8b5a8d5b90f283d9f8bc8dc00143725198198996f9d96e38619a632e26eee18da7b4b05fb827fdd1b85fc84f4ea53f96673289eff9db7fba1480936707a4
+EBUILD kompare-20.12.3.ebuild 1101 BLAKE2B c76e8d58ab8490faded364adb0cfc0546c23d9a6c57dc1f47613a14382596aef6eccd02b73c9ed1b7ddb10f601e7414773aa44058d29687e01d270133b75aa9b SHA512 6e7ae3db3fc0005fe02a4de048e25475b25e347b8b74201e3eb21f475eeb0cc5b6f2bd107a52077ea944f3dc10f211baace3deef8333bdfb4004edfeb16e7485
+EBUILD kompare-21.04.0.ebuild 1104 BLAKE2B 0761a5d0df2b931b1c57475925f257030d96624e0d4b2ae58cf7ab2e941f99b7bebbcc50baa932ccbab98615a53da83ad62b9531f93335c9e8227175bc28abd1 SHA512 1b9a390b27ff33a52864e433a2aa689153e8a4b3797b27c4ab3b8976380a4358d4a925f15ae10d06499071ced39c2be01ed28e3555b2375427b5f7a53b7c598d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index c29f957d70d8..000000000000
--- a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 68d3eee36c48a2f44ccfd3f9e5a36311b829104b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Thu, 17 Sep 2020 22:12:57 +0300
-Subject: [PATCH] Portaway from Obsolete methods of QPrinter
-
-setOrientation -> setPageOrientation
-QPrinter::Landscape -> QPageLayout::Landscape
----
- komparepart/kompare_part.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp
-index 42d3120..88346d6 100644
---- a/komparepart/kompare_part.cpp
-+++ b/komparepart/kompare_part.cpp
-@@ -26,6 +26,7 @@
- #include <QMenu>
- #include <QPainter>
- #include <QPrinter>
-+#include <QPageLayout>
- #include <QPrintDialog>
- #include <QPrintPreviewDialog>
- #include <QTemporaryDir>
-@@ -610,7 +611,7 @@ void KomparePart::saveDiff()
- void KomparePart::slotFilePrint()
- {
-     QPrinter printer;
--    printer.setOrientation(QPrinter::Landscape);
-+    printer.setPageOrientation(QPageLayout::Landscape);
-     QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
- 
-     if (dlg->exec() == QDialog::Accepted)
-@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint()
- void KomparePart::slotFilePrintPreview()
- {
-     QPrinter printer;
--    printer.setOrientation(QPrinter::Landscape);
-+    printer.setPageOrientation(QPageLayout::Landscape);
-     QPrintPreviewDialog dlg(&printer);
- 
-     connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);
--- 
-GitLab
-
diff --git a/kde-apps/kompare/kompare-20.12.3.ebuild b/kde-apps/kompare/kompare-20.12.3.ebuild
index fb71bb9713db..e147328a32f9 100644
--- a/kde-apps/kompare/kompare-20.12.3.ebuild
+++ b/kde-apps/kompare/kompare-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kompare"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-20.08.3.ebuild b/kde-apps/kompare/kompare-21.04.0.ebuild
index bd56709d12e2..703c079bcb2d 100644
--- a/kde-apps/kompare/kompare-20.08.3.ebuild
+++ b/kde-apps/kompare/kompare-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A program to view the differences between files"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kompare"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -38,5 +38,3 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )