gentoo resync : 13.09.2019

14 files changed, 114 insertions, 369 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b34ff513f9a1..0f9138561a04 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 9025da525b81..0cfa8b39add4 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,9 +4,11 @@ DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a652
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
+DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
 EBUILD i3-4.16.1.ebuild 2325 BLAKE2B 8b944e98274f9b573712f90906f5c44f4770107743ec2742fb90d9076209b4b8db2ce4e0cc530a95b2064b969f5cde30b1af494d3b00bb6e9d5b8bf363ed2923 SHA512 325c3129b367ddace668f1f162466f94f970b8f0a3cde9f2d9d0be2506ae2389fb6946a94952035e5a8a8912e4b618dbda04e2ee72c9351a3fc851d2b042acd1
 EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
+EBUILD i3-4.17.1.ebuild 2324 BLAKE2B 5573454ae13e9e700b471155becf18b648c5aa3da86438eceb0ff2d0eb6b20b4412b00687143184b821c062356c532b8a84fed064c08c73b8d5f221b26ccf9c9 SHA512 ebbdb9d58ac64fded6da388fc736d0a1e056a377898f90eeb079002fdc9d30d53ef6c209613c11941792d3b8ca169148c2f0f67d7498a4f76e029397c9fb9f22
 EBUILD i3-9999.ebuild 1814 BLAKE2B 4bc786cad1c87f351da34303c63fa0d5e1874bb97852df7bef3ba4c9837a524c4abd18294c3be46752fe66c66efeb40f781e9964f0c1207c76b4145aa7d7583d SHA512 b3a4429575ac3440f026a73be0dc2d412bc4292a0e1640d20e4042f72c59ed7ade740f8f45fb7b6d7daf69f4cb09b863db923ad7f82b181caadfe2d57aa4bf60
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.17.1.ebuild b/x11-wm/i3/i3-4.17.1.ebuild
new file mode 100644
index 000000000000..70b10d43e8f7
--- /dev/null
+++ b/x11-wm/i3/i3-4.17.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/AnyEvent
+		>=dev-perl/X11-XCB-0.120.0
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		>=virtual/perl-Test-Simple-0.940.0
+		x11-base/xorg-server[xephyr]
+	)"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+	emake \
+		test.commands_parser \
+		test.config_parser \
+		test.inject_randr15
+
+	virtx perl \
+		-I "${S}/testcases/lib" \
+		-I "${BUILD_DIR}/testcases/lib" \
+		testcases/complete-run.pl
+}
+
+my_src_install_all() {
+	doman man/*.1
+
+	einstalldocs
+	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "There are several packages that you may find useful with ${PN} and"
+		elog "their usage is suggested by the upstream maintainers, namely:"
+		elog "  x11-misc/dmenu"
+		elog "  x11-misc/i3status"
+		elog "  x11-misc/i3lock"
+		elog "Please refer to their description for additional info."
+	fi
+}
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 9d52e93d01d3..7e2f03e80bcf 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,12 +1,6 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
 DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27
-DIST jwm-2.3.4.tar.xz 332140 BLAKE2B ad2ea9d094b6cded0891176c97900b8491c3d81f64b1df7617c8936d581c849c4515deb8795f3f10018f469c1a97617fa97ec50fb2088dc7ea221ed55af2de97 SHA512 db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1
-DIST jwm-2.3.5.tar.xz 339792 BLAKE2B dcbaeac2e6842499509651155618821cf302b3e3ae1b013f3811c49e65ac83122e00aff33af4a366ea0c126f2a009a0baba0538e132f00efac306319b94e50c4 SHA512 cb45a5fb349e6c130b89996ba11a99059e95ccedc4ea82ad527676130833fd93297b64fad905a1f22908a4ae69cca544a6353c37160ed8df3e1089f40f9a0565
-DIST jwm-2.3.6.tar.xz 343644 BLAKE2B 44d6156b79957352b52f8f4000f12e655259f2125eeba183a087358b7537d3affd7125a50b0ff93efa9c8d2599d08e7cc3db6c26807ad587481ce689541aaad0 SHA512 ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
 EBUILD jwm-2.3.2.ebuild 1423 BLAKE2B d9033cea48ccf8414941bb5a6e2aecdd64e59e2aef5074a599df926729f7a8dce38424ae95beaf89e11fdd66ec2eeda00c8eb134be100520cb22f684680ef806 SHA512 18379ea09e94db1c5996752ccb75d13c5417b548863804c2c58885125b8d463e897e2baf233298008fe6a1bd829035e72221c471afdee78af3e8d3dc17370645
-EBUILD jwm-2.3.4-r1.ebuild 1493 BLAKE2B ade32fbe5954271c26943490d0c1970084b7f53dd9d3559bbd26b9bdc4a32c712eac8fb68a1abe3328c942c5ca35be4fd68e3d0e9da0efdf415c0fbe8f83b00b SHA512 42135fa2006cbc7b8109df9c6e8b19f78715f88802ad3d3ab24810dfc078b4c309e569c48b3a57aa86df928ac55447363829a9cc0543ba7afaae26f21822c1d1
-EBUILD jwm-2.3.5.ebuild 1773 BLAKE2B 38544c2219983545a7c3d12d2656858e0e790cbec3344f1f6b5cff82bde53fce18e681038155ba65e98075e504f0d595ba145dce1bfbfba4c0b1203cde827203 SHA512 1608c2e237a6acb2f608ba6b7e36b4feb172f75de94ae8b170985b7c78d501ffd5264ea5b6a1191f71778aace4163af0cf8839f03684219d89eeef3f872e5412
-EBUILD jwm-2.3.6.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
 EBUILD jwm-2.3.7.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
 MISC metadata.xml 898 BLAKE2B 0b366993a3e1c91c6f4abfba9f97144d00c2a002f81b898f9403c4a4ed79c9ad491edd6ad36a675287bbf4543e0faca6da127bbb8cf1eb9b0baa0e54beef3dc1 SHA512 87e56bee3a559b4056846016673eba8784f287b69162027ab0da9e2e9cd17d71fb8fb693dcd3fa1aa70017d567ca93160958a76eddb97ea97f2acf0a0ff2a019
diff --git a/x11-wm/jwm/jwm-2.3.4-r1.ebuild b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
deleted file mode 100644
index 1cc308d043e8..000000000000
--- a/x11-wm/jwm/jwm-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi debug jpeg png truetype xinerama xpm"
-
-RDEPEND="xpm? ( x11-libs/libXpm )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	truetype? ( x11-libs/libXft )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg:0= )
-	bidi? ( dev-libs/fribidi )
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_enable bidi fribidi) \
-		--enable-shape \
-		--enable-xrender
-}
-
-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 example.jwmrc ChangeLog
-}
-
-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/jwm-2.3.5.ebuild b/x11-wm/jwm/jwm-2.3.5.ebuild
deleted file mode 100644
index 8607775ee278..000000000000
--- a/x11-wm/jwm/jwm-2.3.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	cairo? (
-		x11-libs/cairo
-		gnome-base/librsvg
-	)
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( sys-devel/gettext
-		virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable bidi fribidi) \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable iconv) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable cairo rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		--enable-shape \
-		--enable-xrender \
-		--disable-rpath
-}
-
-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 example.jwmrc ChangeLog
-}
-
-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/jwm-2.3.6.ebuild b/x11-wm/jwm/jwm-2.3.6.ebuild
deleted file mode 100644
index 44d5478bb9ef..000000000000
--- a/x11-wm/jwm/jwm-2.3.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	cairo? (
-		x11-libs/cairo
-		gnome-base/librsvg
-	)
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( sys-devel/gettext
-		virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable bidi fribidi) \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable cairo rsvg) \
-		$(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
-}
-
-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 example.jwmrc ChangeLog
-}
-
-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/mutter/Manifest b/x11-wm/mutter/Manifest
index a28d03565051..1456282e3257 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -12,6 +12,6 @@ DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e
 EBUILD mutter-3.26.2-r1.ebuild 4080 BLAKE2B 1d5f4a3124fefcd5ef813fd53fe4a62b6d7aeec3963e2f0719b58accdbe8ac23e768a420e2d1424282dd476b8c544612c9fe0fe9e5aea5c8781705708c5aef5b SHA512 b551ed5ede7d49b489f89f226dccd4a313f94ae2c429c9b572747782df197157cfe961b5d5bc36abe7f160578ecad248c2c213009abac79d68e943f6ab680892
 EBUILD mutter-3.30.2-r1.ebuild 4779 BLAKE2B a074b6bab4ea5005ec421ed8c7c9529da1ecdded81e6d6a9a25b795a784c77defbfcb6af34bf404ca92adc22faea10c786c9566d6ea2194ccf618b888c679f56 SHA512 2e7a7f68c8d8e3d2c185ee9e073a60e7f72639897b48b0f823b4a5ab3f95452595aa501657f7a5953f92e95170766d55dc661724ea616e088b91b7e98622e533
 EBUILD mutter-3.30.2-r3.ebuild 4788 BLAKE2B c369445d8f99380447ec5d9278ce1753f7b8e41c36aaf05836cdd5e05d5516472dd07dcdc0b4241cba08b58417ed1b16c90c350ceba07bdc8a97def8a76ee908 SHA512 9a474d06a0c71306b9ba8c3e81113abd78f44f22a8b62d045d8da83143b9da3f19f20ad3c7cd6fbcfcd467dcd4431409c05680a29cd31e1f3f5033ab3cb6a5a4
-EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a174de32d79499cfb7e13562056b3bf768e27b3e8a499cc65a4b6a445431339146b986e5121743d5ce020e95c68f172d2c4520d11f58e05047705e01aa70f3b2 SHA512 5527cc326594e06ddf96522e09cb39c1dee1a688b26c2052061ec89525a80fe90b1f6a372dce59dcb3e1484188be6dbc4842c4844e6569a204db198ce946cc21
+EBUILD mutter-3.30.2-r4.ebuild 4865 BLAKE2B 47b15d79cb0fa7abcbbe920f7746cf6dae9ef5ad97c3efc1d63540995e4a047aeb7b9e0815fcd15755614cff883b0ae74d01c85b7a71bced43731e829e5cb8aa SHA512 078bdc5ed7f4f4c6c51bdd7efa2a0dca65056073d3a82e5d6b384a4dcb8f941ad2baa7ee3f42c1644d9bb92b81dc05e36511049e499dc2f78a3d493cb94ca94e
 EBUILD mutter-3.32.2.ebuild 4571 BLAKE2B 91a683716be774f7377080e834148a154d839b816e6bfe7b25017a147191acb07de0fe96f437b7b12ee2c5d466a81b63ab2a453f43e1818904223dfcfc70336a SHA512 89f589a8554d9e5aea69269c2240e464eaac713729c0ba2bcf4722540d8ef48e33f1237e1cc2b6f377539fd4b0e964cbb8e5f433ccec5ad7651ce4812af25a7f
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index cb9832016954..8329ec0e94b4 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 136c20bc11dc..9ec7bd6361b1 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,7 +1,4 @@
-AUX spectrwm-2.6.2-Makefile.patch 661 BLAKE2B 45e021e9d81929a71c98f525a586070d58a7f7558398357cda9b161a009bba09f84522a0d6ea3c4df0919b6fcac5b86711e7ace097b32c60374917b1a2afdf85 SHA512 12246a6bb44cf7f0f02bba4b488e7783acdc32a8dc28a93e979995a640e3731e26d2108f19e0cebe3ea3540903f495ebc4b487a7f642ad3c87077c63df5bfb3a
 AUX spectrwm-3.1.0-Makefile.patch 1049 BLAKE2B eaa14f871a82c2c413c65a65d0a007210dc1f3e934145e8c932768311f644948c80d240e8817de87c80f36f105bd1017d8b7bf28a129d489bcd2ffd93c41464e SHA512 7b0bdb63d01713a946c68d1154df8cfdb213a155ddb5cd9ec5876dffe48dfa3f3d272c420391acab1ac86c314ace6d4a999ed18865ed148d97c64b5497e751ee
-DIST spectrwm-2.7.2.tgz 132554 BLAKE2B 78d1956be33a192f63a46bdef250427d14f415261b734355266cec236fcec1ab66fc08ab2e0aa1981a92849ca23f53441494c6990c3ef72fe4c7956e22c7aff9 SHA512 cebb0e42566125933bf2c4c9200765d360bb572fd953c510ad39e7abcf9cc507e61420441234fb1bb44d06d28526ba6c594272c173a04181d2c6798e404b7421
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
-EBUILD spectrwm-2.7.2-r1.ebuild 1093 BLAKE2B 692d22a1d46bb800caafca7fecd868e51a3e65c4e58063544b203d5b674ccf75e14de4aa5839204786d87ffa6ac6cfb24071d04ce7c6ec49419906211b726d68 SHA512 8781f95f64cfa1443ea9c33b01499257ea3d6e31600ed669990a883b9ace0ff070903e5cf7cd501fa0ad0f117fdbda30fca4ffdcb925f852d76df1cfdfa3e568
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
deleted file mode 100644
index e380b60fdf13..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spectrwm-2.6.2/linux/Makefile
-+++ spectrwm-2.6.2/linux/Makefile
-@@ -9,7 +9,7 @@
- LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
- LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
- 
--MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
-+MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
- MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
- MAINT_LDLIBS   = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
- 
diff --git a/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild b/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
deleted file mode 100644
index 0a0371d5135d..000000000000
--- a/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Small dynamic tiling window manager for X11"
-HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
-SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/dmenu"
-DEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	!x11-wm/scrotwm"
-
-S=${WORKDIR}/${P}/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.6.2-Makefile.patch
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
-
-	cd "${WORKDIR}"/${P} || die
-
-	insinto /etc
-	doins ${PN}.conf
-	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
-
-	make_session_desktop ${PN} ${PN}
-
-	elog "Example keyboard config and helpful scripts can be found"
-	elog "in ${ROOT}usr/share/doc/${PF}"
-}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index a8b53f6ddd78..5fbc9dc5d802 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
-DIST stumpwm-1.0.1_rc.tar.gz 197530 BLAKE2B 2883ee8a0f75d3c673f6b6f65675c98e9fad8ef181b3ed9cf8bbd5eed7c0d63f3f48d021d056265d4e6c14dd0594bfe3a36492cd9bcdf2b3379d2aa62eba1f67 SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2
 DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
-EBUILD stumpwm-1.0.1_rc.ebuild 1720 BLAKE2B a6289438611ad9fbc80574180ecc3c1e8a7f69e043e092c9bf65011bd8f302dcbb22eb3eefce1cec3a3ae4a62370456bde525df4f3463ef56db5bd77bd3c0fb9 SHA512 3a384f1a61caa62bd8ed598ef546d43a842beaf19cce966c319d6b8ae371f23ac1d0da5ff57a34078b112d051695a69ce512ae401ec64eadc4ac100513676b1d
 EBUILD stumpwm-18.05.ebuild 1636 BLAKE2B 9ad4bfb55786e66731069b3c54d6a5c62dd66d6bb3c54f597ac21b5f807a00847c93837242fcdb13437a0e21c95f156d96c407659b9e89cc3643f3bff156e0aa SHA512 ed4381c2b597db24ea622ff2b0de301be55a70a7917e4cbeb144b8a881e32b9f656b8c01987734a4fa698799ff5b61f19356e3d5d14e1c0f3dce30409e13a87f
 MISC metadata.xml 2220 BLAKE2B f41cb5a9738d00631d9fa733f705d8717db4c75640914d7e5b115fa18a6bf1869c7019e79d8330f2cf4d514ed7c48eda7b2bf5f8f9a22a11fff9022c9b7cf927 SHA512 457b833b3e03bac4189c980e12de25289c1f8c6b26cffdd40e09c410554f5d48aa06ea559cf9cf86c0d00014c50c06af902802303736fed7ac086244266ed0bb
diff --git a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
deleted file mode 100644
index 9b097e9195f3..000000000000
--- a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 autotools elisp-common xdg-utils versionator
-
-MY_PV="$(replace_version_separator '_' '-')"
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/stumpwm/stumpwm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/alexandria
-		dev-lisp/cl-ppcre
-		dev-lisp/clx
-		>=dev-lisp/sbcl-1.3.0
-		emacs? ( virtual/emacs app-emacs/slime )"
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
-
-PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-
-install_docs() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples
-	dodoc sample-stumpwmrc.lisp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf --with-lisp=sbcl
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && install_docs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}