15 files changed, 128 insertions, 12 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 617860f3937a..7aff8d1d405a 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
-inherit lua toolchain-funcs
+inherit flag-o-matic lua toolchain-funcs
 
 DESCRIPTION="Bit Operations Library for the Lua Programming Language"
 HOMEPAGE="http://bitop.luajit.org"
@@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -45,6 +45,9 @@ lua_src_compile() {
 }
 
 src_compile() {
+	if [[ $CHOST == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
 	lua_foreach_impl lua_src_compile
 }
 
@@ -77,6 +80,14 @@ lua_src_install() {
 	doexe bit.so
 
 	popd
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local luav=$(lua_get_version)
+		# we only want the major version (e.g. 5.1)
+		local luamv=${luav:0:3}
+		local file="lua/${luamv}/bit.so"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
 }
 
 src_install() {
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 97ed41ff1c84..bf246a341a3e 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,3 +1,3 @@
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r102.ebuild 1345 BLAKE2B 100654501e8d615cf556b467783a074eab04322728ba5062a59966316e23309fa18447d3cdd5b3a58450cc04d575efd6b504998c6da66f8ca21aec426c3a51d5 SHA512 8a6b78194136eb82c68fdc32b6c9c6fb7e09d0f7b4fbf385a04cd6240466655e8f22f28dd60fd74e1a55a6931b217869e5741e2e3e3fb5e13b87071e645ab4ae
+EBUILD LuaBitOp-1.0.2-r102.ebuild 1774 BLAKE2B 3ac7941b33f1038851bbacddc2de80924357c7da56fbc1ecb750b3b22a86724b3f20d789c806c0c569d8751cea37ebbcd76cf8127c6bb1f0ef21c89c157709e5 SHA512 f5210a2a59151c784316bf49fa03a42341c3b0e090cc0dc4827115df30cd76dc3ace5f345a30fc281ceb8b3ab9635c7ec194cd28044b92bb97cba8083b75bf3e
 MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 797192d6d91d..0391accafa6c 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 161055585cab..e0260fc98a77 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,4 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.2-r101.ebuild 1530 BLAKE2B 0fe58fe3706822574f08a2bbc99020fc289c8ea1adfdf7c309d89f9c32148f27dbed129eeb26eb9926454a5e29187e0eb73b33d9d994563e96c346a40f682487 SHA512 2b5ebb56873364594d494ec70696c231a298ad291e9ca86d64e0933082fced7068ec96182bc21bf3ea15c133e00dde988279f2a1614a2d42368db3fbf96b2ad7
+EBUILD lpeg-1.0.2-r101.ebuild 1951 BLAKE2B 3b248b64495d5016f2107a7b584b58fe28b94b27a74cce4dcf837d854be613cdb45fba1fa7fd38143a6e8b7776107d53a3c105d77c5cb5a16e1b54d3aecaf048 SHA512 4f43f476999ceb81cada2327b559225bcd0d9e9b1288ffdfbc50260f442763c1b95faadc4a846e17e068bb1b841c90b7f24da52f7a31809deec3267a8dc9161c
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index 769fbe86123a..fd6789b18f6e 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test debug doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -39,6 +39,11 @@ lua_src_prepare() {
 src_prepare() {
 	default
 	use debug && append-cflags -DLPEG_DEBUG
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+
 	lua_foreach_impl lua_src_prepare
 }
 
@@ -70,6 +75,14 @@ lua_src_install() {
 	instdir="$(lua_get_lmod_dir)"
 	insinto "${instdir#${EPREFIX}}"
 	doins re.lua
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local luav=$(lua_get_version)
+		# we only want the major version (e.g. 5.1)
+		local luamv=${luav:0:3}
+		local file="lua/${luamv}/lpeg.so"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
 }
 
 src_install() {
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index 74db2409eb92..8583b73af171 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,3 +1,3 @@
 DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-EBUILD lua-bit32-5.3.5-r101.ebuild 1404 BLAKE2B 908f6e77daa1e6b31fcf6766571a5b311eefafaed5b8366287dc10b1dade7ece225185b6eab9c7e1650f4fbb0082ba59ba78d81f2596e8b280ebba7b65968ee4 SHA512 46a26358f9f8dca8a88c46f2e7b680afde1a704fcb52bae74f52da568442fe5fbfd94b87598fdb3a664be784d016d685cf12c14fb4f65b7f5f09d5de1c63b11d
+EBUILD lua-bit32-5.3.5-r101.ebuild 1411 BLAKE2B e88cc460437dc66e17802bf094329fb3d7c9c7ae3a91e44fb78a783c4876e0aae2067deafe8b410cf760d4f80abeeb4884749375814d088dcdb8bc735efc6c40 SHA512 d09490dfa54ed8c7bfa085cc3e0fd8b71371753c302c28ac59593056e22b1bdd1c6979765d26e7dfbd310ea9519908724223ce8c14c2d3b136c50347b947cc46
 MISC metadata.xml 580 BLAKE2B 4499d47fae3cbc26be9bbaf4cf8db719b6ec28989fb4c583e6c16006378b6161a6a32062638df6bc41743e271bf395abf5e348e39a9419b496ba6b834ed71a95 SHA512 eefe4c553c1dc03173b7662969c8bc56cc6be18b879d199c20ade33b4043fe71cec065e71fbc2bdba9a35ea88eab6f8a41b834d433159fbced2e743e663d6974
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
index 4c1d071b29b5..6ea0b9148ee4 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index 75c74f7dcd2c..2617cd95cf41 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,3 +1,3 @@
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
-EBUILD lua-term-0.7-r101.ebuild 1170 BLAKE2B 7e6e0ed8bdb138d02deb1b5d8a5081edca039d338030d61ba0096c04d0abd89e46276d111cd5b3502bec57002542ef076831593a0e3d3356cdeecc6caf9a976f SHA512 c63449ae2f81df3bfffb02350ceab747f5dc0b92f0cc50039e1c60c5b8e5e9dbaabc4df0f695d44a218e02cd1ea659c1a019c5faaec783f5f27a5975c992a938
+EBUILD lua-term-0.7-r101.ebuild 1177 BLAKE2B 40c74c92abac021a4f22da39337debf9192eae89ac27ef5cc5cea2a5bc23b71001be8b7aae49b3c5ad857981770e4dee8f0fd914ae0b720ad7b342429f93afce SHA512 dcae7af19164426a2a2d7505358f8b3fcb8857940221eb6229240673b93b7110666c3c9c85280ccc5aa67555441e84fd2fe7315ffcb3b4f0021fddd6aa4f4ab8
 MISC metadata.xml 440 BLAKE2B 7578e30f2b7c2b37df1fd563325189efd987df03c42fdb06cfe334a74a7d596b2ef9bb3b1ed2adb9f6aae8aed072cb89df8898d57cab40db23933a54a0963612 SHA512 101ba9221fad8bed21cc6fa169d8063e58cb303f45177a355859e9d3dded2489e22082bfd3104763a5f92fc3d0325b344d4758b5afef7d50d22684fae752de43
diff --git a/dev-lua/lua-term/lua-term-0.7-r101.ebuild b/dev-lua/lua-term/lua-term-0.7-r101.ebuild
index 99bc08ec6a0e..5b33c9560cd0 100644
--- a/dev-lua/lua-term/lua-term-0.7-r101.ebuild
+++ b/dev-lua/lua-term/lua-term-0.7-r101.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}"
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 344079e90aff..2456b0a7332c 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +1,3 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
-EBUILD luaposix-35.0-r101.ebuild 1732 BLAKE2B 4b1e5602401ad2322ea394813f2ca4e6e271d7d941b2564e81f873493b2d8781571d1f1e4f1be7b3243e51f160b88bc85e6cc02f17a710239aa4c18c7d11f0f1 SHA512 8c5b28c3ecdc79777dea414cf0707e79af558221e8b61c2c50bd5461c6a7c534780cd822c2781b1be67cd9cf19b3ea05150e1954128ced63262c95b7223a7d78
+EBUILD luaposix-35.0-r101.ebuild 1739 BLAKE2B 338f0fcdf903219c4b759994546661ae676c19499b8290c2eac7fbb47e38b4a3893f1e883933d5bdc58d5fe66bbdade98da31f53ad64a014592d0f07f1c8e1db SHA512 4ebeea72e3b5adc5a59db1865d27962c723d010197b2287af97c528cde304ba1aa8d93596e87b6e3ec17c3e4dbe7fbd86d9d4848fe20f86cc83100086e655acc
 MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
diff --git a/dev-lua/luaposix/luaposix-35.0-r101.ebuild b/dev-lua/luaposix/luaposix-35.0-r101.ebuild
index 3e7b5157e6ee..03e1676c00c5 100644
--- a/dev-lua/luaposix/luaposix-35.0-r101.ebuild
+++ b/dev-lua/luaposix/luaposix-35.0-r101.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luapo
 SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index bb785f9e31fc..40987bb4c52b 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,5 +1,7 @@
 AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60708583be04cb9a2e785c1ba09a171c7cdeb3cb18e1baf9dba976c429d6f7a5737c0c8ca803b3241d170f395f6045da03ece03 SHA512 6e8341db5eeb5c1e51cc9c812ffc99c2a15a18467456fa20c7dc37c100ac269ef4b416a311f7d435b89c824171218193b00e8e7dccf7506eaf789a88121866bd
 DIST luv-1.32.0.0.tar.gz 91349 BLAKE2B e4a90b3241e2fe650f62e34439ed75f9ba53168d6bd96b8685fc5600d6f9cbb1bb598a7d40d918ab9123cf4bad99f872a79d0664056d35caba52d1eda9046020 SHA512 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
+DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420265a27756b0613781621c78c18edc272072cc29c46336787b040453cc9a06195264c0a72a985e49c48202022 SHA512 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 EBUILD luv-1.32.0.0-r102.ebuild 2183 BLAKE2B 76d88767f5494c469557da85f09e5ba0cec37b529f88c4b8300d8b80d69ad9486547cb7a72bf117be2e7a679c17af22caa6033cad2c344e0636a72f845851ebc SHA512 b0437489b69efee65f690f2dbcd266188ff34736c2a196e51bfb57ff10a10c94f42383151d1ad7cea751e4a7b4ffa0d0676a63710926d7ba1993522fb8e48de8
+EBUILD luv-1.36.0.0.ebuild 2296 BLAKE2B db184e750df7311e87258da93f473d9f1449093b399620da8d6b13824f6b3e067bb1cfff9531f84af9f77e032711aba6e3fd37afee6174ce0c5aad63dc943047 SHA512 3b3122bc5421ab16a09c465f7a37bdd43f80424cadaf66f8fb471349ee4c4bcceadba3c48957717e0ad599d4d3054aa00c21d031164104ee996464c26e2f8f88
 MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
diff --git a/dev-lua/luv/luv-1.36.0.0.ebuild b/dev-lua/luv/luv-1.36.0.0.ebuild
new file mode 100644
index 000000000000..74f839486381
--- /dev/null
+++ b/dev-lua/luv/luv-1.36.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake flag-o-matic lua-single unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.10"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+	>=dev-libs/libuv-1.32.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake_src_prepare
+}
+
+# This could in theory be multi-impl (and we have an ebuild in git history,
+# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
+# app-editors/neovim, actually links against luv instead of trying to load it
+# as a module. We could probably implement some sort of a hack for this
+# - but given how messy it would be, don't bother unless someone actually requests
+# luv multi-impl support.
+src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_SHARED_LIBUV=ON
+	)
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=LuaJIT
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=Lua
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# We need to copy the library back so that the tests see it
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index ac6318dd78d3..58edbb0eb001 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,3 @@
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
-EBUILD mpack-1.0.8-r100.ebuild 1774 BLAKE2B 04e4e3be618daa59a679b4e9cb70970e4e0236c14aafa21ce3ca89bc3fa95d7995f2069c021b28cf44080a723054789dd6395a7d62a99da28c685ecc47fbe8d2 SHA512 608da9dfded1fae07c21a5a66b4186a5406d48e2b91b34c959a24b2631168610f57637dc988135faea7442a3acc0e0bbc325743d17210caa7c1b36d8cbeabf3f
+EBUILD mpack-1.0.8-r100.ebuild 1811 BLAKE2B f128fb148748f7cbc2134e771869c6dc6818ca808eacc2ac07a3951a321b481e31299b8d378e11df835feaef0643261ea6fa77eb1aac3e31641b07c8a7021aee SHA512 01add209b1a105c4c5894d2158cd6b9777a617aa3aa5de1474b2e88139f3a715d6a7de7dff7565a3f58228f452445816c9a6da5fd7cc52b681495a7f8ead981a
 MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
index e64d78d190ef..68c6968289e6 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -60,6 +60,8 @@ src_compile() {
 }
 
 lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+
 	# "[  FAILED  ] test.lua @ 279: mpack should not leak memory"
 	# It doesn't seem upstream actually support LuaJIT so were this up to me
 	# I would drop it from LUA_COMPAT, unfortunately there are packages in the
@@ -70,6 +72,8 @@ lua_src_test() {
 	fi
 
 	busted --lua="${ELUA}" test.lua || die
+
+	popd
 }
 
 src_test() {