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

17 files changed, 200 insertions, 84 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0b1e948374e3..43a775ddb6ae 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index deffa20d4e0d..7ece99b905d4 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,6 +1,4 @@
 AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288
-DIST evilwm-1.3.1.tar.gz 64824 BLAKE2B 1145662c1907d27c39e55a4eddbc37c51a7b8d92dfa39b98c98eefdf419ebbee1bfc8889725ac38158f2b15e78e0d1a5a202584bc248cb93797c2ba05fbae5c2 SHA512 551ed96884792a6e607b0abb582bed68e583e7790773960a9f5ef6d974a7695752b4f2286d1549c2ca2d8f99b6401deb4e6da11e56bf6ce1fcf828370b072d75
 DIST evilwm-1.4.2.tar.gz 73716 BLAKE2B dbdeb914efe1002a3d3e97942d9b8ee22a3506aec4232cc59d5cb7fe61ee2bcbf08eaa5cc1d55151acd2c41f5fe7128cf0238ac844e91d61fc6afcb9162792e1 SHA512 07f1d82a611b95606ef137bb76599f8eef4bc27bf90eae9f5aa15bc806808c3bc4e1d7e821cebe1651b134d03f2b129e336b95e9659f0509d9711faab9bd00ba
-EBUILD evilwm-1.3.1.ebuild 1093 BLAKE2B 34afeb21a059a9423584fce42765c9a514c14a39a514ca6f8e42ded40d607f0ae33facc6cdc70933b211401f9fe9123b1dcdea7803c8bc7f8d77b0ead4ad7acb SHA512 772d86ac63e84b0a892fc95b6561d941d4d2c9ed6d6f6c3384ac3c93f7e7dadbe3ee0e8a291f971dba526756f5ac4dd1ac6f53e7b7563ac6f238304d9a54d9de
-EBUILD evilwm-1.4.2.ebuild 1050 BLAKE2B 294f75532b09f449dc14731371758fa3a50ea839efe28df44b010406af0531953a160a1a7273a70075d29211a891df54504df3beb8a5c806d9eac83896113b18 SHA512 23acecd585e5cfa0f878ceadeade09a724c5dadd626d7a91bc5e8fcc0fc98d491739992cc72be8f718063beaebfd764c9dc59f011337e1e3e54e2b5715527b44
+EBUILD evilwm-1.4.2.ebuild 1042 BLAKE2B d162ff70c09f6172480fab79fbf0877bc59e2de7e0510d937e4a6d06f628a051c549b78246b67d1e282329b520b797fa9fdf175b533d5064669591bcafa18ab9 SHA512 10473f3cd8b2649786c0ad42b5425f4d2b96b4799615b21541543cad17d37f839f4d59fa8308632df201ecf9dd511bca7658afeabdb3e3345a5db2ff1c10cc12
 MISC metadata.xml 584 BLAKE2B 3dfdb1220cc0b3805d4c2b7e7256d178cf96b64853b4f2acbb7e563d09a3b4da046cc2c078158d3d801e24e7eea208ff54842f8cf5ac34b9312b5f0a8f9db3ab SHA512 a09e6f2213ec18853e320e273800b6d8a09d99c60c2e91a12196a2dd683d156b303e7ac38445c062b0ac998f2f4ae6ca6c4a28326cc2aed2fc3f88bb7177f2c8
diff --git a/x11-wm/evilwm/evilwm-1.3.1.ebuild b/x11-wm/evilwm/evilwm-1.3.1.ebuild
deleted file mode 100644
index a36b4f37779c..000000000000
--- a/x11-wm/evilwm/evilwm-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A minimalist, no frills window manager for X"
-HOMEPAGE="http://www.6809.org.uk/evilwm/"
-SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
-
-LICENSE="MIT 9wm"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
-		-i evilwm.h || die "sed font failed"
-	sed -e '/Encoding/d' -i ${PN}.desktop || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install
-
-	einstalldocs
-
-	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-	domenu "${FILESDIR}"/evilwm.desktop
-}
diff --git a/x11-wm/evilwm/evilwm-1.4.2.ebuild b/x11-wm/evilwm/evilwm-1.4.2.ebuild
index bdb39a2c480f..c3dccb57a8b6 100644
--- a/x11-wm/evilwm/evilwm-1.4.2.ebuild
+++ b/x11-wm/evilwm/evilwm-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,6 @@ SRC_URI="https://www.6809.org.uk/evilwm/${P}.tar.gz"
 LICENSE="MIT 9wm"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index cc063453bc8a..4251cf10fede 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,4 +1,6 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
 DIST jwm-2.4.2.tar.xz 316000 BLAKE2B 7a0a1c5f60cb3554c999ce3d00d94af4d58ac4bdfcbaaa13a7b675273b4c5d0058c7c85bec950fa91d33a46a89f0b83faf2ab2cda0430a741884e2fdfd8116a7 SHA512 2669c3e2ab2d9a5539d02559108a2bc601bb2209de03dc15057a65c14b5e1268cc58009f4102c4d90302c0705ada5578997a3644c736a46a7e8cf13766cc92fe
