6 files changed, 65 insertions, 6 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 08b2c7e2e1d9..1c52ceaba176 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index a71a430e2636..8cfb0f6c2439 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,5 +1,6 @@
 AUX awesome-3.5.5-cflag-cleanup.patch 660 BLAKE2B 0c4311d7d125161c44ed668da6ce1e2bc0e2c5a1850c2341e4caec764a2673f99570f06856c815454f6cc6204bb7b71bbd416e862156cc40c47bf0343a6e1ae6 SHA512 5711e328839ce32789fe213c2c1d6b56e476d7ba09303d52dc5c307a97b35bbdc1c9c0d673a51b5859a2c0f035002152c762e3cd725c4231bc811dfac5dad79f
 AUX awesome-3.5.5-util.lua-xdg-icons-fix.patch 1756 BLAKE2B fe0ba6026faaa674f2b461d95cb6b829d31e74aad8b9e5559c598dec46c62a3218beb4cfa075ca7028d74f902ae5b16949fac7cbf4bac06f436d1460dcd457c0 SHA512 8348b51a90ac9f0423de1e5ae81aeee6dc8da8e249bcee09a0ddf89c582b34f1f420ef579d58c717078bbf7eedb6cbe36782bf9cfddbe2bd27e96c726bd493d6
+AUX awesome-3.5.9-slotted-lua.patch 1982 BLAKE2B 03665832ee2e65b40754c6989c1f5ea0993ca52cc4856960de2fabb03827ecfdd0378095905435c0aa3a73404597014af6788edd45a57671db038557672257b9 SHA512 72716903616f71de79c3f85e72f12c0abd7f353972838b8d2a74ca2739dc36ec44e24ccc3b2f6cd17514f40565f9a484dbf3194834b7f1bd7dc98316dc0b48e6
 AUX awesome-3.5_rc1-convert-path.patch 539 BLAKE2B 4904c47c165384dadf6229c1d92cbc313df1e70566b894b9b325d24d457b99d53544e885f6c086073c903aca6f2b365eb2384145c85194f1ab91740dee5142b6 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150
 AUX awesome-4.0-cflag-cleanup.patch 395 BLAKE2B 02865c0e99fc81e00e501758d95eb47ebb3960575258c42550f1530d97aff14256911b8107eac606261ee427399934d877d9f116a624216dfee143fd9eb4a8f4 SHA512 e9ffe2b66046e0ebbc0bb3c0b8f9bd67bd7d8d351792e299730abfbd8f284dd0631e87b27a8ba22587e9059b13d13381902efb4b9423348b735021eaee779e9c
 AUX awesome-4.0-convert-path.patch 257 BLAKE2B 7f4504273e155c6ae70fc8aefa067513af32fa6fc38efeab1a642e8594910bbbb559dbfad33c703420b0fa64e3aef9289750f92a41aa5d76e29161f32a1cb6a3 SHA512 3eadbc1d14a18e3d669bb8ecf3769ff888d4b30328f0167166c8632498ad50bf21f004098960507a1b96c5bd5f76a4fcdc74022d820d2d809175ec2829a26f5d
@@ -12,8 +13,8 @@ AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5a
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-3.5.9-r2.ebuild 3120 BLAKE2B 71d1668a910bc570389cd9fdba9cf948c6937c53fb335df8d5cc8ab7fbc6811e0635895094be3fd67a49e4a7a43a7cc602d88a9b33534ffc6d6b684911ccc858 SHA512 c4c0d39f617c3cdede84786e4fc8a7c4f01b4e329a06d092a09a773af3be42dd0c28e6178f294710579737f3d441ef4f7cd88fd7afb1e1acfe2279ad81192ac4
+EBUILD awesome-3.5.9-r2.ebuild 3298 BLAKE2B 1434e7a70af6d92b5b1ed21e82fbfe779875ac9be77f1c90a526c80f1108aaadeb6ce1182d8ba8fdd23c8f56d1917aa2c55acc3b1b644e95ba6684477df94712 SHA512 9bac97ce35e34a5f4f383b95e5eaf7f8786c1d18dbd6576c8549c9fd0998a90c04356affb3980d856f06fa59525189fee10e8a02d1da369ee1a6603c6c1328ec
 EBUILD awesome-4.2-r2.ebuild 4046 BLAKE2B f0818242453a6b6e86cc5308f852bc39ceb582599fb14d47ecaaf99f4992fe5b79e530d20f803dc9717d7ac9bac42869dafe81571cbb6209940d8f0e0c90f2d6 SHA512 d20e5c640738bbd7dbcdafd91bf5af40fd5d336d91bd12f814b91f8d0b478fcbfda099fb995c44dffafd3d00973242faa48f85f6eba76d3f19d5df31fa0f14a0
