gentoo resync : 14.12.2020

23 files changed, 274 insertions, 286 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 381e5fdf3259..56046f272cc9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 44ebed38111d..df71d9f66764 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,5 +1,4 @@
 AUX aewm-1.3.12-fno-common.patch 493 BLAKE2B b234d4e64d4f2d1287b150df3248eb4a2587ea1e74877afa935fcb89294a6be59e8a84d4c1712f70959afaa95ff5d83d2e71c060423941552fabd62045d006c0 SHA512 f3a19a135923fccc310ac3066629791c4279ecce0fa5e3dc29d05f4c059e5faf454a2b39eaf13b7ad3687256b260344a2ff3ae9f1617109eca5b901d09f0402d
-AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
 EBUILD aewm-1.3.12-r1.ebuild 861 BLAKE2B 8d0d4d5539bdb487dfd198e665c95f547e7271be94331c6cb87166798a720a975a9aa3a3cceaee4746438790414eeedc478068354bf701d4c81109fa2166c881 SHA512 d81b797d708481bb305587cf1d49a13e58a3c660602330b625ef04178079dcda3cdf581cc0b93d7b896db97ef110f5f47dea09300ea4ed87a912812520b74fec
diff --git a/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
deleted file mode 100644
index 6cc02f4560d6..000000000000
--- a/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -6,12 +6,12 @@
- XROOT = /usr/X11R6
- 
- # Uncomment to enable Shape extension support
--#OPT_WMFLAGS += -DSHAPE
-+OPT_WMFLAGS += -DSHAPE
- #OPT_WMLIB += -lXext
- 
- # Uncomment to add Xft support
--#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
--#OPT_WMLIB += `pkg-config --libs xft` -lXext
-+OPT_WMFLAGS += -DXFT $(shell $(PKG_CONFIG) --cflags xft xext)
-+OPT_WMLIB += $(shell $(PKG_CONFIG) --libs xft xext)
- 
- # Uncomment for debugging (abandon all hope, ye who enter here)
- #OPT_WMFLAGS += -DDEBUG
-@@ -46,7 +46,7 @@
- 
- X11FLAGS = -I$(XROOT)/include
- WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
--GTKFLAGS = `pkg-config --cflags gtk+-2.0`
-+GTKFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
- 
- $(PLAINOBJ): %.o: %.c
- 	$(CC) $(CFLAGS) -c $< -o $@
-@@ -60,28 +60,28 @@
- $(GTKOBJ): %.o: %.c
- 	$(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
- 
--X11LIB = -L$(XROOT)/lib -lX11
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
- WMLIB = $(X11LIB) $(OPT_WMLIB)
--GTKLIB = `pkg-config --libs gtk+-2.0`
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
- 
- $(PLAINBIN): %: %.o
--	$(CC) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
- 
- $(X11BIN): %: %.o
--	$(CC) $^ $(X11LIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
- 
- $(WMBIN): %:
--	$(CC) $^ $(WMLIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
- 
- $(GTKBIN): %: %.o
--	$(CC) $^ $(GTKLIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) $(X11LIB) -o $@
- 
- AEMAN = aewm.1x aeclients.1x
- AERC = aewmrc clientsrc
- 
- install: all
- 	mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
--	install -s $(ALLBIN) $(BINDIR)
-+	install $(ALLBIN) $(BINDIR)
- 	for i in $(AEMAN); do \
- 	    install -m 644 doc/$$i $(MANDIR); \
- 	    gzip -9 $(MANDIR)/$$i; \
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index ceb4acb4b127..827446952a40 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -16,5 +16,6 @@ DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9
 EBUILD awesome-3.5.9-r3.ebuild 3179 BLAKE2B d7b5a660e5f32bb5bfed3f177aac14dbd1b1c879cb4a6ae9c57cb9676e1e4e17ac327e846d263ef88ee7297c1fa43a11450aadf557a107fb9e592e57a757b066 SHA512 547fb63ae5779f4046b3e3cc1a84d052a71d74a70aa4b9d42c595dd443c7f56f74d3f2121596b0a312dce98b26247ca967d45f236f73deae2879827dd9d121c5
 EBUILD awesome-4.2-r3.ebuild 3947 BLAKE2B 30c377ec58fd84c01929d4bdb04fd3d65757a67336af701421dcd98a4853ff40bc57d443a809cd13fb4c2c93d3f203357c208b0ee150ace42116d3dbda9a99ba SHA512 81b79af79fe5dbff19bb708a98233dfc72f40057300f5dbb1608e6dc9de79662116d3d52ecbcf962c2b852884bed8db1da35dd444fbdbb64bb949c207bee4c60
 EBUILD awesome-4.3-r1.ebuild 3596 BLAKE2B 60a3a026cef8d75ea7feff3154821e09c849f394d26b1a55d8280cec0b43628d4c870748537cba9ef66db76a433b30c7d8637843d2972225fe621efdf03ec4e1 SHA512 f4b0e1ae8980ce71204a72bf37b730cb080532595d568310d8fabd830f21c48d6c4a00ff6ed382f27ef7c9203cc8697f9a8ec912cff013682286e92bc4d30b72
-EBUILD awesome-9999.ebuild 3558 BLAKE2B 8838870e76af67a7fea184bc82d6a3099820d96d18a69b028d1191a47cab895152a4d80ddc18a4a28b2b70699d0ddd169763fbcfe20d626d527bc8cdd4106845 SHA512 cc4678cd1820b7ac927332dfc6bd400157c1a76fb1536d15308c1da09f89f37c00dfd3790e0f8d1c707e2f6db2ea90592ab905c08aae3dcb843840664a1e7fe6
+EBUILD awesome-4.3-r100.ebuild 3686 BLAKE2B 34a092c1333c1a6e05488141e278acab83ebf0a0c81fae08cd9e8ee75eeb2f6bd7e3af7711b6cdc611f31d51d318636611c55cc7c8e62e6a9d66dd9d8ad0b29f SHA512 742ecb30a5b78e844201d25d9cb5ad419e3372ae60813ca227da5085f9142c7023bb3655b5b16a42d22a72df8f003349a077f725e3be563ea9a4e8aff31ddb5b
+EBUILD awesome-9999.ebuild 3648 BLAKE2B 0e83667767a33e68bb84940682f89d0e1c36b8d80e769b244c8cd78d5b87ffa591e15d4fdf793f25ceb6587948109d434f3e882b4cd665f33ff5f68b88681742 SHA512 c6b74266d83b42df45d5c9ecea4604fb9ce372e243013ee896bc5f34dbc377ee115221fc9276e5f23b0c946bd6022b782ae363c3720842ce1f50256c57f97208
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild
new file mode 100644
index 000000000000..56bd122ae470
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.3-r100.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake desktop lua-single pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="dbus doc gnome test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	$(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6[xkb]
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-base/xcb-proto-1.5
+	x11-base/xorg-proto
+	doc? ( dev-lua/ldoc )
+	test? (
+		app-shells/zsh
+		x11-base/xorg-server[xvfb]
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
+	)
+"
+
+# Skip installation of README.md by einstalldocs, which leads to broken symlink
+DOCS=()
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	# Compression of manpages is handled by portage
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DCOMPRESS_MANPAGES=OFF
+		-DWITH_DBUS=$(usex dbus)
+		-DGENERATE_DOC=$(usex doc)
+		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
+	HEADLESS=1 cmake_src_make check -j1
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+
+	pax-mark m "${ED}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+
+	# This directory contains SVG images which we don't want to compress
+	use doc && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index f4b885d7a540..e418a13243ae 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake-utils desktop git-r3 pax-utils
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake desktop git-r3 lua-single pax-utils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
 HOMEPAGE="https://awesomewm.org/"
@@ -12,15 +14,16 @@ EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dbus doc gnome luajit test"
+IUSE="dbus doc gnome test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
 RESTRICT="test"
 
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	luajit? ( dev-lang/luajit:2 )
+RDEPEND="${LUA_DEPS}
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.8
+	$(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libxcb-1.6[xkb]
@@ -38,6 +41,7 @@ RDEPEND="
 "
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP
 DEPEND="${RDEPEND}
 	>=app-text/asciidoc-8.4.5
 	app-text/xmlto
@@ -50,8 +54,10 @@ DEPEND="${RDEPEND}
 	test? (
 		app-shells/zsh
 		x11-base/xorg-server[xvfb]
-		dev-lua/busted
-		dev-lua/luacheck
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
 	)
 "
 
@@ -71,21 +77,19 @@ src_configure() {
 		-DWITH_DBUS=$(usex dbus ON OFF)
 		-DGENERATE_DOC=$(usex doc)
 		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
 	)
-	if use luajit; then
-		mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
-		mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
-	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
-	HEADLESS=1 cmake-utils_src_make check -j1
+	HEADLESS=1 cmake_src_make check -j1
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
 
 	pax-mark m "${ED}"/usr/bin/awesome
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 7905d623ea29..9c71a4c94479 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,8 +1,10 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e SHA512 1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca SHA512 ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
+DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1 SHA512 a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
 EBUILD herbstluftwm-0.8.2.ebuild 1110 BLAKE2B 2079a99b70b18b38e39876135b44532261bee69a94679f2e7941b5baa9cd16b871386d9160121b5faaa0aad064dc7b9d429f47cd3bf0a6f38d9a309344fc9a1d SHA512 56d405e82d5ba44aa8e33e5d3883a528cc4d7b482ed4d00d4345b6e57705f2115ba16c09c8992e7c73558dff7c79094c303c855e176ce12a8fad878fc9e8701d
 EBUILD herbstluftwm-0.8.3.ebuild 954 BLAKE2B f5cad9f6b9303e33f7c57d9551d49f371cc50acbe0489cf12131ae22beb0291a4b6de8c60995cb39f25746524335e5d250baa2ccf5bc1d7de090414c5d0f5118 SHA512 888d78e245b8183e08cd15cffe4d8af680c3facc0c8b10beeef444106761e001a8db9b7ae0950f5a862546058b8b35bcf5655ade47ce0e84623188e2945c904d
-EBUILD herbstluftwm-9999.ebuild 943 BLAKE2B ec900c2b66998af382063030ca5881673ded5492484ec3fff432472869c1366f40712e64c305de09eba20a81a048fbd720412183d62a597cf0731e51425b9afa SHA512 9b7d43645203175a1435e3a40cb8b6851cdac6d1b552d0b65bfac154fe092e7fe605ef376a57f2d9ff95e5b3bd3e6244cc9e5c58289a72472d8db5f0f675df55
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD herbstluftwm-0.9.0.ebuild 930 BLAKE2B 5aa5c8be1806e29b3f0e6f37ecb7132cef0a51b62d58725b0a06768c5b76c1e3e554e819aafd48ca7f6b9e76638b5b99a3584d92dc7fe1748133dfcbf0c906e8 SHA512 8e020bf24206958b7c5d8a6a80da68742b5bf60540a066240dc26865978b257fe30e4002dda510dd12ddf3e3e605b3971525678d132e5058056837a5e08bf795
+EBUILD herbstluftwm-9999.ebuild 919 BLAKE2B ab6e147439be27c948e76f7daa1b011ed3a4623fe6511280501651361bc23081936df36d18f5221cc4616ba3bfb9a9ec697cba5cf147aa94c012c05112edbfc1 SHA512 c702d88eddca8da725f351a7db7c5ce3dadb17ed336646fdabb5b95d5f1df7f8064f9c1ede59e3f68ed52da3fb9d22b09a0474629b38f0db7cd56621bbf67589
+MISC metadata.xml 535 BLAKE2B 0a0d6cc68bc3e5a21d1c561279947f2174ef91ba6d18c487720069928462379a6c4c23affa425236364b711a40f85faf98af78b5f28ea5148f9dcdb8795252f3 SHA512 34849ec9fe1cdd2a40af6c334844c648eb8d26fda26331618adb285d7c9ffa7360cbb07fd963e8a047ace524abee7b17085b38ae153a83c52127b1909b278b5c
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
new file mode 100644
index 000000000000..c2dc9d85fed9
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc examples"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_DOCUMENTATION=$(usex doc)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 4ebb6b1f0ad3..383fa9d17eae 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake-utils
+inherit git-r3 toolchain-funcs cmake
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -32,7 +32,7 @@ src_prepare() {
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
 		CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -40,11 +40,11 @@ src_configure() {
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use examples; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 6f49eba8f496..213c69357452 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">herbstluftwm/herbstluftwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 0ab22cf5b495..d1ff97b1decd 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062
-DIST icewm-1.9.1.tar.lz 1696312 BLAKE2B c2435e2dfa0c8c9ba490299a9c1545c9b45b8c8960bf1a36889c0304882619c7bcff7ab37b1573c82c92b2b0be514527b051d9651832a22c5f9b8334f5391fdc SHA512 75210466110c65f91192c89e6bdecc3a52c8abc953096789861ebdbbd779b892b708b5d1f0bcb9fcfcb59171a61171bbfc718bffaeade69ced3a978409b4ee65
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
+DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3
 EBUILD icewm-1.8.3.ebuild 2780 BLAKE2B 247c5a39d442164e0b2ed097a9618c0db264c554dc5b9bc2e0f1f2f5eacea089e929414193a85924e081e97ff9a8dc621e1c9e37d2d753533d71835419d6da8d SHA512 2a88275a9f9b1f023f024db5cf79563d5c35c39406f3733a00ec7b5faf822520fe9b8fcb6aa2c4ea17a71c9a3b27858ae8c2ded73106444681cf4ab5ac8a5dd6
-EBUILD icewm-1.9.1.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb
 EBUILD icewm-1.9.2.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb
+EBUILD icewm-2.0.0.ebuild 3010 BLAKE2B 942c8cd13674c6d3e9be00ff0ce71271bd7eb94cd9122f35eb97d0eb5a843aa827c7bb2043e4b514d329dc6eed27385e5af42b9cdd0861b7bcc384e879a0ae03 SHA512 5d26146e561976a571b52d636155d45ee7b062bd7fffa6e278a2932994b7277fd87d390c0431038e09c8b74ce6840c210d7c407a3ff4564ceb227932dbabf2a7
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.9.1.ebuild b/x11-wm/icewm/icewm-2.0.0.ebuild
index cd8d3315fba2..0dfca601ae26 100644
--- a/x11-wm/icewm/icewm-1.9.1.ebuild
+++ b/x11-wm/icewm/icewm-2.0.0.ebuild
@@ -12,12 +12,13 @@ SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
+IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
 
 REQUIRED_USE="|| ( alsa ao )"
+#?? ( gdk-pixbuf imlib )
 
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
@@ -36,6 +37,7 @@ CORE_DEPEND="
 
 RDEPEND="
 	${CORE_DEPEND}
+	dev-libs/glib:2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXft
@@ -60,15 +62,20 @@ RDEPEND="
 		)
 	)
 	!gdk-pixbuf? (
-		media-libs/libpng:0=
-		virtual/jpeg
+		imlib? (
+			gnome-base/librsvg:2
+			media-libs/imlib2
+		)
+		!imlib? (
+			media-libs/libpng:0=
+			virtual/jpeg
+		)
 	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
-	dev-libs/glib:2
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -79,10 +86,15 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
-src_prepare() {
-	# Fix bug #486710 - TODO: Still needed?
-	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+pkg_pretend() {
+	if use gdk-pixbuf && use imlib ; then
+		einfo 'Confilcting USE flags have been enabled:'
+		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
+		einfo 'Using "gdk-pixbuf".'
+	fi
+}
 
+src_prepare() {
 	default
 	eautoreconf
 }
@@ -108,6 +120,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug logevents)
 		$(use_enable gdk-pixbuf)
+		$(use_enable imlib imlib2)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
@@ -125,8 +138,10 @@ src_configure() {
 
 	econf "${myconf[@]}"
 
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+	sed \
+		-e "s:/icewm-\$(VERSION)::" \
+		-e "s:ungif:gif:" \
+		-i src/Makefile || die
 }
 
 src_install() {
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 2d0aa9e91cc8..c5aa8c014842 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,7 +1,7 @@
 AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
 DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2 SHA512 74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
 DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
-DIST mutter-3.38.1.tar.xz 2618944 BLAKE2B 2b7d0baea765a2680e8610553fcf5944af275d4533af61d719ca922c21a400ce771bf7a23093e8fa224453c1fddea6f718b1cfaaac6f079c993cdca5f721bf2d SHA512 55a65d80c886b90da110de69fca8f2c92912b36d6244bd6fcb1e09507469b5d860fa888614a33170b2799574f521ee117fb289a768fa2af5059fe0da51835d31
-EBUILD mutter-3.36.7.ebuild 4703 BLAKE2B a9cd36e81ff9734a41c65dfd744680eb0c82ec59a3c6335e728b110ea79b5278b9066738c0060fad4bf13c9ea580b98baa76177ef7aff20954b43a9e86c7df43 SHA512 20a36f0091e02cacbc482c0c6848872aceef4dbe6506615493ae65794bae0524ba633c7ee1a3895f7eb866d1c8826012e88fe515003c7f8ac74bd0f5016bb1a6
-EBUILD mutter-3.38.1.ebuild 4542 BLAKE2B 527cb071edd45aa97977403e5cafb15fa2aa6d5009c3894f01e11f2e3ee4084da5d96c4f5ff08e99fb013fb8be7b2db2f2c8e64038b1973945510e90d074d45d SHA512 e69a40b16a6c999202a6372520f192b7a892fe348232f49639f732c2973297ea6ecfde5ecadf7e043e1f462eff87c753c4187d984a5ecfcca7eca7c382734674
+DIST mutter-3.38.2.tar.xz 2621648 BLAKE2B 93ddeaa8b1c09ac0cd711513cb755eb94b72c1c44a751e2c6656dd3415fcb278d22e92577400df9443ece0e3dd1bc77adc88d1a24d59bb911ce8114e53340cae SHA512 8bd826fdb643bc966f6b7c38ed12cec9806440bf9cf4792cb90aa62dd96d2fd1018be39148ebd4432ba799cfdd30ed5c3952620ca13b9fac933fb0a477c9937a
+EBUILD mutter-3.36.7-r1.ebuild 4750 BLAKE2B 542b9eeba156e95133e9605d68e9e5d52b5686a71ce30610ddc034287009253019297e775e8f024c6b221794b8b6d250de0e9fc0407ad75700e1ed5ec5cc34e4 SHA512 7cf8215658d9201fec39ac6154c70155b7e58e1fdd8eb251c76dffe127fdabea05ca5a9aa4d6380b2eb3d4a7104bd9d65b4f64b2791f53ce23662a54036cb225
+EBUILD mutter-3.38.2.ebuild 4588 BLAKE2B cc0e0069a256f02f368730958bcbedf398bff20dee6107e79e0accc191195b75ee0ae2f07d9b64bf9653eb9c4a7ed3f99913fbb26bde8089cd76549e7483ae7e SHA512 1f328c1a55625cc4db3a1435574dc0cae1c86337b4dd5cb01f7bc3bac64766d0dd1ee5fe57e3603aec39de787d5f60e2447df3eaaa4919ddf268c24240d79204
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-3.36.7.ebuild b/x11-wm/mutter/mutter-3.36.7-r1.ebuild
index f5dc0a1d9f9b..36c9cd5f2f25 100644
--- a/x11-wm/mutter/mutter-3.36.7.ebuild
+++ b/x11-wm/mutter/mutter-3.36.7-r1.ebuild
@@ -56,6 +56,7 @@ DEPEND="
 	>=media-libs/libcanberra-0.26
 	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 	wayland? (
 		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.13.0
@@ -79,7 +80,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+	sysprof? ( >=dev-util/sysprof-common-3.35.2 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
diff --git a/x11-wm/mutter/mutter-3.38.1.ebuild b/x11-wm/mutter/mutter-3.38.2.ebuild
index 9dd9645f751b..9c81a28880df 100644
--- a/x11-wm/mutter/mutter-3.38.1.ebuild
+++ b/x11-wm/mutter/mutter-3.38.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 LICENSE="GPL-2+"
 SLOT="0/7" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
-IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) udev )
@@ -55,6 +55,7 @@ DEPEND="
 	>=media-libs/libcanberra-0.26
 	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
 	wayland? (
 		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.18.0
@@ -78,7 +79,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index be7ceb355046..abacedb07b0f 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,6 +1,4 @@
-DIST pekwm-0.1.17.tar.bz2 405742 BLAKE2B 6cb47f92f8d32358ece8502fd706880478403ec01bb1aea0a042b2f9a110672c923c7289583f4b63b0e190b3979631c60760fae70174ecb205dfccf15baac398 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r1.ebuild 1695 BLAKE2B 4f9f97e2ed2bfe595283c2bd5e7dae38f620d640b6bf4e9422a5bc4434628c77a51fba7aafc82ef988551d45d948b2949d0470903fce65520c12c3d846af909c SHA512 1c0471b6b671428e1227bfbad8ebbe48a0783bcfcf4561d5c3db74dd907264bbd30eb3c3654bbd5a1bde0a520417186e3e6a1c8d5bc862c0fc691969389a7e0c
-EBUILD pekwm-0.1.17-r2.ebuild 1838 BLAKE2B 40795ce2f870024b519d76ea7989a62d805cf92b98b47a99ec3d3546fcbe756dad66f6c435e4c5adf3429a705e380c03fd34e1e037827b4ba48d1cabda106149 SHA512 2716cace727eec86daeef1b53754339cf50962421ff48b09a8c928dab4b7735cc369518a00165653f582df6410b0a55f05a0d716eda0580d0d9ad07990c9b7f3
+EBUILD pekwm-0.1.17-r2.ebuild 1835 BLAKE2B a2a208181d689d2ba907baa04f4cad5aceef27e18a7e3db14ababaf910043b52dcbab61f3326b3df2d5190ee1176afb5589f1b53483ccd7e1177038773cabe24 SHA512 737636067aff402698836f7fcbeed26f587565febfaaf25f09fd3c5a51919499cdc506da3332c250f6d9ba0a497da66317a8c1eb1c64f40fde0bb6a901225dda
 MISC metadata.xml 968 BLAKE2B 61ebb7661defcb80be3a193ea230be7d657503fe5a4885496fe58152bb63b323f6b94de08b8df52608b640ceba2155c5041a2e452558093571d0bce55b15fd8f SHA512 02042a7c09730767185d59cbd0152a0286d8c1e8c7d9bdcbbed6ed9856c576372dbd3f4375b389d32f207939bdf7a4e60db5804bad07e81d689b79668e77bcba
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
deleted file mode 100644
index ec556a922a71..000000000000
--- a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A lightweight window manager initially based on aewm++"
-HOMEPAGE="http://pekwm.org/"
-SRC_URI="
-	http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
-	themes? ( mirror://gentoo/${PN}-themes.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ~mips ppc x86"
-IUSE="contrib debug themes truetype xinerama"
-
-RDEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if use themes; then
-		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	# Install contributor scripts into doc folder
-	if use contrib ; then
-		docinto /usr/share/doc/${PF}/contrib
-		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
-			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
-	fi
-
-	if use themes; then
-		insinto /usr/share/${PN}/themes
-		doins -r "${WORKDIR}"/themes/*
-	fi
-
-	# Insert an Xsession
-	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN}
-
-	# Insert a GDM/KDM xsession file
-	make_session_desktop ${PN} ${PN}
-}
-
-pkg_postinst() {
-	if use contrib ; then
-		elog " User contributed scripts have been installed into:"
-		elog " /usr/share/doc/${PF}/contrib"
-	fi
-}
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
index c5b8371db7c8..c733ff0ee361 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index d508d9dc21ad..d50a4cbff6fd 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -2,9 +2,7 @@ AUX 50ratpoison-gentoo.el 524 BLAKE2B bdee7d53d024fe1d6be49ff6d3815747448fe8f0c6
 AUX ratpoison.desktop 122 BLAKE2B f72c9cfdb0712eef05037b1fdedbc5806f6f4957d2d549bb1fc33d252feaa39b78478fad4b155a4b5984e1b8fffd7f8df78bfe6ab55849163e08625c1a858f58 SHA512 f94b9557636a130939ab29b440c07c64ebb6d9ab169ae32af87314d147a31c48f5a74721e85a7b7260b6ce1ad5172234958c8af075a2b0b1f308961f4f3fe12f
 AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58e27304a38053eaee7de6a025ae872049e6fc75f7480dba3fe31c89d04e537469ff54dbe421cb26b0e9fd228c20 SHA512 c9e0e322b0c632b6bd7cee0c34269accfd0cf2d12751b9f2a65955f5ae5aa72804f819ca0147da5e0ff571357b34460337668adc07ad77afdf7a50b512f6b36f
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
-DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd51311f8ade6df95ce69be1ffef03fb2837adc4bf9eafa737d14d47e788ad4ff54885f3bb030acf278893a91f099a841 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.8-r1.ebuild 1806 BLAKE2B 0f89cf825b9e89482f2f78174a48a74bb082c81dd0a0f449b0355b98037f4f3369ee9025dd864b0f87c36ca867e0fe84042a3b5c3be7de04060081341c170e7f SHA512 ea3bdca5248dc8e71841717dc7af88b8b5342278aad37e64456cdf15b8036cc782df894ec7c1d537d9805cf23bdc633a41833bc1ad10b1582a631d46164b9f77
-EBUILD ratpoison-1.4.9.ebuild 1848 BLAKE2B 435bacde6d01720216be440df1ebe9aa933e9f546a33a5c7cb72f30399b1f6e6165ff99fdc44b0321f9a93807a17cac848a7963c42b2c8080424018adb363b3f SHA512 9ccb71e717e2e43b42cbdba32f475a837928fc5b7dc4066d9ee3aad1d9b613bc84806e5e0f505824b8cb398ed9365161a690290783305497e3fb213aefcb7866
+EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 8c538d24ea9856bdfc52706aae08a4e939f6530616e68f4d5f81caa458af013756a81d069f26e7d96cce11d0a9ad1d152784b5b4b5f3a759f783499f1b7bc197 SHA512 d73892acb71766c28d94c3771f0853b9fc586727ce747633a47f57595e5c075f74d3ff962670cb0cf1a7ddbc5a6f02aeabfcd8d732707865708beb83b36377ee
 EBUILD ratpoison-9999.ebuild 1849 BLAKE2B 980bdfe6a063c8fd949f123cadb2086684b06a708fe0aa0df8fc811121f4108ef68454f52405a0bec625c531900cd146a546104242b95240b56ddeb2df5ac1c9 SHA512 3a764c4fa0cc0e7a48d6f079c618faceb00fd0a5755e28f061811802e052683e9d4c304ae263d09af43f7d591a8d226ca0f8b5b5e26c782a8694883d908d3335
 MISC metadata.xml 994 BLAKE2B da7a977d643d540812fffa082f5cba76cd79728302533e77627825a08fb0bace3a2b3bb917cd8b6cd3cecd2c03182b72ac902909a4c7d575f8e2ea936a510953 SHA512 f64106b49cfcfb17e08d3c897be4de0ef3df083fded72804d9b0e0f4e2eedcc2c8c679dea96c59dcb41937b547497ac1445102c0a63ef965f92b450dda0edec4
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
deleted file mode 100644
index 96f03c5961ba..000000000000
--- a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit elisp-common eutils toolchain-funcs
-
-DESCRIPTION="window manager without mouse dependency"
-HOMEPAGE="http://www.nongnu.org/ratpoison/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug emacs +history sloppy +xft"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	history? ( sys-libs/readline:= )
-	xft? ( x11-libs/libXft )
-	virtual/perl-Pod-Parser
-	x11-libs/libXinerama
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-SITEFILE=50ratpoison-gentoo.el
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/ratpoison.el-gentoo.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable history) \
-		$(use_with xft)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-	if use emacs; then
-		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
-	fi
-
-	if use sloppy; then
-		pushd contrib
-		$(tc-getCC) \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-o sloppy{,.c} \
-			$( $(tc-getPKG_CONFIG) --libs x11) \
-			|| die
-	fi
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	use sloppy && dobin contrib/sloppy
-
-	docinto example
-	dodoc contrib/{genrpbindings,split.sh} \
-		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
-
-	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
-
-	if use emacs; then
-		elisp-install ${PN} contrib/ratpoison.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index 4c8158573b9c..2b0a855b17c6 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index fa6a7e486744..5510cd94591c 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
-EBUILD twm-1.0.11.ebuild 561 BLAKE2B cf373f1576c973a1ef087ea16498bb1b12db59da8d8938e1f2b39d376393a0beda440f8607d2540c9f5a8aa49033f888ce71882ce80616e44955df3e0caaba73 SHA512 b1fe7bb9ea02a45671a15edc9c172394e7376a0cf83c229c08297356a4c2b3bffcdbed1e90e5ab2f804b35f9b791f8ab9442482ebc39e353ca20ff044a246095
+EBUILD twm-1.0.11.ebuild 568 BLAKE2B 53b3ecdbcaf1164d984527b1a23e8ed9e3eb417bba0edcdbd8de2a679d6edcceb58f7613986edea76ced23cea596571bbcf5600972e3e79b1b0e47d8cd7a4eb4 SHA512 800b025ebcc9524492e83a9ccd880e5ae2e3b2413b743707cc37b7791b52483e354fe5d40468d2d466d8c2ad40cad6558e867372726a34143437145ebbacd147
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 962cea70292b..e53ee26c3372 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="