-EBUILD jwm-2.4.2.ebuild 1883 BLAKE2B 92a596c5521817c7604a15dd68087526c75f8108cf6cb7e722e50570438eeeb4d671696450cd9b53f27044a0cf738295c54d7dab64b30aa743179960e4123694 SHA512 16110df3fe8a3208fcee4197bde8dab2133224229b2841224b8ac74759e24952fc1d8bd4f48a86aaa09720a0bd09cf54d4d0cace8ae3e82260cc4182d026fe0e
-MISC metadata.xml 1013 BLAKE2B 08cfa3b5f80614ab15616889012d8c317bc7d8a50afc56f521ba56551782047b72f3e95229acd0a78b6c465deee065e2b2af4c472c347133106f2c5747483f00 SHA512 1940a6ef7330d7f8e4ee494c96cf5c23021b5eb952fa060619ac3985aa5d63b922b95ee6dbb761d4ca1b6cce4ef316263571503d83c120e1d42f576b835d3120
+DIST jwm-2.4.3.tar.xz 317192 BLAKE2B d0b0ff1088ab3390a90c054162ea2c2fe782b61f28b3fdb28464ace362143fdc94e25ec82f7f4178b86a26c9315cdfcf9a81bff2e76bb5e3d62f88968a4ee80b SHA512 35b8a6da9614f11881013aa77c36ee88ce9a213f056e797231b772132beb841d54094809b6a476383999bddeccf61451f72cd166309dd79c223b634cf5d1e69e
+EBUILD jwm-2.4.2.ebuild 1884 BLAKE2B 240ba73e91284900e9d5d9563f05ed9b889538d47f98d9aa2e12eaacebd34ae17ae6d4174dd273f12966dc01b51fcb396779714f9ef573cf43ff642355ac0b4e SHA512 7a59a11194af79d0637f094530a512adfd548c4c474afffafb4bb46be3625b12e91d82c7dd1ec971e9513b74d6734cc56000f754fb7d1efc3dd49e8ac614dbad
+EBUILD jwm-2.4.3.ebuild 1901 BLAKE2B e73cad7077dcb501be407f18caed251887940380c23b5abfc4ad34de33102c7a6c389422a007191fbcfcc74bd50d7f79f86a19a107d86e3fd3cf8aa0d735fb5f SHA512 8239b906348829cb1b2f2cedce072ad92a8a8245e9ea8b7e7612f193470cd623280f0bc31a7f52e88e2c2d948a7eeda0b853ecb5d54b98bf0dfa7c72c91cf6dc
+MISC metadata.xml 1001 BLAKE2B 7de37c67352cdcfc0e6b9527d7261703aec667f0c132b39896d35d5fc8ef128ae4a2a2ba7f31b4b6ab97e8fbf971f072090195a261728e27a7e5c4b2adcf67af SHA512 b4b5482ff6b945d6d6b4b9c29848ab907cae120395503af409252f7aa4a718716ded380c2c0eb950fef2d65cb2cebfa908eb4448097d94d449ee24feac9b86ec
diff --git a/x11-wm/jwm/jwm-2.4.2.ebuild b/x11-wm/jwm/jwm-2.4.2.ebuild
index 0e9c3f44f9c4..1a89b8050f20 100644
--- a/x11-wm/jwm/jwm-2.4.2.ebuild
+++ b/x11-wm/jwm/jwm-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit wrapper
 
 DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
+HOMEPAGE="https://joewing.net/projects/jwm/"
 SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/x11-wm/jwm/jwm-2.4.3.ebuild b/x11-wm/jwm/jwm-2.4.3.ebuild