-EBUILD awesome-4.3.ebuild 3696 BLAKE2B 2ecc88fe2aeccff7b40ee66b01e3d332a3a9e5efbf796fb04ec6bca266853c296abda8f5fa657efcbc2b752a75e13ebc27f706b4569ca45f07939a81c1d3aa33 SHA512 be1923652935a8fa73b07a9cb3f718a6909f20d85edc85a476f26c554b989167730c429aa7694c11190f7fb04d9f29e071c27a3362b7f66a3edc9e04dd4949fa
-EBUILD awesome-9999.ebuild 3612 BLAKE2B a7069d2671acfa6ca3c4d03fd1da6a89a794bd703c86889e082d8c6cb9bbbf1709f59d89264569b3f3d58315b1ffde3d0bef3aec925509dd47268c086c799aed SHA512 50a0836b211d4dab36b294e4a42a4775f6b84584bd5acb9aed3e45835b2089fdb85bfb5449d4ac5632de4a4d3992f285527756909bd25097e00dd8a7fe8891eb
+EBUILD awesome-4.3.ebuild 3696 BLAKE2B f95e5c0623a137b23bfa4b304ea440e9961a5e14415494554207ceaca40b1f784dbee7a5bbfc432408f3f2fa7daeda33776213d8101c2a394c2925c2f5918d19 SHA512 2b156917643e67c005841f919f081b9f5645a56826532808eeb9644096073cc57f969fa9b30997483ed5c2691ae71e73dcf9f6e82eabf96b7bb44e2e2133defa
+EBUILD awesome-9999.ebuild 3640 BLAKE2B 91184513d785b8ed8784531d3a1a69a14a67818a07147cb74f07d52e0ab8bbb2e5b0fb5915173171eaf714fb855b3e1111a49c74cfa5a7db0beb4fea5532b604 SHA512 8e44954f42557f380b54fd01c2cff621831979a2a1677af44424241e5b112100bcf58ebe01744e96367726d1cbd5d243bfc8ef9bf1e4d2105b16d7620684f0ec
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 0a13897d09e6..31b4a95fd889 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
 COMMON_DEPEND="
-	>=dev-lang/lua-5.1:0
+	|| ( >=dev-lang/lua-5.1:0 dev-lang/lua:5.1 )
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
 	>=dev-lua/lgi-0.7
@@ -53,13 +53,18 @@ PATCHES=(
 	"${FILESDIR}/${PN}-xsession.patch"
 	"${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
 	"${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+	"${FILESDIR}/${PN}-3.5.9-slotted-lua.patch"
 )
 
 src_configure() {
+	has_version 'dev-lang/lua:5.1' \
+		&& LUA=lua5.1 \
+		|| LUA=lua
 	mycmakeargs=(
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use doc GENERATE_DOC)
+		-DLUA_EXECUTABLE="${EPREFIX}"/usr/bin/${LUA}
 		)
 
 	cmake-utils_src_configure
diff --git a/x11-wm/awesome/awesome-4.3.ebuild b/x11-wm/awesome/awesome-4.3.ebuild
index c56912ae9fa2..76a6928f1f24 100644
--- a/x11-wm/awesome/awesome-4.3.ebuild
+++ b/x11-wm/awesome/awesome-4.3.ebuild
@@ -8,12 +8,12 @@ inherit cmake-utils desktop 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"
-RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-lang/lua-5.1:0
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 718d7b35ff79..23c61a5483c4 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -11,7 +11,9 @@ EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS=""
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-lang/lua-5.1:0
diff --git a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
new file mode 100644
index 000000000000..67f0d9810f44
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
@@ -0,0 +1,51 @@
+diff -Nuar awesome-3.5.9.orig/build-utils/lgi-check.sh awesome-3.5.9/build-utils/lgi-check.sh
+--- awesome-3.5.9.orig/build-utils/lgi-check.sh	2016-03-06 14:05:54.000000000 +0000
++++ awesome-3.5.9/build-utils/lgi-check.sh	2019-01-23 21:36:35.973967623 +0000
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++LUA=${LUA:=lua}
++
+ die()
+ {
+ 	exec >&2
+@@ -22,11 +24,11 @@
+ }
+ 
+ # Check if we have lgi
+-lua -e 'require("lgi")' || die
++$LUA -e 'require("lgi")' || die
+ 
+ # Check the version number
+ # Keep this in sync with lib/gears/surface.lua.in!
+-lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
++$LUA -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
+ 
+ # Check for the needed gi files
+-lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
++$LUA -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
+diff -Nuar awesome-3.5.9.orig/awesomeConfig.cmake awesome-3.5.9/awesomeConfig.cmake
+--- awesome-3.5.9.orig/awesomeConfig.cmake	2019-01-23 22:01:17.364046606 +0000
++++ awesome-3.5.9/awesomeConfig.cmake	2019-01-23 21:50:30.152919084 +0000
+@@ -66,6 +66,7 @@
+ include(FindPkgConfig)
+ # lua 5.1
+ include(FindLua51)
++set(ENV{LUA} "${LUA_EXECUTABLE}")
+ # }}}
+ 
+ # {{{ Check if documentation can be build
+diff -Nuar awesome-3.5.9.orig/CMakeLists.txt awesome-3.5.9/CMakeLists.txt
+--- awesome-3.5.9.orig/CMakeLists.txt	2016-03-06 14:05:54.000000000 +0000
++++ awesome-3.5.9/CMakeLists.txt	2019-01-23 22:00:08.715111414 +0000
+@@ -105,7 +105,9 @@
+ 
+ # check for lgi and the needed gobject introspection files
+ add_custom_target(lgi-check ALL
+-    COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh)
++    COMMAND ${CMAKE_COMMAND} -E env LUA=${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/lgi-check.sh
++    COMMENT "Verifying LGI module")
++#   VERBATIM)
+ 
+ # atoms
+ file(MAKE_DIRECTORY ${BUILD_DIR}/common)