gentoo (leap year) resync : 29.02.2020

27 files changed, 256 insertions, 141 deletions

diff --git a/x11-wm/2bwm/2bwm-0.3.ebuild b/x11-wm/2bwm/2bwm-0.3.ebuild
new file mode 100644
index 000000000000..3f6bd230aa5a
--- /dev/null
+++ b/x11-wm/2bwm/2bwm-0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/venam/2bwm.git"
+else
+		SRC_URI="https://github.com/venam/2bwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A fast, floating window manager"
+HOMEPAGE="https://github.com/venam/2bwm"
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s:-Os -s::" Makefile || die
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md
+	save_config config.h
+}
diff --git a/x11-wm/2bwm/2bwm-9999.ebuild b/x11-wm/2bwm/2bwm-9999.ebuild
new file mode 100644
index 000000000000..3f6bd230aa5a
--- /dev/null
+++ b/x11-wm/2bwm/2bwm-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/venam/2bwm.git"
+else
+		SRC_URI="https://github.com/venam/2bwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A fast, floating window manager"
+HOMEPAGE="https://github.com/venam/2bwm"
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s:-Os -s::" Makefile || die
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md
+	save_config config.h
+}
diff --git a/x11-wm/2bwm/Manifest b/x11-wm/2bwm/Manifest
new file mode 100644
index 000000000000..3a079bf2ae22
--- /dev/null
+++ b/x11-wm/2bwm/Manifest
@@ -0,0 +1,4 @@
+DIST 2bwm-0.3.tar.gz 41032 BLAKE2B 41fb12dccef95221fc5b6cec1d6b740037e0842628aedea23d80980961a615a4e5cf32ee9bc6c57eec8a2e304560b5f54dec0f65462af602f70c467d8c4ebe83 SHA512 088a97e5245287890c72e2b0685f7348a4cc0fd49582893b7ce7a081f80a4d7454a3c0eadf4609589314351ded02fd8b75548019b782e797350ad5db5c939f92
+EBUILD 2bwm-0.3.ebuild 836 BLAKE2B 4da7aa68b4a5efd322b526633a38257f7f2038b3b9ee9561ea178c36faaeed1242ba918b7e075ac4cd3a5653cc9e183f0927d343cb1df1c329a53528dfc515ac SHA512 3779f3a5ee7f6e28b3ba06b5c82b15372f0b2a99d7b807e51d22648c21be6728c2cad4b195b6eec4f873f64fafd190d18e7e34ce3717be0df0f4042d9891d2a8
+EBUILD 2bwm-9999.ebuild 836 BLAKE2B 4da7aa68b4a5efd322b526633a38257f7f2038b3b9ee9561ea178c36faaeed1242ba918b7e075ac4cd3a5653cc9e183f0927d343cb1df1c329a53528dfc515ac SHA512 3779f3a5ee7f6e28b3ba06b5c82b15372f0b2a99d7b807e51d22648c21be6728c2cad4b195b6eec4f873f64fafd190d18e7e34ce3717be0df0f4042d9891d2a8
+MISC metadata.xml 450 BLAKE2B d458edb170c1e45ce1083d9e2fe611ea116bae2109802e2a3cbf1e6ee085d0393f6e1304544cda8330c75fe152484597344ade8c2660cb7ba6ab0298b64ee320 SHA512 88becf800deea65968a1d2c8222266c09a3bac6b71572103285e172c66de654052fb8338488c85545423cc7f1f29464be3ad3b00a7dd4a52f3d9a698405c35b3
diff --git a/x11-wm/2bwm/metadata.xml b/x11-wm/2bwm/metadata.xml
new file mode 100644
index 000000000000..d33f238de018
--- /dev/null
+++ b/x11-wm/2bwm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lillyjsm@gmail.com</email>
+		<description>Jake Lilly</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">venam/2bwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 653a2291f8fc..f042bd3951a9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 609316f2f1a9..7d94bd475d64 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -7,6 +7,6 @@ DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
 EBUILD fvwm-2.6.5-r3.ebuild 4829 BLAKE2B 00dc802a709c4ac1bdec33b723899895f26fe20e70ff245838c142d25b24eae646a16c93ba342395684b914ec52c3bd9f256efe5a4f876232b40b33bcb286277 SHA512 c1ae5188318030d01b65f6429874a990fe8df1a62afefe265e82beade9b5960958a40fd3f578c8ed1e34a10ec060ae6d2d277b493a399d292435585872152e25