new file mode 100644
index 000000000000..08db4c809545
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.4.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="https://joewing.net/projects/jwm/"
+SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="svg debug iconv jpeg nls png pango truetype xinerama xpm"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	svg? (
+		x11-libs/cairo
+		gnome-base/librsvg
+	)
+	iconv? ( virtual/libiconv )
+	jpeg? ( media-libs/libjpeg-turbo )
+	nls? ( sys-devel/gettext
+		virtual/libintl )
+	pango? ( x11-libs/pango )
+	png? ( media-libs/libpng:0= )
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable svg cairo)
+		$(use_enable svg rsvg)
+		$(use_enable debug)
+		$(use_enable jpeg)
+		$(use_enable nls)
+		$(use_enable pango)
+		$(use_enable png)
+		$(use_enable truetype xft)
+		$(use_enable xinerama)
+		$(use_enable xpm)
+		$(use_with iconv libiconv-prefix /usr)
+		$(use_with nls libintl-prefix /usr)
+		--enable-shape
+		--enable-xrender
+		--disable-rpath
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md README.upgrading example.jwmrc CONTRIBUTING.md
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 7d709d102326..745eaf8d5e4f 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -4,7 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">joewing/jwm</remote-id>
-		<changelog>http://joewing.net/projects/jwm/snapshots/ChangeLog</changelog>
+		<changelog>https://github.com/joewing/jwm/releases</changelog>
 		<bugs-to>https://github.com/joewing/jwm/issues</bugs-to>
 	</upstream>
 	<longdescription>
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 86cc24e714c9..f9d500959304 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,5 @@
 DIST marco-1.26.2.tar.xz 1865248 BLAKE2B 86933230f11a9342009d79bd836ab09272a335cc7e0e8c84c4ac1c300fd4b604a97424c76d371450a46be0c2a588902c17791fe1ee752e06207046bbddc055a4 SHA512 326ed378be891806a9750021626863e00d80f29af8fe920eeb0910d9eb2ece534babf012e1aced6b071b6c0fdd8a77ea8c948d68a70f9280822b30231aa934b9
 DIST marco-1.28.1.tar.xz 1800320 BLAKE2B 6594095cb7b038c3107513229f81cfb8e71f437b1f716a108169ddb8c792c4ab06979f57cd2c3a11c3de65e07550f8fcd246911a7ccff2f1e89fe20de3836b59 SHA512 3642e3fab967baef35b0e02d3e4b63e3ef97e5e44d01dbde2a7557a5ced41e73f7f8a1e63860aa9bcebe1ea1c8e1f6fd8740d853bf3996c32977b65091364ac3
-EBUILD marco-1.26.2-r1.ebuild 1474 BLAKE2B b17345433d0ee60fc535986b53414087320eaf9fc6a655b731b95076b7c185b35db8f46579132417949159087224e17640df64300678eb3d0c6c30aedf42b429 SHA512 cb7f134d5103b8acb4e17a11bbeb8512e4a342ce2787efb427184e97d5d0a42d03f368206069078a085a9cb0517c5009712b97b059e58eae941ed5ced05a865b
-EBUILD marco-1.28.1-r1.ebuild 1536 BLAKE2B b5d7f5672157f1c8579df04c51a139c71a63d5aaf6629ddc9c6a793dce505d7a893258b1385d28f2b28438a4b44d607ca1ee1c5eb6c1175f374fb1be46ee026a SHA512 12eec2175c4bdb402e911ee8778364dbc7f599c1f03419b333ac7607857c31e0b1b9d1a6c943eb966e715f0d057247cd742edd1b65ec0a856e3c377193c3f95e
+EBUILD marco-1.26.2-r1.ebuild 1616 BLAKE2B a1dc6b482f0035e81b33e9bec99344e70ea9f7bc54308c90b2c52293ee6eeb1699741c5f3c8d26cf338f22b75c1eb5ff1f36cfa6a5c8dbbdd04ed3a8366f8361 SHA512 82d9628cebe96efc396a360029abbda8708c83d4359ff1ec9c9e3526aaddca25bb33cf3c1aa04c285e4ddf21d4146db66908c5e2e58ddef38239c5c06f808219
+EBUILD marco-1.28.1-r1.ebuild 1678 BLAKE2B 8ed673ef7b52190c67acc5dbd7aac2072dfe193498a7412375db1808378dd4d0093d0605f33afd4c1a39eb0f08120fa50754a0824e1d4790a9c7bdc1c92e7d92 SHA512 382d0c1cd2ac155b784cfabedc26abb085d7e52788de318875beca561772d7fd8a9e8855aedee65881e6112457e5dfe62003ec8b68504ca1119361433004b3e8
 MISC metadata.xml 484 BLAKE2B 9ba0475c983500a353feb2ed117c564c267d45451068f56cfb50bfa5656f9e8eef53213c588550d6ec9f3eb6ed92ac011a764473e63b716999413aaa1fe4be85 SHA512 c9c1ed68be07a06b27dd5bd5d404d1d7c7086a5f16b1a30a58eae457f9c9df2d13a8d3bfe384fbebc5f553a2fcc9cd289d02fa60f02695279465c1917c76c6ea
