4 files changed, 177 insertions, 3 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8fbf6cc3a8b9..c1ffdb32f618 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 2f4efad241bb..162eefa97f8f 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,6 +1,9 @@
 AUX fvwm3-1.1.1-desk-init.patch 1237 BLAKE2B f25ed4ba7cf2b5a5bc9bb4973d123d7afdcfc824f7eee64747534d8407f456fec5b2a3ec3f78fb80a0c81718cb11f216ca575b47fee9018d7a5667219c1f7f02 SHA512 c528fd645390bb5caa941a09f0d3fc19a932a332f45d568a00674c8cf4958145689bf05612dcacb0ec3109954ca07882cbbadf7f01610c6b6ac59b3ed74ddbd2
 DIST fvwm3-1.1.1-docs.tar.xz 241608 BLAKE2B fbdc789dce9e36a94a4b6c2541b4474548bd961e333d14507788a70e1e4103f0ae5df8223259670cd2aeaec43d3088f1b600b371d03543c2bbb4bce47c37815c SHA512 92385ff188269f85dfda0f079135d651973b1556ac13112cff087a2294256edd7dc2b99aa2c220f9f361df6a3a4d820c56e061dd5d818e58755b1f94df9b4e03
 DIST fvwm3-1.1.1.tar.gz 4016926 BLAKE2B 5654554d8bd6593f30cb5bdd05e424abd7fd3f298d12073d419d18967f17d2df58de797392af0b15a0bcf05d09c8fe7b3c273734d17cb97b617dcb9a5e7f4091 SHA512 66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0
+DIST fvwm3-1.1.2-docs.tar.xz 248024 BLAKE2B fbc182f3a5ea38135f487f75c9b4e399855faf46807da1cce9b3a7ccc163268a3e60349ac22e34615c9bc804a1e44b6fdbf39e1c73542103da94c8deabf9c788 SHA512 5a62cc11fa04dec958dc0b8ea899f20e4db5af2d69e8da311d7b9c9bf2286980396ed94ab7d9bd0b9158b3b7d7de4a74d59be3f11651f0c85fb4c683887d7565
+DIST fvwm3-1.1.2.tar.gz 4019330 BLAKE2B 1bf8b82c060e6724375758838dd4b91b189cb1263c510b323a673ea3eb83c8b5e3eb358965a89c3c205ed04c8a90e50a07e4690d9746d54abcafd4cf15a879bd SHA512 1b9473ebde6e9a6399fd185f83c0fc403e84f6e7d3648d141f6418e4b6489d0955d384bb2249b85b8372b8731ab205a99dcd64b0aeb697129b1164fb33090f56
 EBUILD fvwm3-1.1.1-r1.ebuild 4264 BLAKE2B 3e2f10870beb225387604491924234a62daf31b6116ca7701ecc23f8044efce5c0a6af6a6f01ac37eebc4eeb8864b0b45abe4fb7047e6de2f25e286e45fe99b3 SHA512 56f8aef19306b12129b80e8c7bede78e2fe9b48be44c5de506fd85aa0a94330c814237f2a87a52a6e5378c60ff3fba738031eab0330227a432bd1e7a87d25150
-EBUILD fvwm3-9999.ebuild 4178 BLAKE2B b46f2fafcd6a593289cc499aa4e3abf8ed89162ccc813624a5ebd32de00689039b8e63b40aa2e71440babc9ba49284887ede3553233edc952cba0d59265f1821 SHA512 b5fbf1773846d309c0d161d87ac2a98f47cfffdcade4c9af42bf1bf9e7f1b979a5eb480698e766fec6a734ad67e8cdb583f530d2bb5fa4ff2707b3886c5eab6d
+EBUILD fvwm3-1.1.2.ebuild 4202 BLAKE2B c8fc48727695f4fa3f918152c259276f0546e40cb74b57f73daf385864d7f73e692bce02147d084887713722ccd07ac65f735a1e9eb1226a7cdb72d483e4bf53 SHA512 9692e7825bd3f4c96bf3c10bda1c5e4cfb6de25e6e2f3e2087ac02998598b9a382190edec65ce87d81f3c54b72b6d63f0362577781e846a26d1c392c7930efbe
+EBUILD fvwm3-9999.ebuild 4202 BLAKE2B c8fc48727695f4fa3f918152c259276f0546e40cb74b57f73daf385864d7f73e692bce02147d084887713722ccd07ac65f735a1e9eb1226a7cdb72d483e4bf53 SHA512 9692e7825bd3f4c96bf3c10bda1c5e4cfb6de25e6e2f3e2087ac02998598b9a382190edec65ce87d81f3c54b72b6d63f0362577781e846a26d1c392c7930efbe
 MISC metadata.xml 829 BLAKE2B 23828052466446a55db8d718ce60120ab06213bd53cd0a0e6d2be3b76d1ae39d629cd49236aeaf5c28b9493ef10854d2845281c88cbe0e7cdec4cce5d9368259 SHA512 f05606a0aaac1b7d7cda86991fc8b49d778d4fbc73c52ab19741e5f51dd62b07cef6bb7d32df7baad025b7654d0fe85c7a337a31fa9f254326f59b6eda7adb64
diff --git a/x11-wm/fvwm3/fvwm3-1.1.2.ebuild b/x11-wm/fvwm3/fvwm3-1.1.2.ebuild
new file mode 100644
index 000000000000..0d6939978835
--- /dev/null
+++ b/x11-wm/fvwm3/fvwm3-1.1.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
+# for release ebuilds.
+# Scripting for this is in sam-gentoo-scripts.
+: ${FVWM3_DOCS_PREBUILT:=1}
+
+PYTHON_COMPAT=( python3_{10..13} )
+GO_OPTIONAL=1
+inherit go-module meson optfeature python-single-r1
+
+DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
+HOMEPAGE="https://www.fvwm.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
+	EGIT_BRANCH="main"
+	FVWM3_DOCS_PREBUILT=0
+else
+	SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+	if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+		SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2+ FVWM
+	go? ( Apache-2.0 BSD MIT )"
+SLOT="0"
+IUSE="bidi +go nls readline svg"
+# Strictly speaking readline is not required for go,
+# but as most systems already have it installed we don't users to stub their toe on REQUIRED_USE
+REQUIRED_USE="${PYTHON_REQUIRED_USE} !go? ( readline )"
+
+DOCS=( NEWS )
+
+if [[ ${PV} == 9999 ]]; then
+	DOCS+=(
+		dev-docs/COMMANDS
+		dev-docs/DEVELOPERS.md
+		dev-docs/INSTALL.md
+		dev-docs/PARSING.md
+		dev-docs/TODO.md
+		dev-docs/NEW-COMMANDS.md
+	)
+fi
+
+BDEPEND="
+	virtual/pkgconfig
+	app-arch/unzip
+	go? ( >=dev-lang/go-1.20 )
+"
+
+if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then
+	BDEPEND+="
+		dev-libs/libxslt
+		dev-ruby/asciidoctor
+	"
+fi
+
+COMMON_DEPEND="
+	dev-lang/perl
+	dev-libs/glib:2
+	dev-libs/libevent:=
+	media-libs/fontconfig
+	media-libs/libpng:=
+	x11-base/xorg-proto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libxkbcommon
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/xtrans
+	bidi? ( dev-libs/fribidi )
+	readline? (
+		sys-libs/readline:=
+	)
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	!x11-wm/fvwm
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		"-Dpng=enabled"
+		"-Dsm=enabled"
+		"-Dxcursor=enabled"
+		"-Dxfixes=enabled"
+		"-Dxpm=enabled"
+		"-Dxrender=enabled"
+		$(meson_feature bidi)
+		$(meson_feature go golang)
+		$(meson_feature nls iconv)
+		$(meson_feature nls)
+		$(meson_feature readline) # not required for go but it won't hurt to enable it
+		$(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency
+		$(meson_feature svg)
+		"-Dcairo-svg=disabled"
+		"-Dlibsvg-cairo=disabled"
+		"-Ddocdir=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then
+		emesonargs+=(
+			"-Dhtmldoc=true"
+			"-Dmandoc=true"
+		)
+	else
+		# Probably not required, but let's be safe
+		emesonargs+=(
+			"-Dhtmldoc=false"
+			"-Dmandoc=false"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	# Since we're manually handling docs installation, let's do that first
+	# and then install the rest of the files "normally".
+	local HTML_DOCS
+	if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
+		HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
+	fi
+	einstalldocs
+
+	meson_src_install
+
+	python_scriptinto "/usr/bin"
+	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+}
+
+pkg_postinst() {
+
+	einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+
+	if use go; then
+		einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+		einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
+	else
+		einfo "FvwmConsole has been installed, hovever it is a legacy tool."
+		einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
+		einfo "provide the same functionality in a more flexible way."
+	fi
+
+	optfeature_header "Useful optional features:"
+	optfeature "Screen locking" x11-misc/xlockmore
+	optfeature "NetPBM support (used by FvwmScript-ScreenDump)" media-libs/netpbm
+}
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 618c04e64e74..0d6939978835 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ else
 	if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
 		SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+ FVWM