-EBUILD fvwm-2.6.8-r2.ebuild 4138 BLAKE2B ed620d5747213fb8a7fa9757f7afa02c6d2f6d9dc482e4de4813d833c5b880580a8fb4de062db20d9e683b9a60758de541ff7fe63141a84d9acb90c12d35f69c SHA512 1a7d8ec7ca928adcac5abe0cc2cb69102cd66f987595293bf453ffa63aca396c0b94960f7108093ea50ad1cce817022586eee6c3585f5978193ce66374a3408a
-EBUILD fvwm-2.6.9.ebuild 4138 BLAKE2B 23f723376afa26dc85cfa191c15f906b4123fcdc1b2b377ccc35a89c3a7e2db1e888f61570e29f3a047ff3b1153c72638ebf9ee182f5fab86f9f486c5173bfcf SHA512 2131d2eb6ff670905671c11cbe70514d62f260d6f19f9fc8d0cea8b5e0962358d191902259351870bf1916048da127711df96c0317b23d94f881e2e833ad6e85
+EBUILD fvwm-2.6.8-r2.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
+EBUILD fvwm-2.6.9.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index b5e6d5907947..f72e00f30238 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,7 +86,6 @@ src_configure() {
 		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
 		--enable-iconv
 		--enable-package-subdirs
-		--docdir="/usr/share/doc/${P}"
 		$(use_enable bidi)
 		$(use_enable debug debug-msgs)
 		$(use_enable debug command-log)
diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index 3d7394dc0320..f72e00f30238 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -86,7 +86,6 @@ src_configure() {
 		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
 		--enable-iconv
 		--enable-package-subdirs
-		--docdir="/usr/share/doc/${P}"
 		$(use_enable bidi)
 		$(use_enable debug debug-msgs)
 		$(use_enable debug command-log)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 0ef343adf0d2..bd47466bebbc 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -5,10 +5,12 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 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
+DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B 941ebc7e16c4376bed180964e610ce38ff216b3d8b7c406edc07deb7b91f03390fe1dd064d3288048b1d77b47572ecc9c7d2643c868abd5c0d257b1dac89af22 SHA512 10d791310d6617ce95253d4dafc97291558e229dabea1c8ad44ecb1061d2baa9edeab2aef5c2b36ebceac85171339bddc81d33494f2fb244facc6c256cef2e6b
 EBUILD i3-4.15-r1.ebuild 2323 BLAKE2B cc8f7d2d4565bcf7c8ddea111223fb357326e9012e8225d42f976818a308a49dc32c20b3f6af0d52b48393c21c01ec7c282bf6b2f13c7f79149d64c144be6278 SHA512 dac2e0e43a3a1ed58664b49e5f29c0af6008095380ad061a606802fa6239c87272ea99a970c09d04a3a862366843b422592d12058a1064765ec64bf08f2cc2e5
 EBUILD i3-4.16-r1.ebuild 2318 BLAKE2B cf613187d4105fbb66ab77ccf1d7dc7d6aff2171e0509b7cc99e72b5b93353583847bb07f994c432bc33f0cb38b3448367c4cb8f063daf5cdb0eaf0803bd2455 SHA512 335cc3cea82d35055c322bef7cdd141ddd51ea96ccacd27bf2ac431dd03691047711d6679aa7b74cb529ffa732a3e337e7d3f6676d899ef453faf24416514227
 EBUILD i3-4.16.1-r1.ebuild 2328 BLAKE2B ad26677f4353183174614bfa92361f4752c5e9acb4c0a6bf7328a65e8e63e3ccdc4afc1b7fa83eda96144a9bed72d6a62edf74da41300aba4639cf75dfbd54d5 SHA512 8078b647012fa62baccd4536c5b6e6925adbef228fcd0f274786a45820a1dcfa01402c2b58b3cb0b684114cc57a1bf4e049ca0ccdc23d60dcd047e954f104943
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
+EBUILD i3-4.18.ebuild 2128 BLAKE2B 99d9309ce3cf1673708ebdc5830db5c67c467df78295963d19c920e26704510dfa694762f74b638ebeb4fc937e964409c8332e00e2f1da6af1316dfb629eec65 SHA512 cd8e635c5c60b4d1e8372e8bfe597bff93c5449154842ae5b9bc966900105ed948eae98f965cac20740870d5e092318cea0218a6ace8ad87c0f5cc04eff844fa
 EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.18.ebuild b/x11-wm/i3/i3-4.18.ebuild
new file mode 100644
index 000000000000..d7064cfb971e
--- /dev/null
+++ b/x11-wm/i3/i3-4.18.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 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
+	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[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/X11-XCB
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)"
+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 check
+}
+
+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/icewm/Manifest b/x11-wm/icewm/Manifest
index 7f1f8acbf829..f173a209837f 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,7 +2,7 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
 DIST icewm-1.6.3.tar.lz 1678149 BLAKE2B cfb41b104f0e64172b1aa983b542dc42b6369061ad4365547b14f4f96bccba6610c9b4324ccdc691421354c387c37fa80e525658139ba4213b6ea8d86448e3cf SHA512 18d77695c22131fac98172c09e27c014c10e908f4fc0cbeeb376b9308a659f0a51b466c80fc39875d8e0cf52fd6b385e636faf96c55fcb80b2cb9c1d0eb57e41
 DIST icewm-1.6.4.tar.lz 1684348 BLAKE2B 63d2c609277f78ca438720c8f38108cf5b8f82361810773a79f42b161ccfb598f468cb6352ed3e1c7d523869ba6152be09e8f4ee008f300431dbe4fde4dc0325 SHA512 6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000
-EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
-EBUILD icewm-1.6.3.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
-EBUILD icewm-1.6.4.ebuild 2673 BLAKE2B 47e54e3738bf72d23905e423e1fda01f61bb849b02e75c4d9e241224821a0aa8b97254fa852243790bb3691c97f2112600bbf67869dccc1f3b21475e3793db1c SHA512 1052f64d37bcf4094b9a19122a00d8559ec6d47c7b1a8b530eb984d9aaa1d72b6c519bc052f6cdf6614cca6c77ea9b4bb558484a5b2267a931a097d2c8c0c1db
+EBUILD icewm-1.5.5.ebuild 2340 BLAKE2B bc642a3517caf7db6396f0123cc23f266bccb75b4af0c62f0519c98fd0d5ed61f3cbee29b6c48c979986c16bad87eed0cfe64aadcc345ef40b82feec02d56f5b SHA512 fd19bd04c7fc3b475af8b3915563e37be1939aecadf08f89f0b69c0a566f7b9adef413a8c4f35b17302a71da72a972f1e034c6f509b306fb32e17a5bc3e5df81
+EBUILD icewm-1.6.3.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+EBUILD icewm-1.6.4.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.5.5.ebuild b/x11-wm/icewm/icewm-1.5.5.ebuild
index d38893669b3f..f5b8c004563d 100644
--- a/x11-wm/icewm/icewm-1.5.5.ebuild
+++ b/x11-wm/icewm/icewm-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -105,7 +105,7 @@ src_configure() {
 	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
 }
 
-src_install(){
+src_install() {
 	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
 
 	default
diff --git a/x11-wm/icewm/icewm-1.6.3.ebuild b/x11-wm/icewm/icewm-1.6.3.ebuild
index 4c87bc3f6120..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.6.3.ebuild
+++ b/x11-wm/icewm/icewm-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -123,7 +123,7 @@ src_configure() {
 	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
 }
 
-src_install(){
+src_install() {
 	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
 
 	default
diff --git a/x11-wm/icewm/icewm-1.6.4.ebuild b/x11-wm/icewm/icewm-1.6.4.ebuild
index 342a1affae01..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.6.4.ebuild
+++ b/x11-wm/icewm/icewm-1.6.4.ebuild
@@ -123,7 +123,7 @@ src_configure() {
 	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
 }
 
-src_install(){
+src_install() {
 	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
 
 	default
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index fcd8d3afba92..944b33900044 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,12 +1,8 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
-AUX 1.3.0-OS-detect.patch 408 BLAKE2B d12dff0ac02af8542367ead135f9205e4e310acc3f4afcf222bb4fb0ba1eb395f2acc3fa7c7ae53ed5962da125458e0447996a96af600fa283ff4fa9485f1037 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b
-AUX 1.4.0-poppler.patch 511 BLAKE2B a81c3086043dadfa62cc493a37ca22044a74d2e4966ea880f0dad96f3d0940445e9cfb575a6cc8525aa22f6c313fdea11d3c39ee00905a50f349bc69fc472d5e SHA512 fe765f11ecb7dc99d421d8e4b6fb3fc18279755fbc7ef41517d315e2ca3fa703ab7826f6ce2de62198354379c66d02e1dd4240f33d9f621fa1e9837fc2222b60
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
-DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
-DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
-EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
-EBUILD lumina-1.4.0_p1-r1.ebuild 2158 BLAKE2B ce102e9cf2a5dc026ae83205dedc31cfd3295de9c38bb88f899fd09e509067711620a5643fc7b5ff571547a9c8b134f3cdb5db3ae365af174cd8db774e71ad16 SHA512 5087d59aaa8be0b47672b5f66db4db3d068f47021e8a41e65d63f73fcc1192d93cb7fe36d48fb5b7dd7f02fa889832055a26c50ac7a78e3c3fef0e7c336b2bca
-EBUILD lumina-1.5.0-r1.ebuild 2413 BLAKE2B 3ef16d92410e888f429767045519962327f942e88484c7e5b5a0fca22140c48eb23031f22a19117291d70b128d2429327c37043f7a21ee0657f3b2fb3c7e7469 SHA512 a110a66e1dad7c748ff773172a85635f7dc7e449a129ed4f741df664e149c08f1a48e129fa833dcde9388aee828f6983e248afa3d828f243fc903d4626df9ee4
-EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
+DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
+EBUILD lumina-1.6.0.ebuild 2418 BLAKE2B 5edf64f68c136c88d406cb51ad273a1c1be9aad51762c54125616569a90e9ab9568a2f9582ddf2db8209d97f04791b8ffd6088004b6b4cc2fec57180edc54645 SHA512 4186526b3679ba0c708b4c8a061742dedafb640b97db1cd3fe49ce93aaeed57d96a542d5cc5c5e7342f60fe49d6aefda65e4205c06accc49b6d2f3f1e6735fe9
+EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
deleted file mode 100644
index 48a2076f3aaf..000000000000
--- a/x11-wm/lumina/files/1.3.0-OS-detect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src-qt5/OS-detect.pri
-+++ ./src-qt5/OS-detect.pri
-@@ -76,6 +76,11 @@
-     equals(LINUX_DISTRO,"Fedora"){
-       isEmpty(L_ETCDIR){ L_ETCDIR=/etc }
-     }
-+    equals(LINUX_DISTRO,"Gentoo"){
-+      isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
-+      isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc }
-+      isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
-+    }
-   }else{
-     OS="Unknown";
-   }
diff --git a/x11-wm/lumina/files/1.4.0-poppler.patch b/x11-wm/lumina/files/1.4.0-poppler.patch
deleted file mode 100644
index 8b9399aed9c6..000000000000
--- a/x11-wm/lumina/files/1.4.0-poppler.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro
---- lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro	2017-11-21 23:21:47.000000000 +0700
-+++ lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro	2017-11-25 19:17:01.771778161 +0700
-@@ -26,5 +26,5 @@
- 
- LIBS += -lpoppler-qt5
--INCLUDEPATH+= $${L_INCLUDEDIR}/poppler/qt5
-+INCLUDEPATH+= /usr/include/poppler/qt5
- 
- TRANSLATIONS =  i18n/l-pdf_af.ts \
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
deleted file mode 100644
index bacd2527eb97..000000000000
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="desktop-utils"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
-	x11-libs/libxcb:0
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm"
-
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-	sys-power/acpilight )
-	media-sound/alsa-utils
-	sys-power/acpi
-	app-admin/sysstat"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.3.0-OS-detect.patch"
-)
-
-src_prepare(){
-	default
-
-	if use !desktop-utils ; then
-		rm -rf src-qt5/desktop-utils || die
-		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-	fi
-}
-
-src_configure(){
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install(){
-	default
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
-}
diff --git a/x11-wm/lumina/lumina-1.5.0-r1.ebuild b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
index 1a09bc9bc7b4..a55056735a3b 100644
--- a/x11-wm/lumina/lumina-1.5.0-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,7 @@ PATCHES=(
 
 DOCS=( README.md )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -63,12 +63,12 @@ src_prepare(){
 	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	emake install INSTALL_ROOT="${D}"
 	einstalldocs
 	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
diff --git a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index 27374bbd02dc..7ec4ca3bc6d1 100644
--- a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
 
-inherit qmake-utils l10n xdg-utils gnome2-utils
+inherit qmake-utils l10n xdg-utils
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
@@ -18,12 +18,13 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtmultimedia:5[widgets]
 	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -47,12 +48,11 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.4.0-poppler.patch"
 )
 
 DOCS=( README.md )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -63,14 +63,18 @@ src_prepare(){
 	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	emake install INSTALL_ROOT="${D}"
 	einstalldocs
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
 
 	remove_locale() {
 		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
@@ -82,11 +86,11 @@ src_install(){
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 276d1056a915..6881413499cb 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,7 @@ PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
 )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -55,12 +55,12 @@ src_prepare(){
 	fi
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	default
 	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
 	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 8d425d04e47a..db785f79d471 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,8 +2,8 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r1.ebuild 2589 BLAKE2B 2d8212541c898050d38ce5253d37d81c59ce6d7a8a67d9926d33c3d43b78d75e6161622dfe6ad6466c57d6e1d0d28e1007cb3dfd785cd68799f596419a076160 SHA512 5267fd1669a10dc717261b8f47eab9cd9a5ea2006122b75ddc3af534628afd1c5c2e6092cf2d604d21209303dd2b3595616683d9933e2de2b5fb10d40d07ca6c
-EBUILD openbox-3.6.1-r3.ebuild 2725 BLAKE2B d5cb28c493febc08ed6282d40854af54021c0cd4f71d71d7abfc939aca96ee351e22222e565864e8e3d2f8cb53337b225840c1c15e059d0e7d0e33d79086ceff SHA512 fb0b2ef5eb5d7528ccf1ab80e9d6a109c2cb8d2460bfb8936e45551a0892873c233eb95baf1eeb4a7fb1ba2ba94cdc25a6b99273fb37829345026fdaade6f6a8
+EBUILD openbox-3.6.1-r1.ebuild 2543 BLAKE2B 35b5d31e709a9cabeda75e86c7893e7143000b9717282241606d79e669d670921de0463b18ef01db088eabb0281c5174e4ccc80581afbe92b234431662419061 SHA512 b5c71991d92afb92e4c0081b2809df14c6ac4547f9c7905bc4054bccb52fe1185f5b21dfa7cfe1fe52d4c0a3e1ac2cf3e8ad65ca0f81806501b8088e6850b37c
+EBUILD openbox-3.6.1-r3.ebuild 2679 BLAKE2B 053ef97fd99ebee7f712c22dca8dc0ca4ddb236505f65f857bde5a56b62987b6e1adc5e54916304deba49c0319be5ecbcfbcebad4afaa3be40a59edf6725c8fc SHA512 a9089012e0eaba41046d19a9d3fe9174e2b50b7784dfe0093cd17414c1c8dd9f8b6d54edb8f66b1e471dcc0579e01fea00ed7d6a21c9cefbb32653bfbd921799
 EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612
-EBUILD openbox-9999.ebuild 2576 BLAKE2B bd9f13bfedd3546ff69dc320e86eea3ae7db3f9ed981615fd6fb0465de3d44ec78c18510888f11de2b5b2b49fca15b49678f0a499b768045b4c03b8d012d79c1 SHA512 a316023155c57dde32845dfec0f18a0bab29832e613f9c838fe5fb8c4bf9f4e78b54c5690491ebfb8486e2fe209241764869adb180cf9b12197431158dab8136
+EBUILD openbox-9999.ebuild 2530 BLAKE2B 52d2b1c5b655448b82d2b41f96e16d40f198fde8633c5de7e26b56ad8ab33c37ce3817112cd4a672ecc32d568a973d6b2cb683f608b7874564c54aed77100039 SHA512 1e964e9ba48812727e9b488fea8b1e984a4952f822af18897a1fe8e497d7a472bc174289395c22d16fc0fa2b181be10981fd59c6b58d7b09c4b05667dc7e1578
 MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 30f1883b2a31..7866f2eda029 100644
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -62,7 +62,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 87f93920849e..ac1119033279 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -68,7 +68,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 658500bbf766..75bd3b71f0f6 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -62,7 +62,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index f753d85aad8d..aa80ceeeeb59 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,5 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0.ebuild 1988 BLAKE2B 0bd6c99a565566e8bc3f7446d07cd952da5c747a5ea790a8c7d55eb75e24898981eec0987a0ea156db24227676959413ef3e6186482fda13e4349050eb45acfc SHA512 5f24d1ea522c31b6b48590b3b1a8251e83f50ecc846b2163e99cccdfa031980982eddd72679dd220b91cac5e5a0f2cc1b502fb27bb804848fdd457527843bef5
+EBUILD sawfish-1.12.0-r1.ebuild 1982 BLAKE2B 1d400ef70ac6fbf106aa7814ff274569ebe283f12149504f04361017bd2bdc09a4ca3bc4f9f236c2128f7949cffde569a2f5358c236bbdaba656878207070033 SHA512 dcc232d5352c65165eb87696941df38155c7b052064669945028bffc6dd083ccafe550c9f4a7a4a1a162c0ec3deed0dfaf3c8a8ca12a4d0e5a04916b5018df81
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
index c2cc89e9885d..06915f975f08 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils elisp-common
 
 MY_P="${P/-/_}"
+inherit eutils elisp-common
+
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
-HOMEPAGE="http://sawfish.wikia.com/"
-SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
+HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"
+SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
@@ -18,7 +19,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
-	x11-libs/pangox-compat
 	x11-libs/gdk-pixbuf:2[X]
 	>=x11-libs/gtk+-2.24.0:2
 	x11-libs/libXtst