diff --git a/x11-wm/marco/marco-1.26.2-r1.ebuild b/x11-wm/marco/marco-1.26.2-r1.ebuild
index d0d40b051f8e..bd1e415ad436 100644
--- a/x11-wm/marco/marco-1.26.2-r1.ebuild
+++ b/x11-wm/marco/marco-1.26.2-r1.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MATE2_LA_PUNT="yes"
+# For script meson_post_install.py
+# Bug 906826, tracker bug 762406
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit mate meson
+inherit mate meson python-any-r1
 
 KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
@@ -42,6 +45,8 @@ COMMON_DEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 
+DEPEND="${PYTHON_DEPS}"
+
 RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
 	>=mate-base/mate-desktop-1.20.0
diff --git a/x11-wm/marco/marco-1.28.1-r1.ebuild b/x11-wm/marco/marco-1.28.1-r1.ebuild
index bb7c264be6aa..6240ace59fd1 100644
--- a/x11-wm/marco/marco-1.28.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.28.1-r1.ebuild
@@ -4,8 +4,11 @@
 EAPI=8
 
 MATE2_LA_PUNT="yes"
+# For script meson_post_install.py
+# Bug 906826, tracker bug 762406
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit mate meson
+inherit mate meson python-any-r1
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
@@ -46,6 +49,8 @@ COMMON_DEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 
+DEPEND="${PYTHON_DEPS}"
+
 RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
 	virtual/libintl
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
 }
 
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 17ba9c4ac8c5..6bc7f54c2d34 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260
-EBUILD twm-1.0.12.ebuild 568 BLAKE2B 5ec681257bda1fb9b0edaac06f41fa11cad6f91baa362c7476fef16b966a2bba00e8eeae327fa38dee288a59aec6d2737f2930c7b360caad17f40aa292756858 SHA512 90e66923fb95dca08ef6a66e8992c0dab75911c423ceffaa714db37af3a931c83c75ec0583125033630f30ea8320c78ea386bcb320a0c6257c02aa57d45de802
+EBUILD twm-1.0.12.ebuild 560 BLAKE2B 44e3b97ed9457f8d9e4c10e8e2b9c299d71a62402729241e83dd801df58f697a044ce8fe879aa7c7c0764db5a36a968701420f627d62b802ba13c7ddfe196d97 SHA512 3a393fcef98929d0275c3416614937df2c0c4cc9b768f7fc7d3645b18d51bd9ac1bd40b420e1350626f006177a987fba02ff75078d8d74b93d7e6a72f3abd523
 MISC metadata.xml 334 BLAKE2B faf8f80fe08fd298ce3e83bf79d42386a1fcc7c3f39b96fd023421cbfe9b217853d08a429b5bb4dffbd9bf5f18544680722561321c155dee9150520201ce16f6 SHA512 57538809af528b541e14533c9ef5a9b3d09cdb8b90f09e859784a5ea56910b6fee3f2251b6e7201f4c2117b9e3ba0eedd3aa47b418f5f473266a842e7be2848a
diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild
index f891b052eeaa..2c841c72a7f8 100644
--- a/x11-wm/twm/twm-1.0.12.ebuild
+++ b/x11-wm/twm/twm-1.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,6 @@ inherit xorg-3
 DESCRIPTION="X.Org Tab Window Manager"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 COMMON_DEPEND="
 	x11-libs/libICE