gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 92 insertions, 21 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 97cb874a1bd8..0c8b4e74137c 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,7 +1,7 @@
 AUX 38919a88b2b8381f5b24b69742d1b9db32029c61.patch 724 BLAKE2B aa7739b0e333d887b39e89f7774b016b6aa9339b37682861f852d354554ccdbe52cc9c9bc50bb612731e4f9a371b749729758d9ab8072ab0d5f282f46c4c697f SHA512 5f96534e613356453a9e060c0145d55db3737812e5094568819c031ced6e2c8c41583ac208b38a664d42302cb94031d20154764628cae05348d20362b91d0ffe
-DIST muffin-5.8.1.tar.gz 4519174 BLAKE2B 29269c641e28117f9dd0900dc129aca21c8834058e6b3168b2d44e0ecafba0b177ba214c82337f3120512f4433d6117781685f422a57a244edbfa8748a5ae661 SHA512 bf8e5cdc789ac8a2d1f616a751bf321209b13e3936b483d46370017c58a4b9ebd10b42a71e8691a42f013a0c44250e4a84549d9c5cf120d3382f61aa6040710b
 DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af
-EBUILD muffin-5.8.1.ebuild 3076 BLAKE2B 3deaa21d00b8cb78f8d7c29325f683e67ba8f3c5fdd0e49a7106765ec1710f59468dada59db1b96cd9d0e8b51d986ff27eb096c5b08d0db883d717cce7427b65 SHA512 7a3c6409c4b915c42a2b67f11426e5be6762365346093e9ba99b36d4f69279156e05cf1c04a62c5a44205e13bddaeb8adea5203cd32040a3b9c06e46c98612f5
-EBUILD muffin-6.0.1-r1.ebuild 4101 BLAKE2B d7629f62e5888b83c2df2ea0f87cc929e46836adee876ac773b8ccc3c1645b2d3ceec97069b9d6a0b1d3527277fb29b1427db50cc011201301bb47b281302a6d SHA512 d7532f2f7f15cf1bd780f3a1070400f8cdcfb661cd832f412538124e243ee63c2ec82c850a65b1bab550916d472a1d4f5cb92a98b9f62869490be630e0319477
-EBUILD muffin-6.0.1-r2.ebuild 4297 BLAKE2B bd26540c2925164814508a9eaadd09eb45be0fe4da5c9edaddd0d067a83b10fa17438c51da7bf232de8f00acdb783f144c470ad1211eaa1025609791eac5f69b SHA512 c33d614101b74179e115678a7a067fd40378cfc135cae5d506701bb2b8cbb2073af63ae07700a20bf7d5761fa319567f4c050f0dcf11d2f9c3815c01208e8490
+DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193
+EBUILD muffin-6.0.1-r1.ebuild 4205 BLAKE2B bdca08916127ec6dbcb1fc9ad02a74939a1ecd2b8b02413f7c940c0762399d0c7184c2ce39053ab58052bd8cc743947076f5ca989f8c9d41921dca6c9501ed9e SHA512 e2f0708967f1f8bc89f8763c9527c865da9e84465f51e88d4cb13da9659d18472c4da72c829f20844242c0443d8b33b497ed47554436e7eb78ba1d25ba575227
+EBUILD muffin-6.0.1-r2.ebuild 4400 BLAKE2B 3a0acd85ae136f7bc78a6fbe4362a94b251b2ed860e8200024ac4b2af2c1e7c25384d0a8ecb82ae38045517725965c9b9fa1910f294fa3d53d1b965c5d0aab66 SHA512 6697ac6e9cd504538e2830d58fa1451e4fa5367b693278304b2a850a90867f743a88b8f4aa0d219ae7fa49eeeb545cf9b5c3a73c199a9290dcfa7e2e692eec5d
+EBUILD muffin-6.2.0.ebuild 4207 BLAKE2B 0fd1e8390653e7cee50af5a5c7f45d33a0e4b2fcc3e7dd40f05bada17be9951e3080aedd90662ddce2b72e005ddd6b9ca491e43a3be4f805c1c243a43f00264c SHA512 0322e44c9667f3ae1820bb32923ba39715edaaaeae9cde5c6913d2a2063562a6029d874f79e143d6750caedd35f6d69b763afd26f828466db811819012e0a189
 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/muffin-6.0.1-r1.ebuild b/x11-wm/muffin/muffin-6.0.1-r1.ebuild
index 92298d7401d7..c7d7979e68da 100644
--- a/x11-wm/muffin/muffin-6.0.1-r1.ebuild
+++ b/x11-wm/muffin/muffin-6.0.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit gnome2-utils meson python-any-r1 virtualx
+inherit flag-o-matic gnome2-utils meson python-any-r1 virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
@@ -157,6 +157,10 @@ src_configure() {
 		)
 	fi
 
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/933879
+	use wayland && filter-lto
+
 	meson_src_configure
 }
 
