Updating liguros repo

47 files changed, 390 insertions, 96 deletions

diff --git a/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
new file mode 100644
index 000000000000..7a6cccb1445d
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
@@ -0,0 +1,20 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -36,7 +36,7 @@
+ #SET(_POSSIBLE_LUA_LIBRARY lua)
+ 
+ # Determine possible naming suffixes (there is no standard for this)
+-SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "")
++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}")
+ 
+ # Set up possible search names and locations
+ FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
+@@ -53,7 +53,7 @@
+ 
+ # Find the lua executable
+ FIND_PROGRAM(LUA_COMPILER
+-  NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER}
++  NAMES ${_POSSIBLE_LUA_COMPILER}
+ )
+ 
+ # Find the lua header
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
index 3819d4699463..6fcf0da3b934 100644
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.0.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.1.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.2.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.2.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 67ccfb4ab94d..705a0e4067e6 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
+LUA_COMPAT=( lua5-{2,3} )
+LUA_REQ_USE="deprecated"
+
+inherit cmake lua-single
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="https://github.com/axkibe/lsyncd"
@@ -14,15 +17,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.2[deprecated]"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+CDEPEND="${LUA_DEPS}"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	net-misc/rsync"
+# Both lua and luac are invoked at build time
+BDEPEND="${CDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch
 	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
 )
 
 S=${WORKDIR}/${PN}-release-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version))
