gentoo auto-resync : 07:06:2024 - 00:08:01

3 files changed, 4 insertions, 149 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 37a13251974f..5899320aa01e 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,6 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
 DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
-DIST kwin-6.0.90.1-5911940b.tar.gz 12853855 BLAKE2B ae53517540867ad96c1daa2184afda371a731b35be23298e80cd87b005254ff798e9f2e424ca648ac11f78ed16a7e16b54252550cc32d86a4195439f478c7585 SHA512 6bfba3fdb4cc5a282409311958bfa7c8459ac990399bdf40d76a1a340c13c99861a63cea479a76324a95c9cf064fb7a62289280c21f6c2073c9bbe90e666898a
-DIST kwin-6.0.90.1.tar.xz 8474872 BLAKE2B eb9a2b326b3335a47fb3f57da213d48fbeb949062b7663801287e70eac0a9566ae9cebd7f242b807de76ba53208a1548c427ea379ce1e72e6ec428146356c5d8 SHA512 cf924f792184cb591c14b15f80b0533a62e7a032c8f9ad45b3faf30048826e5fcb41e90ddf582615531d4694bb817cafd615556d5f38530f42a9747f818c92a4
+DIST kwin-6.0.90.1-1d936cf6.tar.gz 12855197 BLAKE2B b416f7ea4bf8f90289d7a6c0cb2b38ac28080b3c0bfc8a230047ad9852295d45aff36d887023344c8708c3ce11ada2b33234eda41d692f2486ab3998347e107d SHA512 0a50a6a6c4518b296d6a5c18d3f4548844e9dd60722be8c1c9f4cda3c6a5ce4a3c416f6e3f90d0a8dc7ffcf6cc1d4dc58dee67b8530933c66e7083dd6fd453a5
 EBUILD kwin-5.27.11-r1.ebuild 4305 BLAKE2B f6aacf67667be303f5bf6cf328a186f113d458560f6438c65ec1e0ea12b47d4585ac9abcb510cf817c99fd00685e2de2cf6b2b1a7e2647e0d888c4b0923e1beb SHA512 ce094346e507377f8b1d3e30ed2154886ea3195aeaf5790331e7f0e8f963841837363ab353e70b73bf1ea70b189743121c5bdf53447ba42ae815dddfabe24fea
-EBUILD kwin-6.0.90.1-r1.ebuild 4293 BLAKE2B 4db836b8e8283e64033e8d96653e5f64626c653bb9f66fe0a435d5ad727ec880aab09d9a82e9dfd531f86c02b2a93511f68dafafc85d266fb2f0576b5fc7a5d6 SHA512 f86695e18c3c96ead0444e24e52a23b015c187787438a0217d10c90ffb1ea9e199dfdc2a69629a3da1965154899622ee5d468e8bd1600e024b97e38db3f90f3c
-EBUILD kwin-6.0.90.1.ebuild 4159 BLAKE2B bb728185778b60e65ec79d1bcf16df436bf646a3e24d97ac77693847db99822dc5f511e1c51dd8f5f6854fd9e56a28ada973482bc089288dc615b4176e1f89cd SHA512 b57524853b97b16f244298773cb511205e49764acbb3ee6798bc3aa8ccf510dc4f984f680da84ffff5dbdfa56d5ada46f90d2a1768cbf631a88a4f9d4f4a97a5
+EBUILD kwin-6.0.90.1-r2.ebuild 4293 BLAKE2B 9fea4273f10274e97fe275820213826a3ab7102cc3b19745f495e84569dbd902c43efa6858c354cf99de6f668942da58046c92d460e3375560f47a193ab3893b SHA512 2162e92b3c35926d3d82dc2c9dad063585fe623db8848cdc86da7e5c8ae06f9d016182789c15e01282afe49a0ede3400ec3bcb672ff8db91a1e5f9d852f7d1c4
 MISC metadata.xml 705 BLAKE2B 996b365c3536e5bdaf8487b2f736a31625b84497af81c3b8fa8bf46a585004f426f8bdc22a3a430936e03694a1222dd0a89789df769ef650c0d8da25bf263cd7 SHA512 569c589a88ac23dc869a6487459bd46711dc2b92c1f1cf5d19879fb363b52b76faf7d8c5805f0a9d5a13a3ab4f9f316d732e6ae475d63a950d56ad65c2f05fa4
diff --git a/kde-plasma/kwin/kwin-6.0.90.1-r1.ebuild b/kde-plasma/kwin/kwin-6.0.90.1-r2.ebuild
index 092c6ebce369..bc76a4929a03 100644
--- a/kde-plasma/kwin/kwin-6.0.90.1-r1.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.90.1-r2.ebuild
@@ -11,8 +11,8 @@ QTMIN=6.7.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}-5911940b.tar.gz"
-S="${WORKDIR}/${PN}-5911940b282834c7d6cb8d84e33fd7b07284db8e"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}-1d936cf6.tar.gz"
+S="${WORKDIR}/${PN}-1d936cf69d83f2b0ee770376d86f508b16757382"
 
 LICENSE="GPL-2+"
 SLOT="6"
diff --git a/kde-plasma/kwin/kwin-6.0.90.1.ebuild b/kde-plasma/kwin/kwin-6.0.90.1.ebuild
deleted file mode 100644
index b571a098fece..000000000000
--- a/kde-plasma/kwin/kwin-6.0.90.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.2.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.1
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
-
-RESTRICT="test"
-
-# qtbase slot up: GuiPrivate use in tabbox
-COMMON_DEPEND="
-	dev-libs/libei
-	>=dev-libs/libinput-1.19:=
-	>=dev-libs/wayland-1.22.0
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsensors-${QTMIN}:6
-	>=dev-qt/qtshadertools-${QTMIN}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdeclarative-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
-	>=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kpackage-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ksvg-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-plasma/breeze-${PVCUT}:6
-	>=kde-plasma/kdecoration-${PVCUT}:6
-	>=kde-plasma/kwayland-${PVCUT}:6
-	>=kde-plasma/plasma-activities-${PVCUT}:6
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libdisplay-info
-	media-libs/libepoxy
-	media-libs/libglvnd
-	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	>=x11-libs/libdrm-2.4.116
-	>=x11-libs/libxcb-1.10:=
-	>=x11-libs/libxcvt-0.1.1
-	>=x11-libs/libxkbcommon-1.5.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:6 )
-	gles2-only? ( || (
-		>=media-libs/mesa-24.1.0_rc1[opengl]
-		<media-libs/mesa-24.1.0_rc1[gles2]
-	) )
-	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-	shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kdeplasma-addons:5
-	!kde-plasma/kwayland-server
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	|| (
-		dev-qt/qtmultimedia:6[ffmpeg]
-		(
-			dev-qt/qtmultimedia:6[gstreamer]
-			media-plugins/gst-plugins-soup:1.0
-		)
-	)
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-plasma/libplasma-${PVCUT}:6[wayland]
-	sys-apps/hwdata
-	x11-base/xwayland[libei]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.11.1
-	>=dev-libs/wayland-protocols-1.34
-	>=dev-qt/qttools-${QTMIN}:6[widgets]
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-	>=dev-qt/qtwayland-${QTMIN}:6
-	x11-base/xorg-proto
-	x11-libs/xcb-util-image
-	caps? ( sys-libs/libcap )
-	test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use systemd; then
-		sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: KWIN_BUILD_X11?
-		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
-		$(cmake_use_find_package accessibility QAccessibilityClient6)
-		$(cmake_use_find_package caps Libcap)
-		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
-		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
-	)
-
-	ecm_src_configure
-}