gentoo resync : 25.08.2020

5 files changed, 117 insertions, 18 deletions

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index bed55a733c54..44ee9575d982 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,7 @@
-DIST yakuake-19.12.3.tar.xz 372684 BLAKE2B 4fdbe9d342170b485a4b1a4c282842fa746475112a6f259becf9a44bc4494900d8e90a675467b24093c4454c79b236020919d5b9082890378c289994b780b6e0 SHA512 87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7
-DIST yakuake-20.04.2.tar.xz 374448 BLAKE2B faa81e374ce1f2995664aac7f031ac5b25abcac1cec7f9556cc351b4cb006a5d47c228ad1d9fd534f70689f6a979c58dc6f7a06b0e085b6b08363de1313895b0 SHA512 b6a66ac0f228135bcf0dc2062e86e73f9873db21c02ef87882a3aa36c06822c98c0383dc965c567a92f41d330a94d39cf0272814b79782f4f3f87554ee6afedd
-EBUILD yakuake-19.12.3.ebuild 1565 BLAKE2B 74d0bf85697966d1ed25a2e42cb4cc9f7a3255cc36aa81334b20de3016ed6d65479aca0c140c99ae9156240d2df71c51a4fda26143d99e38e481df199c0e3e82 SHA512 7d959974b983a0dd4d4181ba36ffda44a4777b673567338c6fdc83b1f709da32b12ec75aa23e5edc7e4c8fecd29a6d840bfadd150881a6186d62c6d8f207e83b
-EBUILD yakuake-20.04.2.ebuild 1568 BLAKE2B aa9801e49a3e0468c9529256ae1d0eb32af51f9b6e2269a2663c99cf51f66a56b89561c8d1e0e76644893f919e15f8416ebace561e687137ba255ec5774350e3 SHA512 07153ca98f7db8cb776f05a7c524da5447bfea59efb11870232c9496d70a792f74c5b7377be67600eb32a45e33acc0aac61f622d5e19dcf55aa992337b862e81
+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.0.tar.xz 380584 BLAKE2B 7685523c6b719f3c51cd12867a3b6089c823895033c8df6bb106256c846671575a9f60cd523fde6120851d064ada3be385c203b3e97e7c458fc5b0eab16cbfb9 SHA512 9f89bb7294e8c6fd022eeb6acc59e8766093b682108f42190b082ad3033e3a9832e8c2620e0948f1461d2d0a47fc585946e7c9b2e06e51e2666d6f391978fb48
+EBUILD yakuake-20.04.3-r1.ebuild 1649 BLAKE2B 5bbbecc21d8bf461f004a9b27b022f8909efd0155895b1642f4966fc096149949994579607e74f207433be08683bc651c970fb50047f1e33b4d94c4a0dfcd42d SHA512 503f8f3434f5717e2fa1eab9a64aa1c84941112a5106e331cd38752aaa0c5148a61f224fc166ccbdb8a9401c0ba05ff65a1328ad8050efe3cb46b3f9be5825f7
+EBUILD yakuake-20.04.3.ebuild 1565 BLAKE2B 5862fc864d4f3cc096c8df3e69664b95cd2d87705a5d24ae91589634fae7ef3f06631e05c866485dbc0cc9434f3c773b1f9a24dbc17ccf8ba5f83c8d43866e76 SHA512 a84c276f6d538c23bdcef719826a922ca8975b551dea4abfa8a09037dd11802308c37c50d70e9f3ab10ed008f2eebfbf75780c12ec62da9978f2be9ed607939a
+EBUILD yakuake-20.08.0.ebuild 1568 BLAKE2B e339e69435f20f11922c82a3210a5ea30ce02338eb974f7c7aa30ef68e29ffdc94067543cd073ec2a1f9483192fc0cd0ba33a949665e63ae34d9ec32f996ff74 SHA512 828815417f89ed05b3f34bdf07ddbeeba2d5c94e14c236bdb344cd1d3e6b56ee6c41b82639bc68172e15210585db03928eb82ebf30342a10e00104791fa53c5d
 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
new file mode 100644
index 000000000000..21b26ab00916
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000000..8f4fb0b6254f
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-19.12.3.ebuild b/kde-apps/yakuake/yakuake-20.04.3.ebuild
index acc1ce74cb21..1501ddff9a6c 100644
--- a/kde-apps/yakuake/yakuake-19.12.3.ebuild
+++ b/kde-apps/yakuake/yakuake-20.04.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Quake-style terminal emulator based on konsole"
@@ -17,6 +17,11 @@ 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
@@ -35,11 +40,6 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
diff --git a/kde-apps/yakuake/yakuake-20.04.2.ebuild b/kde-apps/yakuake/yakuake-20.08.0.ebuild
index 2a7ba9ef759f..2176cd969a53 100644
--- a/kde-apps/yakuake/yakuake-20.04.2.ebuild
+++ b/kde-apps/yakuake/yakuake-20.08.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Quake-style terminal emulator based on konsole"
@@ -17,6 +17,11 @@ 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
@@ -35,11 +40,6 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5