+	)
+	cmake_src_configure
+}
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index f4a6a46bc5ea..22a48d51d444 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -36,7 +36,7 @@ CDEPEND="!app-arch/rpm5
 	dev-libs/nss
 	python? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	lua? ( >=dev-lang/lua-5.1.0:0=[deprecated] )
 	acl? ( virtual/acl )
 	caps? ( >=sys-libs/libcap-2.0 )
 	zstd? ( app-arch/zstd )
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 648761d8d38b..b235fe2b806b 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3=
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 9878fd6a6b64..791fb5eabe6c 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-editors/scite/scite-4.4.4.ebuild b/app-editors/scite/scite-4.4.4.ebuild
index 9878fd6a6b64..791fb5eabe6c 100644
--- a/app-editors/scite/scite-4.4.4.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 8bcd3d32a77d..ade1b4e333a7 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -85,7 +85,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=app-shells/bash-completion-2.0
 	>=dev-libs/yajl-2.0.4
 	gtk? (
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index 33acab3c7fdf..3ed874a1dae8 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -83,7 +83,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=dev-libs/yajl-2.0.4
 	gtk? (
 		sys-apps/dbus
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 4cd0b6f8b4a6..1614f715b6fa 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -78,7 +78,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=dev-libs/yajl-2.0.4
 	gtk? (
 		sys-apps/dbus
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 43274c9346bd..acdbda6b6d92 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -60,7 +60,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:0= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
index 5a6d41ac6a92..f46b88fecef3 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
@@ -61,7 +61,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:0= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 0b9336e8a571..d08d80a13212 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -62,7 +62,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 295d5fa08862..14ddb1d72205 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -62,7 +62,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
index 9e0e4bd625da..6c5624bf9f30 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 	boost? ( dev-libs/boost )
-	lua? ( =dev-lang/lua-5.1*:= )
+	lua? ( =dev-lang/lua-5.1*:0= )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
index b8af9afe146c..7f60758a8963 100644
--- a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
+++ b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-COMMON_DEPEND=">=dev-lang/lua-5.1:="
+COMMON_DEPEND=">=dev-lang/lua-5.1:0="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	www-servers/nginx[nginx_modules_http_lua]"
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index a07aaa17adbf..9ab734ae2d45 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -15,7 +15,7 @@ IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
 
-RDEPEND="dev-lang/lua:=
+RDEPEND="dev-lang/lua:0=
 	idn? ( net-dns/libidn:= )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
index e4ca10928ea2..b659dd730de4 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg:0 )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( >=dev-lang/lua-5.1.5:* )
+	lua? ( >=dev-lang/lua-5.1.5:0= )
 	openexr? (
 		media-libs/ilmbase:=
 		media-libs/openexr:=
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
index 081957e682c1..63fe92f535ce 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg:0 )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( >=dev-lang/lua-5.1.5:* )
+	lua? ( >=dev-lang/lua-5.1.5:0= )
 	openexr? (
 		media-libs/ilmbase:=
 		media-libs/openexr:=
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index bab3f4c9d656..e89354dd767c 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
+DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
new file mode 100644
index 000000000000..10d5d8179d7e
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/go-bindata/go-bindata/..."
+KEYWORDS="amd64 ~arm ~arm64"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/go-bindata/go-bindata"
+SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+
+src_install() {
+	GOBIN=${S}/bin \
+		golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
deleted file mode 100644
index 02d914964278..000000000000
--- a/dev-go/go-bindata/go-bindata-3.21.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
-#       Instead, we use a fork which is API compatible.
-#       For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
-GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="A small utility for embedding binary data in a GoLang program."
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 0afda6620771..8c1d74d431e9 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>toffanin.mauro@gmail.com</email>
-		<name>Mauro Toffanin</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
 	<upstream>
-		<bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
+		<remote-id type="github">jteeuwen/go-bindata</remote-id>
 	</upstream>
-	<longdescription lang="en">
-		This package converts any file into managable Go source code. Useful for
-		embedding binary data into a go program. The file data is optionally
-		gzip compressed before being converted to a raw byte slice.
-	</longdescription>
-	<origin>go-overlay</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-lang/moarvm/moarvm-2020.05.ebuild b/dev-lang/moarvm/moarvm-2020.05.ebuild
index c6ce71b8b46c..0c3192fc10f3 100644
--- a/dev-lang/moarvm/moarvm-2020.05.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.05.ebuild
@@ -27,7 +27,7 @@ IUSE="asan clang debug doc +jit static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.06.ebuild b/dev-lang/moarvm/moarvm-2020.06.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.06.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.06.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.07.ebuild b/dev-lang/moarvm/moarvm-2020.07.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.07.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.07.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.08.ebuild b/dev-lang/moarvm/moarvm-2020.08.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.08.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.08.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.09.ebuild b/dev-lang/moarvm/moarvm-2020.09.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.09.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.09.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.10.ebuild b/dev-lang/moarvm/moarvm-2020.10.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.10.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.10.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-2020.11.ebuild b/dev-lang/moarvm/moarvm-2020.11.ebuild
index e689dcc4bc9b..7729babf1b4b 100644
--- a/dev-lang/moarvm/moarvm-2020.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.11.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index 1840959ab7d9..c7d6089da4dc 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="asan clang debug doc static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}
diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest
index 3a93a1410923..baad77293f63 100644
--- a/games-util/steam-launcher/Manifest
+++ b/games-util/steam-launcher/Manifest
@@ -1 +1 @@
-DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c
+DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
new file mode 100644
index 000000000000..907f2c278497
--- /dev/null
+++ b/games-util/steam-launcher/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev@kicherer.org</email>
+		<name>Mario Kicherer</name>
+	</maintainer>
+	<longdescription>
+		This ebuild installs common files for the Steam environment,
+		like bootstrap archive and icons, but not the client itself.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
+	</upstream>
+	<use>
+		<flag name='steamruntime'>Use the official steam runtime libraries</flag>
+	</use>
+	<origin>steam-overlay</origin>
+</pkgmetadata>
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
index 350d9e8c7d5b..87f35fafd126 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit linux-info prefix udev xdg-utils
+inherit linux-info prefix xdg-utils
 
 DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="https://steampowered.com"
-SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
+SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
 
 LICENSE="ValveSteamLicense MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+steamruntime"
+IUSE="+joystick +steamruntime +udev"
 RESTRICT="bindist mirror test"
 
 RDEPEND="
@@ -27,6 +27,9 @@ RDEPEND="
 			x11-terms/xterm
 			)
 
+		joystick? (
+			udev? ( games-util/game-device-udev-rules )
+		)
 		steamruntime? (
 			virtual/opengl[abi_x86_32]
 			x11-libs/libX11[abi_x86_32]
@@ -86,9 +89,6 @@ src_prepare() {
 	xdg_environment_reset
 	default
 
-	sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
-		subprojects/steam-devices/*.rules || die
-
 	sed \
 		-e "s#@@PVR@@#${PVR}#g" \
 		-e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \
@@ -110,14 +110,11 @@ src_install() {
 
 	dodoc README debian/changelog
 	doman steam.6
-
-	udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules
 }
 
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
-	udev_reload
 
 	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 5edd318c2ef7..4f1acfaf7492 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -594,6 +594,7 @@ dev-lua/luacrypto
 >=www-client/luakit-2.2.1-r100
 >=www-servers/lighttpd-1.4.55-r100
 >=x11-misc/devilspie2-0.43-r100
+>=x11-wm/awesome-4.3-r100
 
 # Azamat H. Hackimov <azamat.hackimov@gmail.com> (2020-10-06)
 # 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch
new file mode 100644
index 000000000000..fc2a5542ce40
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch
@@ -0,0 +1,62 @@
+Use Tcl_Free() for arguments allocated with Tcl_SplitList().
+Use Tcl_Alloc() for arguments passed to tcl to be freed by TCL_DYNAMIC.
+
+https://bugs.gentoo.org/757924
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -1313,7 +1313,7 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
+ 	  badblocks = ALLOCX(unsigned long, listc);
+ 	  if (listc && badblocks == 0)
+ 	    {
+-	      free(listv);
++	      Tcl_Free((char *) listv);
+ 
+ 	      interp->result = "out of memory";
+ 	      return TCL_ERROR;
+@@ -1324,13 +1324,13 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
+ 	      if (Tcl_ExprLong(interp, listv[i],
+ 			       (long *) &badblocks[i]) != TCL_OK)
+ 		{
+-		  free(listv);
++		  Tcl_Free((char *) listv);
+ 		  FREE(badblocks);
+ 		  return TCL_ERROR;
+ 		}
+ 	    }
+ 
+-	  free(listv);
++	  Tcl_Free((char *) listv);
+ 
+ 	  if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1)
+ 	    {
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -378,7 +378,7 @@ int file_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	      return TCL_ERROR;
+ 	    }
+ 
+-	  mem = ALLOC(char, bytes + 1);
++	  mem = Tcl_Alloc(bytes + 1);
+ 	  if (mem == 0)
+ 	    {
+ 	      interp->result = "out of memory";
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -902,7 +902,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	    }
+ 
+ 	  result = Tcl_Merge(listc, listv);
+-	  free(listv);
++	  Tcl_Free((char *)listv);
+ 
+ 	  Tcl_SetResult(interp, result, TCL_DYNAMIC);
+ 	}
+@@ -1038,7 +1038,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	    return TCL_ERROR;
+ 
+ 	  fargv = hfs_glob(vol, listc, listv, &fargc);
+-	  free(listv);
++	  Tcl_Free((char*)listv);
+ 
+ 	  if (fargv == 0)
+ 	    {
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index 663f0b115d7d..5df159088c92 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -24,11 +24,15 @@ RDEPEND="
 	${DEPEND}
 "
 
+# tests are enabled only with USE=tcl
+RESTRICT="!tcl? ( test )"
+
 # use tk requires tcl - bug #150437
 REQUIRED_USE="tk? ( tcl )"
 PATCHES=(
 	"${FILESDIR}"/largerthan2gb.patch
 	"${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch
+	"${FILESDIR}"/${PN}-3.2.6-test-tcl-8.6.patch
 )
 S=${WORKDIR}/${P/_p*}
 
@@ -54,6 +58,11 @@ src_compile() {
 	emake CC="$(tc-getCC)" -C hfsck
 }
 
+src_test() {
+	# Tests reuse the same image name. Let's serialize.
+	emake check -j1
+}
+
 src_install() {
 	dodir /usr/bin /usr/lib /usr/share/man/man1
 	emake \
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index ab3e1ae1f00c..d3757fa5b53e 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_87.0.4280.66-1_amd64.deb 72746672 BLAKE2B 730d100753aaeaac9254794e4bddfd9871bc5499c02faa75965089d935bc69f7f39a7d9db5ea278a0600c3a062d30ad96edaf3b15ee254b300e8dcfa44fb6d13 SHA512 23158dc27fac73b093663dae01568eafe898d3c9335206d8814c747a30df564930152c2139013d393b71f477868f5206c2642ef4ac481ec9ba89a10cf4b74260
+DIST google-chrome-beta_88.0.4324.27-1_amd64.deb 75183000 BLAKE2B cff78d5cd119dcec7c59169d57466f84a7970bc46412ad517b1f98fc39a48f1a463f17c290a711cfce8b022cdb32fa15588a41e66b8bbb3f4d4bb1083cc22099 SHA512 c445acbeea848f9231392eba74f835cd61943d8162410831985f80b8ef7693f1b413857c22ec0d0d452c61f6106985822359c443baa862c0c5dce8b25b1ff989
diff --git a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild b/www-client/google-chrome-beta/google-chrome-beta-88.0.4324.27.ebuild
index 5a9c327ca88b..5a9c327ca88b 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-88.0.4324.27.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index bc25ec0b3bd6..08d8c698a4c7 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_87.0.4280.66-1_amd64.deb 72746672 BLAKE2B 730d100753aaeaac9254794e4bddfd9871bc5499c02faa75965089d935bc69f7f39a7d9db5ea278a0600c3a062d30ad96edaf3b15ee254b300e8dcfa44fb6d13 SHA512 23158dc27fac73b093663dae01568eafe898d3c9335206d8814c747a30df564930152c2139013d393b71f477868f5206c2642ef4ac481ec9ba89a10cf4b74260
+DIST google-chrome-beta_88.0.4324.27-1_amd64.deb 75183000 BLAKE2B cff78d5cd119dcec7c59169d57466f84a7970bc46412ad517b1f98fc39a48f1a463f17c290a711cfce8b022cdb32fa15588a41e66b8bbb3f4d4bb1083cc22099 SHA512 c445acbeea848f9231392eba74f835cd61943d8162410831985f80b8ef7693f1b413857c22ec0d0d452c61f6106985822359c443baa862c0c5dce8b25b1ff989
 DIST google-chrome-stable_87.0.4280.88-1_amd64.deb 72446160 BLAKE2B 308e73cd83f3f760bb5f6cc6dd077f3b6af9c986493bef76b6aba505bc8105746752df26e05e7d557ea45bf1986f61ab0011b85a6613ba05033f4c93764ac42b SHA512 19eea1d1be171cab60ce5135572da9388b4b72e313118478b53f65c0bf2293733809282736b98ef828a208b7426e5191258f8c666cba7510b8bf5c92d0010a47
 DIST google-chrome-unstable_88.0.4324.27-1_amd64.deb 75174972 BLAKE2B 5ea5343e550a5451b77f343530b898ada88671e39725c2dbe20a2ee8f2772033e46f58facbe14e447196803c1ecde1cf01e4cb1d8728bb47deb339b2865dc68a SHA512 2169d70396040c32237c549d0d79cb3d444521f567b8c6fe27eea9f10db281c715ac8df3b4e7d49eae580174ccf0f48d46a14aac4211ed66f1a58d6db94c6adb
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.27_beta.ebuild
index 645ebaaf6be2..645ebaaf6be2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.27_beta.ebuild
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 3b02ee9a6ae9..7f580bb309a9 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1 +1,2 @@
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
+DIST obmenu-generator-0.89.tar.gz 20583 BLAKE2B 0513713ed08fb47b212b07a8c8d1a2e496f6962f9940f6dc8e087043276b3d80a5c305fbebbc0c0a39c9c75058bf363adb4c8739f51ff08258e63b1305a320fd SHA512 a796b1a2c6a3080627129360cc67695b73ee7ce82a4e4e879b306fe45f73d9223c8a08d053e7c9c9e8fbb779c3ebad15737b81ec4dfb9a406d77ac74cecddde0
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
new file mode 100644
index 000000000000..8a36e7f9249a
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="https://github.com/trizen/obmenu-generator"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl[gdbm]
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "For icon (-i) functionality, install:"
+	optfeature "support via gtk+:2 (default)" dev-perl/Gtk2
+	optfeature "support via gtk+:3 (enabled via config)" dev-perl/Gtk3
+}
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