gentoo auto-resync : 15:08:2022 - 14:28:19

3 files changed, 2 insertions, 141 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 288de4d4305f..2eb81705479f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -5,7 +5,6 @@ AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed3313
 AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a5682eab739f99f86fdcbffb6577f9cfdffd815c32f58cb7b891c2305c7ddce20fa5456524061f51f3084a77e6d64d0ff81ddc79fb SHA512 54cfcc6f72151787c7b22efb629dfbbd8e5af1b05567071b3aa2f11caf3c65295127e5fa1529763157971f6d707c4078c28d9cddd5bb0f244b774f20a734e08c
 DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
 DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
-EBUILD kwin-5.24.6-r1.ebuild 4126 BLAKE2B 4f12925511011887954c13882f644182eb24dbbe9c39d58974be95565afdfa48b8d770f382b614a7a45439cdce8c1c2229ed2b486aa4c7724a8c352bfd87a7f6 SHA512 79bba7223739f8b61744feaead7eca554d526e0d1c8e84e61c2f1f73d05c645767221ecd77a6e292f0c9bb97da9734faaeafb01c92aa51e2d5cafb25d6c724c1
-EBUILD kwin-5.24.6-r2.ebuild 4195 BLAKE2B c95c12883354b609eb02576436b78e8c9c2e2d2695914d31df7b70e58fe0e33eebf248d42420383c448d0475b317c3e5435c7d8f05990ff199836fbb1f15265d SHA512 4132d9925e77412eaca7946a6ddb08552411a4d52215f0e8c6ef41fb636fb47d7beb53b8859b853c8c423813caf5f3fe3049354528328e346e221b0e537126a7
+EBUILD kwin-5.24.6-r2.ebuild 4194 BLAKE2B fdb0bd8025961424f53a05ce566d6dc91c19d54d2aa81dff98ed5bb4002c5a976917126ba49bf72241d497a37bbd3de04190a3a1f223776f0b8973f72b854ee7 SHA512 35f7bdd1b8679d3bb945a749ffd3a5f88d158ecf592e59ef29b708b6b201f230ca2d9a72a03f5316eebc14136565d9cbfab06f66acc2c2ed9df6437fe094196b
 EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/kwin-5.24.6-r1.ebuild b/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
deleted file mode 100644
index 1bb97a6779dc..000000000000
--- a/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.19
-	>=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/kdbusaddons-${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/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-21.1[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:= )
-"
-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]
-	sys-apps/hwdata
-	x11-base/xwayland
-	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/plasma-wayland-protocols
-		>=dev-libs/wayland-protocols-1.19
-	)
-"
-BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-emit-rowsChanged.patch"
-	"${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974
-)
-
-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.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
index 4a3b51d97304..d5b779a4cc40 100644
--- a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"