gentoo resync : 03.09.2021

3 files changed, 35 insertions, 8 deletions

diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 7550b72a6784..540af7470156 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,6 @@
+AUX kde-gtk-config-5.22.5-drop-gtk2-dep.patch 805 BLAKE2B 262b3d6e644b592d3323609e8958c189b217663a0e6653c82aad57ea85c266d068dd0d4166a2327c33a325fc251549a8eee2c26a45a8fd21800f14a0e2b05ef6 SHA512 8e418333f286f7eb74a6bea42d6c63794ff58520c17b51a0eb5436d753f8af727515db45e12d07bb393a2e0ea4b8562830f6e0708bd0eb2285c8f839e025591c
 DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
-DIST kde-gtk-config-5.22.4.tar.xz 70832 BLAKE2B d77ed9afd5eeb73a98658e35a8f224589663addccf91fa167ce91afb7b0ecec15f3f9ae653038c23af4c584089aa648d17d251f100a863fc915ab31da8827895 SHA512 9fea6564d9d6ee03888c6c34002a0e387c573237a834bb5ecad28b317543744a9d4ae71d7c656fea76f738e29c13fd8c11f9beb6c03bb2f21bba1d7fa9fd72a1
+DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
 EBUILD kde-gtk-config-5.21.5.ebuild 1281 BLAKE2B 2966bfa66ca1bf58a298d8cd04e4db5052f6873aeffe865c502d3c9c1e0a2387c1d3c41c7837abe973a30b0747f5dde95126e3b74c03b3628e8ce7687e0ff0c7 SHA512 89e9a85aeb731f66987f267dbc810650a11b34d45a60458106fc6b4f3e8ecf592086fc679c3de83777b3335fd5c01668ef577f746a37b2d71e61ffed9a6a86b5
-EBUILD kde-gtk-config-5.22.4.ebuild 1291 BLAKE2B 7cc680376104a38f519cd385b2d13d78690a08e33e8d6eb845d0ef371829a8cc63df47c69c653b2559ea168eec2524b1ca43d5c662af7270ae135f37173f393e SHA512 ff9e7053758afe6ac7b1dffad2bd6d45b2b859554e243fe8662ac2e02a68b1cff2178e9692dc4c31c463095798a42ecfb3d6c8db251dacd370dce9ec0e8c6ac5
+EBUILD kde-gtk-config-5.22.5.ebuild 1344 BLAKE2B d520962f5b33fa7a80e107d1d9eed69e5f9bb6342cb32507150d646ab69447da1f3c4dfad2e2e552e15a80600ce1c01fb431f4e687485a6e9194efdb5594fa6e SHA512 f5f659199b68db49ce55329fb50a55527aec97c1764aeab3dbdeea5d032e666dba9c6e8fe6e797ad531b477bac9ebdb793a7a25bc0335c48f20f4cbae70cd18c
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
new file mode 100644
index 000000000000..77831e3ebb21
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
@@ -0,0 +1,25 @@
+From 090cfb2db4bc9c032cd7a7c12cf2a317c248e3c6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 2 Aug 2021 13:52:38 +0200
+Subject: [PATCH] Drop unused dependency on gtk+-2.0
+
+FWICT it's not actually used anywhere.
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45d02ef..f102642 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,6 @@ find_package(Sass REQUIRED)
+ find_package(XSettingsd)
+ 
+ pkg_check_modules(GTK+3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+-pkg_check_modules(GTK+2 REQUIRED IMPORTED_TARGET gtk+-2.0)
+ pkg_check_modules(GLib2 REQUIRED IMPORTED_TARGET glib-2.0)
+ pkg_check_modules(GObject REQUIRED IMPORTED_TARGET gobject-2.0)
+ pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+-- 
+GitLab
+
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
index 7e2fb65d39fd..cc51bfaa8ff2 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
@@ -9,7 +9,7 @@ QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
 HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
@@ -17,9 +17,6 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-BDEPEND="
-	dev-lang/sassc
-"
 DEPEND="
 	dev-cpp/glibmm:2
 	dev-libs/glib:2
@@ -33,13 +30,17 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/gtk+:2
 	x11-libs/gtk+:3
 "
 RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 	x11-misc/xsettingsd
 "
+BDEPEND="
+	dev-lang/sassc
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.22.5-drop-gtk2-dep.patch" )
 
 src_configure() {
 	local mycmakeargs=(