diff --git a/x11-wm/muffin/muffin-6.0.1-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
index a367d3802f64..881c52c194a2 100644
--- a/x11-wm/muffin/muffin-6.0.1-r2.ebuild
+++ b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit gnome2-utils meson python-any-r1 virtualx
+inherit flag-o-matic gnome2-utils meson python-any-r1 virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
 SLOT="0"
 IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 REQUIRED_USE="wayland? ( udev )"
 
 # Dependencies listed in meson order
@@ -164,6 +164,10 @@ src_configure() {
 		)
 	fi
 
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/933879
+	use wayland && filter-lto
+
 	meson_src_configure
 }
 
diff --git a/x11-wm/muffin/muffin-5.8.1.ebuild b/x11-wm/muffin/muffin-6.2.0.ebuild
index 085378b182d5..30fc4b7ff295 100644
--- a/x11-wm/muffin/muffin-5.8.1.ebuild
+++ b/x11-wm/muffin/muffin-6.2.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit gnome2-utils meson virtualx
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic gnome2-utils meson python-any-r1 virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
@@ -11,8 +13,9 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
 SLOT="0"
-IUSE="input_devices_wacom +introspection screencast sysprof test udev"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+REQUIRED_USE="wayland? ( udev )"
 
 # Dependencies listed in meson order
 COMDEPEND="
@@ -25,7 +28,7 @@ COMDEPEND="
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.61.1:2
 	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=gnome-extra/cinnamon-desktop-5.8:0=
+	>=gnome-extra/cinnamon-desktop-6.2:0=
 	>=x11-libs/libXcomposite-0.4
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -51,12 +54,43 @@ COMDEPEND="
 	>=x11-libs/startup-notification-0.7
 	media-libs/fontconfig
 
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.41.3:= )
-	screencast? ( >=media-video/pipewire-0.3.0:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
-	udev? ( >=virtual/libudev-228:=
-	        >=dev-libs/libgudev-232 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.13:=
+	)
+	introspection? (
+		>=dev-libs/gobject-introspection-1.41.3:=
+	)
+	screencast? (
+		>=media-video/pipewire-0.3.0:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.35.2:3
+	)
+	udev? (
+		>=virtual/libudev-228:=
+		>=dev-libs/libgudev-232
+	)
+	wayland? (
+		>=dev-libs/libinput-1.7:=
+		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-protocols-1.19
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gbm(+),gles2]
+		)
+		x11-base/xwayland
+		x11-libs/libdrm
+
+		systemd? (
+			sys-apps/systemd
+		)
+		!systemd? (
+			sys-auth/elogind
+		)
+		video_cards_nvidia? (
+			gui-libs/egl-wayland
+		)
+	)
 "
 RDEPEND="${COMDEPEND}
 	gnome-extra/zenity
@@ -64,24 +98,40 @@ RDEPEND="${COMDEPEND}
 DEPEND="${COMDEPEND}
 	x11-base/xorg-proto
 
-	sysprof? ( dev-util/sysprof-common )
+	sysprof? (
+		dev-util/sysprof-common
+	)
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	sys-devel/gettext
 	virtual/pkgconfig
+
+	wayland? (
+		dev-util/wayland-scanner
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
 "
 
+src_prepare() {
+	default
+	python_fix_shebang src/backends/native/gen-default-modes.py
+}
+
 # Wayland is not supported upstream.
 src_configure() {
 	local emesonargs=(
 		-Dopengl=true
 		#opengl_libname
 		#gles2_libname
-		-Dgles2=false # wayland
+		$(meson_use wayland gles2)
 		-Degl=true
 		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
 		$(meson_use screencast remote_desktop)
 		$(meson_use udev)
 		$(meson_use input_devices_wacom libwacom)
@@ -91,6 +141,8 @@ src_configure() {
 		$(meson_use introspection)
 		$(meson_use test cogl_tests)
 		$(meson_use test clutter_tests)
+		# Wayland/Core tests cause issues. They attempt to access video hardware
+		# and leave /tmp/.X#-lock files behind.
 		-Dcore_tests=false # wayland
 		$(meson_use test tests)
 		$(meson_use sysprof profiler)
@@ -98,6 +150,17 @@ src_configure() {
 		#verbose
 	)
 
+	if use wayland; then
+		emesonargs+=(
+			$(meson_use video_cards_nvidia egl_device)
+			$(meson_use video_cards_nvidia wayland_eglstream)
+		)
+	fi
+
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/933879
+	use wayland && filter-lto
+
 	meson_src_configure
 }