gentoo resync : 12.05.2022

3 files changed, 7 insertions, 48 deletions

diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 397bd87dfa1e..cf522e9c2570 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,6 +1,5 @@
-AUX qt-5.14.patch 1037 BLAKE2B a6169aa7146a7e387cfba090177dea98a42d2311fd912deff98926b57f48c86bb39fa48ede81438a735f96de28eae0ec8e41f54641f03f9e67d06f7effda66ce SHA512 8c25af73914b2070aea45c173aad5f4a833e861d734d1d449d28ed595c542c001430af7f324489c6cc895adb7e580d98f41300c6d292eaa3ef3eb8148c3c4abb
-DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64
 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4
-EBUILD kdocker-5.2.ebuild 1023 BLAKE2B d6820c8191514cfeef8c0c73682a939cb3efec366d4404a923a50072264c721e6514adf6f9832c9c23598ffd65f28202c8317a06e7b29c627d4afd4df0040888 SHA512 4d7d54c4d3cd5ec9b74b29946dd53c89b296b89c0edc95cd4002a3fafa08b7dd3702ac34982366dc50ea6447bbcd43ae8dfc5fe23384ce0ef7e54247e3587598
+DIST KDocker-5.4.tar.gz 181166 BLAKE2B 7a301cd36f73112f5a6df6ce65fc11c30b16089ccec98f46d435694b2bfb373eac11c2ba3be5c4e56a56cec1f5fad9bc17b014e47e55f886f0685b6f11707c51 SHA512 1bc1bc445ccc2406f3fe21deb68d9654b3d384ab88bce4bc49f123c343ece3dcc3dfdc49b796f6ad5251d050e57b4ad13e1900851519b3643263137550f0ccc9
 EBUILD kdocker-5.3.ebuild 1073 BLAKE2B 1979ffc81ae80841482d2d3f0f93caec50328d82da0720f003aebde1091fa29915d98454347ba73a41c9cbafad4de0e3b4debdd310810aaa14f0a98e465498aa SHA512 d34c62df4bc2aeef10d8a2d0d3a0e60d9bf87218494edffb934f54f471868970490a48f150ecad1c6235663354897e15db88ab3e2d42d31d75302515783e56ab
+EBUILD kdocker-5.4.ebuild 1075 BLAKE2B 85bc8acf0291bfd65f812ba4242d459e9cd63c31f02952ab4fbd7a0f0b79fde2fc3fb6477033c451406a19c76f0232ee71491a01a96d76286227e63c80ab099c SHA512 3c94f3e8ffcf2401769a131bfb8ac7345827eda4935448656d6406f0c761dfc35d48495ce71ce534b466d57b3342f1edfd2fc2e0480c970cd07b8870396b4d2a
 MISC metadata.xml 544 BLAKE2B 0386399b06d64844dbeee3869c803b2004396b9be3c3ac7908ab827d1a9044590a9154a6943216b70ce268abf1795f946a57b6f5e427bd7e771693a84e9f285c SHA512 39791bda5ee40d7b229c27a68e4e4f14ed412ac97d2369df090295ee7c1bf4d6f48b4e657b2abe393eafc02335652f38dc09f110382b7b3e9fe7efdcb6e22319
diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch
deleted file mode 100644
index ca1237965aaf..000000000000
--- a/x11-misc/kdocker/files/qt-5.14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001
-From: Nikos Chantziaras <realnc@gmail.com>
-Date: Mon, 30 Dec 2019 16:03:16 +0200
-Subject: [PATCH] Fix building with Qt 5.14
-
-Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a
-'None' macro. Work around the resulting mess by temporarily undefining the
-macro.
----
- src/trayitem.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/trayitem.h b/src/trayitem.h
-index 7698ea4..4b54cdd 100644
---- a/src/trayitem.h
-+++ b/src/trayitem.h
-@@ -21,6 +21,10 @@
- #ifndef _TRAYITEM_H
- #define	_TRAYITEM_H
- 
-+// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro.
-+#pragma push_macro("None")
-+#undef None
-+
- #include <QAction>
- #include <QEvent>
- #include <QIcon>
-@@ -32,6 +36,10 @@
- 
- #include "xlibutil.h"
- 
-+#ifndef None
-+#pragma pop_macro("None")
-+#endif
-+
- #define DEFAULT_CustomIcon        QString()
- #define DEFAULT_BalloonTimeout    4000       // 4 seconds
- #define DEFAULT_SkipTaskbar       false
diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.4.ebuild
index e75cbf9228cc..43d293885e65 100644
--- a/x11-misc/kdocker/kdocker-5.2.ebuild
+++ b/x11-misc/kdocker/kdocker-5.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 qmake-utils xdg
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,10 +29,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
 
-PATCHES=(
-	"${FILESDIR}"/qt-5.14.patch
-)
-
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -40,6 +36,8 @@ src_prepare() {
 
 	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
 		kdocker.pro || die "sed failed"
+	sed -i -e 's|/usr/share/appdata|/usr/share/metainfo|g' kdocker.pro \
+		|| die "sed failed"
 }
 
 src_configure() {