gentoo auto-resync : 26:04:2024 - 23:59:36

3 files changed, 34 insertions, 25 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 2c4f07cb7bd8..44f7480e791f 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
-DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
-EBUILD weston-11.0.1-r10.ebuild 3651 BLAKE2B ef0b90c3cdb7035d8dd0267813a01b6142d560ccdd90deba71e9e035da155ee9a61a018d7489b12792bfdc29d615bf5bbdf096b01f38c89f11ee5e23f188300e SHA512 800c7006c64faa698688c3d044e4ff7bd7d496abf295c5515994dacc7dc951f0d4e32a181f4f42d5a2305b851f980b1c2ff88f66281fe91fc66beaa87723af19
-EBUILD weston-13.0.0-r2.ebuild 3868 BLAKE2B 64b4ef79a82207ed7526253c1e48bc27a9a727c8357fcc5885d86de27f0760f412dc8f96f9981a66217528363d080583c24014fe06337e60dab98773f5223368 SHA512 fd07eaf7402fe45bc8d196663f0e26a4abac744080b3e268be35b893d3dac132ab8ddc654f5e21342323122e9a47a6ea7ae05c33d19395311ecde20970f033c6
+DIST weston-13.0.1.tar.xz 1986684 BLAKE2B 7910f9b62c2fe92a6915037521024d3682f391727d615b044517e1cc2e157dc78b7571a923b9c6d62c55bf2a532101220d4ffd2ecbb81f984e9676919420576b SHA512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122
+EBUILD weston-13.0.0-r2.ebuild 3870 BLAKE2B aba03b2c525e14beaa9eca730c40ccbb8f6cad60a4fdd05db7a40563b7f032b3ce3120b3399318a0c45197b519d0efd474634789fccb253634672bac206e1771 SHA512 e1c8a9199d4f422a6058ddb802cb68d0456dc82d4eff77d5580e04743bda31779d3a90e263b9e1354c500229572f2151f8822aae8fa796312a8acaa56c409fb1
+EBUILD weston-13.0.1.ebuild 3875 BLAKE2B 07b23c5352ebffc6e68b95e425b4bed1525bd9576fc88be8c37aa2b784cddcd341b21798252e1de6afc4794fa896155962ae19c9b836270fe3447f442a304e23 SHA512 a5c0d79df89b172ab4b82b31a87c9bbadb3eed66c43f9452b164e2b136b00a75f54dbedb984a79a9c721fb673a003d0bfda2fa6770bf63ff5e8c4234be8d7284
 EBUILD weston-9999.ebuild 3868 BLAKE2B 64b4ef79a82207ed7526253c1e48bc27a9a727c8357fcc5885d86de27f0760f412dc8f96f9981a66217528363d080583c24014fe06337e60dab98773f5223368 SHA512 fd07eaf7402fe45bc8d196663f0e26a4abac744080b3e268be35b893d3dac132ab8ddc654f5e21342323122e9a47a6ea7ae05c33d19395311ecde20970f033c6
 MISC metadata.xml 1605 BLAKE2B d4379b28e83de554638a52a2938d3cc57d170ebc0d58a6b5e88cc21c64afc5421e8fa640e7c0e9aa9c8e28861d086a2aabe406b3b1209f3122670edecc3154bd SHA512 0e953c0dfc0174a8f15586d12b56f650bccdcca085c911dd85ae320ed7deb836daf51679a54fece6afdba55ba520074d10275b50f4ed310e55e9aa79eae4cf7a
diff --git a/dev-libs/weston/weston-13.0.0-r2.ebuild b/dev-libs/weston/weston-13.0.0-r2.ebuild
index 002b836d7566..38a6d926b301 100644
--- a/dev-libs/weston/weston-13.0.0-r2.ebuild
+++ b/dev-libs/weston/weston-13.0.0-r2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/weston/weston-11.0.1-r10.ebuild b/dev-libs/weston/weston-13.0.1.ebuild
index 2ed95404301f..071601606aaa 100644
--- a/dev-libs/weston/weston-11.0.1-r10.ebuild
+++ b/dev-libs/weston/weston-13.0.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -18,14 +18,14 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -35,17 +35,14 @@ REQUIRED_USE="
 	screen-sharing? ( rdp )
 	test? ( desktop headless lcms xwayland )
 	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp wayland-compositor X )
-	|| ( seatd systemd )
+	|| ( drm headless rdp vnc wayland-compositor X )
 "
 
 RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.20.0
-	lcms? ( >=media-libs/lcms-2.9:2 )
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
 	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
+	sys-auth/seatd:=
 	>=x11-libs/cairo-1.11.3
 	>=x11-libs/libdrm-2.4.108
 	>=x11-libs/libxkbcommon-0.5.0
@@ -58,21 +55,22 @@ RDEPEND="
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2(+),wayland]
-	)
+	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
 	pipewire? ( >=media-video/pipewire-0.3:= )
 	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
 	remoting? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	seatd? ( sys-auth/seatd:= )
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
 	)
+	webp? ( media-libs/libwebp:0= )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -82,6 +80,7 @@ RDEPEND="
 		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
 	)
 "
 DEPEND="${RDEPEND}
@@ -89,22 +88,33 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-util/wayland-scanner
 	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
 		-Dbackend-drm-screencast-vaapi=false
 		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
 		$(meson_use rdp backend-rdp)
 		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
 		$(meson_use xwayland)
-		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
 		$(meson_use remoting)
 		$(meson_use pipewire)
@@ -113,7 +123,6 @@ src_configure() {
 		$(meson_use ivi shell-ivi)
 		$(meson_use kiosk shell-kiosk)
 		$(meson_use lcms color-management-lcms)
-		$(meson_use systemd launcher-logind)
 		$(meson_use jpeg image-jpeg)
 		$(meson_use webp image-webp)
 		-Dtools=debug,info,terminal