gentoo resync : 01.08.2021

3 files changed, 2 insertions, 138 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 52d35ea977ad..3fb365eaaa6a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
-DIST kwin-5.22.3.tar.xz 6446712 BLAKE2B bcd06261e964736a5a2a504cc9e46750e4be2c2741126f922c46907b123076925470d96f58c1cca33b5ba89b4a24c8400d3959982089c27b7c1b48a0bc6a8efd SHA512 b22e815777888f9f7c673c1b3925b9099cfafc8d41a5e302ffb8bafc1915a9632892af2368f0b9098bee089827628aa42648e4a91c994bc79488002b0e205fec
 DIST kwin-5.22.4.tar.xz 6454932 BLAKE2B fb8a45124d28daff1011995c0e9a29365309afb4c2b6a42d9f9a65e24f5672adf160e0b06a2084d04130fe5ce42ac3fecdfb36e8d02f18eadd916f6d9e69636c SHA512 3be48794b8a6ae1c8b932f1b1e7db74138bd5e1edc32aa86bb6a1f51a109d20d72449d30fddcdca9d026a4c99be564a06a0a5064a51124b8073542ad5c3df8e4
 EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d
-EBUILD kwin-5.22.3.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead
-EBUILD kwin-5.22.4.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead
+EBUILD kwin-5.22.4.ebuild 3970 BLAKE2B f2085c87ea0d549e016750ff85a30ed4a116403745e90c89948454903e7581188580364b5f413fe030e8d3c48e98db6bf5f1d584690f6be1deb7e4788303c214 SHA512 f3c5279c53a951a9f8bb7e30db3db05b6e215aa746d1b11cc001458f13ac0b95d42c5dc2eb2eb61339d4fbe0bd2d8dbd2e6da74382326ac1ead1753c6c66139b
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.22.3.ebuild b/kde-plasma/kwin/kwin-5.22.3.ebuild
deleted file mode 100644
index 5042d737e0ee..000000000000
--- a/kde-plasma/kwin/kwin-5.22.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.22.4.ebuild b/kde-plasma/kwin/kwin-5.22.4.ebuild
index 5042d737e0ee..44d95b984762 100644
--- a/kde-plasma/kwin/kwin-5.22.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.4.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	media-libs/freetype
 	media-libs/lcms:2
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
+	media-libs/mesa[egl(+),gbm(+),wayland,X(+)]
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi