10 files changed, 209 insertions, 66 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dcff7a336e47..03278563c648 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 2c072878bf0b..00a2731a4945 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,6 +1,4 @@
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
-DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
 DIST blackbox-0.77.tar.gz 394176 BLAKE2B c52872fd02eba6857d2a3f5a8e122a6a8a0cdaa9c2d83f5b2510f9e770e650626d07f6d2b43b18bc3d77de4bfefc9bb9fb10321de0e72d4f82e5988f3c670d59 SHA512 d1f86707d9a2acb68db6a9af947e47acfd687752d06e3e2a60932550fbfa087730e6890b6ceb086f8aa8cf04e932ed7864f92266368fc43dc70b4b58140a792d
-EBUILD blackbox-0.76-r1.ebuild 1309 BLAKE2B cb145a0cbfcf13316301bd2542e540ef63cdd320c7ab9efb679d795e6ff422737078a13cf545ddb4688f4ecd1a66d761832b0c83bfc2b0d624bdee731c338331 SHA512 54fa4b041833e0643ce420832de7c6a42dc2b1a4b2addd7dfc7281b559225d1c05684fc1742d727d9dde0347c0de1cf1907de37b0ad2e10f5b3c0369e64adfeb
 EBUILD blackbox-0.77.ebuild 1343 BLAKE2B 33cd5af2ec6bc7dedf0ac4c7dff8419220eefc32e8d5c12f249427cb87c04ac72e65703b4a66788f461902b27924e26fb7c4a3612e70dcdaca345980bc48ccf6 SHA512 3510c6cfb8a005cf07700e50cd8173c7bbc88459b3039969d1aa0971518a33e8dbb99ae2d4a09255463296b03ea5dc460f9805d92422bfbf8d8184192d381d4a
 MISC metadata.xml 573 BLAKE2B a267119a25e9f1ea39b05b705a9b186f428b5723f7d8abf43f55561f6929d5e0c1800aed851c81c2b6ddc655974848f43fd79426fc4907a77da0fccf571c2556 SHA512 0dabe8daa4a79b684c1654722ac9d7f958d4511046a7d2a28bd2500751695621bbf4043579f08f73ad98745c921e766b0f19112995324e31e3bf9efa78df221a
diff --git a/x11-wm/blackbox/blackbox-0.76-r1.ebuild b/x11-wm/blackbox/blackbox-0.76-r1.ebuild
deleted file mode 100644
index 3a7f7e0c2fd8..000000000000
--- a/x11-wm/blackbox/blackbox-0.76-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small, fast, full-featured window manager for X"
-HOMEPAGE="https://github.com/bbidulock/blackboxwm"
-SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug nls static-libs truetype"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXt
-	x11-libs/libX11
-	nls? ( >=sys-devel/gettext-0.20 )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/blackboxwm-${PV}
-
-src_prepare() {
-	sed -e '/AC_DISABLE_SHARED/d' -i configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/X11/${PN} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable truetype xft)
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
-
-	find "${D}" -name '*.la' -delete || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libbt.a || die
-}
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 75447e5cfd37..047e03dee257 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,8 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
+DIST dwm-6.3.tar.gz 25351 BLAKE2B 06edd0454802d79a5c796951b0a95d5376f0363f0b93ce82569d38af4a96d528c58abf7b9e0f78bb50b48ce8cee0c7993e08fafc8593bc63be6df87c17974f40 SHA512 285bf5e7f419b7bd6d7cd23548a5cb3dce84879b7e841ed3eb08c226f28c8782e37bce2bc481b2e90c4f2160f79d239476d56f01985af0d38a39fb9dce43dede
 EBUILD dwm-6.2.ebuild 1088 BLAKE2B 05e3cdb4c60c87432511e0862babb0f3af9b8fc64990035ab2420c10415dbdb50eb7673a11e0df12d61e43a055b843a4930cd3f97d15fc81f094f8586d811c69 SHA512 253915758913ff05684bbafabd7d6b78ef45b62e8b894b81b332483ef4e1277dd21bbf6d454449e5fcee7da41cfd25879ee4950b6622bac5a408bab36c0e55f9
-EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
+EBUILD dwm-6.3.ebuild 1316 BLAKE2B acf585eb136ad3d7719da996dcf0f5deee906c6443290d25de1c775c04026d28cd8311135b0d66269587da51a7c698dc4bc0d3a6f1d423e29992b71b4248986c SHA512 a74d114bff5fac09ff834856de152695662a9ac40a96539a41d5109d86d2da380e062c72ff12adbac2a1dca3e90f898b9487c6e95ca36197f40c9ce059a7f01c
+EBUILD dwm-9999.ebuild 1316 BLAKE2B acf585eb136ad3d7719da996dcf0f5deee906c6443290d25de1c775c04026d28cd8311135b0d66269587da51a7c698dc4bc0d3a6f1d423e29992b71b4248986c SHA512 a74d114bff5fac09ff834856de152695662a9ac40a96539a41d5109d86d2da380e062c72ff12adbac2a1dca3e90f898b9487c6e95ca36197f40c9ce059a7f01c
 MISC metadata.xml 503 BLAKE2B 741cc38200fa0911bf9fa1a2afcd0bad76da0469a85a6f72dfce5ed04e57083405cdc0e9ee8ca66b3f9bc88b1845a7132f66552e999f66568e3e044caaa3aaad SHA512 93d86f980268b8c9f2fba670220de0a138ebd7bd22481681ce0af029743a3142e52e215fc8dffcbce6ba882d50e9e1bfbe33eee858fe28978e733c0bfb864582
diff --git a/x11-wm/dwm/dwm-6.3.ebuild b/x11-wm/dwm/dwm-6.3.ebuild
new file mode 100644
index 000000000000..4ff4f401873f
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/dwm"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/ -Os / /" \
+		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 4b464a12ac2f..4ff4f401873f 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -1,16 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 savedconfig toolchain-funcs
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a dynamic window manager for X11"
 HOMEPAGE="https://dwm.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/dwm"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/dwm"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="xinerama"
 
 RDEPEND="
@@ -30,6 +37,8 @@ src_prepare() {
 	sed -i \
 		-e "s/ -Os / /" \
 		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
 		config.mk || die
 
 	restore_config config.h
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 82157aac0b2b..27f944e238e6 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,3 +1,5 @@
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
+DIST enlightenment-0.25.1.tar.xz 405708428 BLAKE2B 14d70880534992673ad3c0ff8adbbc3ae0ec4f3c8f9a935d6e07c6642a2874710270bbb2bb2fab741aaa615779465c4a609ec200098e402673a0ee1af733fbbc SHA512 b64521adb725bb04455d0512e884e77c79cabbf3ecf28765a02d002672aaf261a2a6c98c9d1d3dc85baac84d9637b8217500249ea74833b35d87c88194ee1da1
 EBUILD enlightenment-0.24.2-r2.ebuild 2977 BLAKE2B 6fac2c8f2a382bba4295237addcc95f87de65da9144b9b2c69743d8c4a89335c938e65256938fcc5f95c0a93d942e4be9b896a87cd2c7e045f8bcdc95e240962 SHA512 8192a1b4fe8f0f9d6ca888dbe9802861185698638c680ebe36d7eba6ce211d52e8c6436e97342958e6ddca998e8468c86867984b71c2382ec137cbe7d5048bb1
+EBUILD enlightenment-0.25.1.ebuild 3265 BLAKE2B cd8d2793e21e19645594e8d05cae07a7d265ebc4a2d233a6119d23519a312834b254e39912d75d8d4e7b9899d4fde4d1d5f304d51d4f549bdff78d315f88616c SHA512 9dedf647b67e5f389661fc0a9c783f225116f602acbfbb775b34eedb426a0a1c6505923e34047735e321766c0bbbf9aa56feddd7656357b128ed3a07ad1fcdde
 MISC metadata.xml 722 BLAKE2B 5d52b9e4ce352b7f16f10d3488b1c8e5f515190ef030606cbaaa69142b1b9da5c7eaecbdf8b4c7921878fe23a7de2c22ac2afdc4b06358dbbddd783e6690f755 SHA512 33810b7b0b22fe24bd1e1448cb4ca1a12d9e41dc0b25d09b94b94847ec590944513ccdc93f1bd4030f400a314ae76a60de04543ac2aa45b4ebcaec6dccf47fb9
diff --git a/x11-wm/enlightenment/enlightenment-0.25.1.ebuild b/x11-wm/enlightenment/enlightenment-0.25.1.ebuild
new file mode 100644
index 000000000000..3d01153a518e
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.25.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature xdg
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+
+# Historically enlightenment was slotted to separate e16 from e17. e16 is now
+# packaged as x11-wm/e16, but the slot is kept because it's more complicated to
+# reset it rather than just to keep it.
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="acpi bluetooth connman doc exif geolocation nls pam policykit systemd udisks wayland xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND=">=dev-libs/efl-1.26.1[eet,fontconfig,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	exif? ( media-libs/libexif )
+	geolocation? ( app-misc/geoclue:2.0 )
+	pam? ( sys-libs/pam )
+	policykit? ( sys-auth/polkit )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		|| (
+			dev-libs/efl[systemd]
+			dev-libs/efl[elogind]
+		)
+		dev-libs/efl[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xwayland
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D elput=true
+		-D install-enlightenment-menu=true
+
+		-D install-sysactions=true
+		-D install-system=true
+		-D mount-eeze=false
+
+		-D packagekit=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use exif libexif)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use pam)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	optfeature_header "Additional programs to complement the full EFL suite:"
+	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
+	optfeature "an efl-based text editor" app-editors/ecrire
+	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
+	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/entice
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "a media player" media-video/rage
+	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 4b87f44489f0..5a7989233dc2 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -4,5 +4,5 @@ AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.9.ebuild 4104 BLAKE2B ec39f5ffa582099e828d193ef0c1ace8d855ad1fbc2ae241af9e6f383f381702fe0a4a5821034d0af4007b0d3a5130229996ca00ddae7db995dc0f17f3569ef9 SHA512 2454a4f684d60144d70d8a93109e4336a627c736dc3fe3f4e75f93353c1508117e5916be63a555465bb664430ad6720601a703b2e9ac469b9300c5105bf935c9
+EBUILD fvwm-2.6.9.ebuild 4071 BLAKE2B 9541da7f3bbf07a411fb7ef16a17363370d5245d5312fd41bf7037dd866fe8ac6918571479113f4549e92b0edac87cb786c5c2ed3cebd9f16945643518d9546a SHA512 dedd699d4fbc12be19c0a4a04da2728bdabb4dd7783ef1950093ccac1de481a0935d8a7a8cc8b75d7d143d792449369562c8930fa323904ed805935c35a1daf6
 MISC metadata.xml 708 BLAKE2B 4f55c0b953de9742cad78d0ebba7c21b6cd5d71d373bcbe6e17233626b9447175eb87559284d4b5c083b3ff5d2191fbbb7ba3044d7efd6a81ca731debe6a1cbc SHA512 61900fcc084c99d66e7a094e9777b589b472620da31d166b8d0d795e5f104d9c80298764cd787589666e6afa9f996f687bcc39db92ef7568e4eec9aa0624d141
diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index 6563867b6871..b3d24a33c6ab 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
+	sys-apps/debianutils
 	perl? ( tk? (
 			dev-lang/tk
 			dev-perl/Tk
@@ -53,8 +54,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	rplay? ( media-sound/rplay )
 	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+	netpbm? ( media-libs/netpbm )
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig