gentoo resync : 25.11.2020

4 files changed, 6 insertions, 106 deletions

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 5e9f978adc26..a00bbf2a95eb 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,3 @@
-AUX yakuake-20.04.3-fix-fullscreen-mode-regression.patch 1256 BLAKE2B aba9e6e4be68bbf49050f5fd61ff28aed4e639dac28fbe2b2dd18ff62671984c388680215338c426175fbd59d6646d203d78cc76dc166c38a5df7f097a05ebb9 SHA512 8e5ac666093d6bf78467b78f750e317a5dd18f40cf5d9fc911a0a4e5fc34e0e92b692eaf6e61caf06c12c7e1b8be12fb8003fd60b757822b3ccd193c121f01a8
-DIST yakuake-20.04.3.tar.xz 374280 BLAKE2B aa53e81af0e77a74ac637d185108341b89ec82ff94dcbc3f3cb0a6a8916cb3b7bcd48bad4d127c073de7f6788a38ae7c8a8c4092aaa72ce9d405e7214ea7342a SHA512 a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658
-DIST yakuake-20.08.1.tar.xz 380344 BLAKE2B 918cbbca10f0fb91cf458220dc55cf866209355a7bb0d57ed4fee09a954409db56fc08ce72327d5090475b5a4c94a60f067a917ebeed6063db0fad9f8456388b SHA512 6644bfd728929eefa2ce488f1e31729c89229f09b6b00ac2317974da6ebfe95b5db9fe5a2987e530fadb4cc0cb9a90142e016df2c9623c7ab3d0599c0d5202b9
-EBUILD yakuake-20.04.3-r1.ebuild 1647 BLAKE2B 5c62f1286f7345d41efb89ea1b73ee9e5d230bd85018851064bd4d279df63ea44b1d9c6124dfd68dbdd8e900acb30eb2a33d88d76c6fd656827a233b5010b582 SHA512 6e1bfc6048c7fa5fc6414b288c3222b94a6767f631b9a70649c5d47137473830c559eaa69b402299396ed887d0c9bee5eb077301e26be2b0f8cc50f77b638335
-EBUILD yakuake-20.08.1.ebuild 1568 BLAKE2B e339e69435f20f11922c82a3210a5ea30ce02338eb974f7c7aa30ef68e29ffdc94067543cd073ec2a1f9483192fc0cd0ba33a949665e63ae34d9ec32f996ff74 SHA512 828815417f89ed05b3f34bdf07ddbeeba2d5c94e14c236bdb344cd1d3e6b56ee6c41b82639bc68172e15210585db03928eb82ebf30342a10e00104791fa53c5d
+DIST yakuake-20.08.3.tar.xz 381328 BLAKE2B 645538055977d42c37cb18d03c4512b9b11b6a289dbdea4f635348fff05e991e600e775e43f7968bb3a516fadc0f75abb6d8c07475adab3e29dfdea7fbfb03c1 SHA512 54cab72921686165047bd5dc8cc3052be90a75b3afc4aa81846f44cb074dcfba248eac26638e21252681ed272810dd5822dce9e031dc736d19eeda25bba3fc7c
+EBUILD yakuake-20.08.3.ebuild 1545 BLAKE2B 8e86f89bb721f9f1ee43872c39e6f62ac22907e88f2b3a05d10dbf8b3b371385c4c8a1d2a52c51dceaed8954a695c9b3762c2b141905d35deda21ce3a7a72fe3 SHA512 f15eed237b50505c834e2bb97b71d436bfbbd2b9100c0178fbf9d7d793ed5b8058cb0530f337a66525d3c2786ca4720b58d0076c7ff3b6d39f8014542a8553e0
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
deleted file mode 100644
index 21b26ab00916..000000000000
--- a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 21b2d50d4c23cd375acda57ed03af288ae0651af Mon Sep 17 00:00:00 2001
-From: Anton Karmanov <bergertroll@insiberia.net>
-Date: Thu, 16 Jul 2020 23:34:16 +0500
-Subject: [PATCH] Fix fullscreen mode regression
-
-BUG: 424286
-(cherry picked from commit 946ecc7fb569244f78f8658148b3bef9911a5af4)
----
- app/mainwindow.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index d8303bd..2d22a9d 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -1136,14 +1136,13 @@ void MainWindow::wmActiveWindowChanged()
- 
- void MainWindow::changeEvent(QEvent* event)
- {
--    if (event->type() == QEvent::WindowStateChange)
--    {
--        if ((windowState() & Qt::WindowMaximized))
--        {
-+    if (event->type() == QEvent::WindowStateChange && !m_isFullscreen) {
-+        if (windowState().testFlag(Qt::WindowMaximized)) {
-             // Don't alter settings to new size so unmaximizing restores previous geometry.
-             setWindowGeometry(100, 100, Settings::position());
-             setWindowState(Qt::WindowMaximized);
--        } else {
-+        }
-+        else {
-             setWindowGeometry(Settings::width(), Settings::height(), Settings::position());
-         }
-     }
--- 
-GitLab
-
diff --git a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
deleted file mode 100644
index 1561b1597e60..000000000000
--- a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="absolute-position X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-fullscreen-mode-regression.patch ) # bug 736858
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package absolute-position KF5Wayland)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/yakuake/yakuake-20.08.1.ebuild b/kde-apps/yakuake/yakuake-20.08.3.ebuild
index 2176cd969a53..33829c4f9169 100644
--- a/kde-apps/yakuake/yakuake-20.08.1.ebuild
+++ b/kde-apps/yakuake/yakuake-20.08.3.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
+HOMEPAGE="https://apps.kde.org/en/yakuake"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="absolute-position X"
 
 DEPEND="