gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-lua
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
83 files changed, 1531 insertions, 678 deletions
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index c6405bf5a527..e7fb4cb36634 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 3a82a0ce11a2..6d528b6fe2fa 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,7 +1,7 @@
 DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf
 DIST busted-2.0_rc11_p0.tar.gz 48368 BLAKE2B 3e4534795a4d6bd816b9879d447b82e144f738f3601856e5c9fc5419a6b8f3cb57a78a9ce6ad90990c1abe9fe0974b809d10a942b5f4930b4120f98d34de0dbe SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8
 DIST busted-2.0_rc12_p1.tar.gz 52404 BLAKE2B 51f12aea26d6b0909fdbf8953b316814ff8cd76d39358a26eb785ac7541acddbfde1b19d2e41c9e966a604f8f00b9517181f87264a76a4ac7f9f8d6008c87692 SHA512 0cb1f6a66110514dc3675b2e667cca676e6672e895b57ffba438e89a1e0a7f4f8f941cab54ead905758987be15e9885e1eeb82baabc9d18bf29ea56b832b89b1
-EBUILD busted-2.0.0.ebuild 957 BLAKE2B bcbac18003386369e39e625d23c73bd431b9934c87fbcf3d75efd9ca744c809a9ffab0f631bf44552a902fa8cbb7c6794f265b96afc0d5b4b5683f5f1ea64504 SHA512 0819f548c7c9658c09904591e9fac66b312dc35ffb5f3fc86e81d1cc4878a326bf949f8e0ab6ca11fd26ec69de64af940c2ce4e1f73e1720393b45f7b47b0a1e
+EBUILD busted-2.0.0.ebuild 962 BLAKE2B 91095a86046dcde63aff9aea89ef3733b16413fea337326584e462a8d84475a0895ecd5b7745b6535d34036f92f2ae3ed3ed2b05e075ca12b42b648abdd2f7f1 SHA512 28f990886b3b99253e7dad34b93d8f5328411a1c1a4b2f215a02929f94f8666efce462c46004a3c64e5126b70f75aafb657193faac7f6429f1a8a618b057e9ad
 EBUILD busted-2.0_rc11_p0.ebuild 1021 BLAKE2B 6be1c981d3259907dcbd7878c11f6eeb9894ebddd9eda8559881c087bec7e4a1f7d8016765920148defac4644bef46f82b107b4136866e1377c7465f184431cb SHA512 47e1e443cbce25838a3647d2aadcdf244219abff50be7a4cac51906a65ee8dbe2b122145de4c84cd18384c5aa1c4b818d308bb733a4af77e16bff9cf15b16ffe
 EBUILD busted-2.0_rc12_p1.ebuild 1037 BLAKE2B 51659b876392952b2a23b9dd99cca97e1b7ef48b0e23760206a0f282a4e4892afe93f743b611732a95096431627c4196119115af8fd3f7c3030b3588744ecbf7 SHA512 af2b746bb71fdd39e34d82c6b056919665ae63abbc1d7fbef35610a2b65e0a9300a905771f15cb1b9a512b14737c1c524a3aba19d3b4ab4d4d29c4758ed59657
 MISC metadata.xml 652 BLAKE2B 97daa2438be52bd6aa462673572d6b1efce6331e9dfbfa5d3b2915619661ec2b359c6687c5aa294d66eb089e152e93c24f1c2f00dd8ad9dc9d13934fe8170883 SHA512 7b07510891c5df25357c17f05de4bcbf1ea54f44f9ce06507de70ae9ddd835bfd20d1cb4bd3787ffb9ffeb88b238bc148b5c5ffad7abb1853ed0517b03a7d122
diff --git a/dev-lua/busted/busted-2.0.0.ebuild b/dev-lua/busted/busted-2.0.0.ebuild
index 72b120bd9650..658a820d2985 100644
--- a/dev-lua/busted/busted-2.0.0.ebuild
+++ b/dev-lua/busted/busted-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
index 6726cb103c6f..af550fcda671 100644
--- a/dev-lua/dkjson/Manifest
+++ b/dev-lua/dkjson/Manifest
@@ -1,3 +1,3 @@
 DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af
-EBUILD dkjson-2.5.ebuild 642 BLAKE2B e759f543433a80f3628c02c963f0310981af35a26ec825fc3f0f787db50971433c1f4c9db4e923ec5c50eb141a30a7d3c2d9bcfb8a033bd39f1ef5bc5400decc SHA512 c45e0b133fb9e7c49c29dedf66a5655ff5972a79251ffe6f321d072ad35ade068ee64737ab3d7dde28234dc545d25ad35a14f3755c5938bb32520f7978f03be9
+EBUILD dkjson-2.5.ebuild 649 BLAKE2B be740ce1b7fb4e98745a5d74be437554817b7426bf2305358d906c8739472c6d9277abce138037f114c3484d95babafa8eb04f7185b789d0ca62d3808217a8ba SHA512 0081aa2c7417e12b5dc68e09af3534c3b07a279d20b501b4bf8e3f1a942f971f1d0fe64a42dbb0288cf898000f73da3d723f0a32391b5b7a5501b79739be779c
 MISC metadata.xml 620 BLAKE2B 4285a62df1f275147f5b5a40d83bd570d2458b8f8bd4c32957b9a52364b6bde7f471e4fd6ab58ed80bdd648e5c28fea4038ae63ced6ed7dc9636ba11d3c44f8c SHA512 e224d3462b86cd9c66705a3ffdce9861c03f3cee050e851c8f9064c19a6257ef1f5f18c125b7349d495a343fb9696b408523cccd09cd99be6ed599d9cb45238f
diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild
index 84633d383c15..4a443a7787c2 100644
--- a/dev-lua/dkjson/dkjson-2.5.ebuild
+++ b/dev-lua/dkjson/dkjson-2.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:=
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index b9e0a52530b3..eade3afaa91d 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,3 +1,3 @@
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
-EBUILD lgi-0.9.2.ebuild 1372 BLAKE2B e2e5223eaa6a597d526f2646f19819d05459994287f18bece760998b142100df64e98befc7e4317748577e1297b70ba4508c5b28fe6a9aae0462c5a3552294f3 SHA512 bdc6714c0c801d909eafc604710c9af883f03b667e2398569e791ad31fc994f1c62f9f045374ea4e83d35c4203e25e86d2dc45f2b9e73262470ed8099920cc58
+EBUILD lgi-0.9.2.ebuild 1373 BLAKE2B 4bde8c79ed73ec22ce73d2c4fe0f4cafb468e077e84d8f01ab5b02941e938241cd3608971bc936ffa17681fe0de5eb08c0db17a4d09a9c687f51bb05b59f4309 SHA512 d4227622ea9f1b858d38bf1301e12235718468b8fd4e62ecdf4b76840b82845b41d463e0894e5c02eda044fee2365579f1aa0fc26b0ee31c3766d27507792ecd
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
index d2814be0b521..6c84cc232046 100644
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2.ebuild
@@ -21,7 +21,7 @@ BDEPEND="virtual/pkgconfig"
 RDEPEND=">=dev-lang/lua-5.1:=
 		dev-libs/gobject-introspection
 		dev-libs/glib
-		virtual/libffi:0="
+		dev-libs/libffi:0="
 DEPEND="${RDEPEND}
 		test? (
 			x11-libs/cairo[glib]
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index df8ce5212b12..86395c21f024 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,3 +1,4 @@
-DIST lua-compat53-0.9.tar.gz 53599 BLAKE2B 7d9efe0afb49c40a68b1d6c28f975080b3331e07d0aa788e0f1f77d5c360504a5cac9cca4e6074b2c64aa7ad8934df3fe2609ff8009db52b046b2f639b670213 SHA512 bec15b6e95cb5cc775785515eba1f094e453059a0ba1eefa433d328b823378b7f48d9c7a34080ad77478cffb2008bead93418f809793afa6021e6046562acc58
-EBUILD lua-bit32-5.3.5.ebuild 1270 BLAKE2B cc69c0d34763589c78e81b954b33bedad6f0d69dc030e3cf8b05b4bd72f540b9e0e6a517713af1359bda3a397e631e36595e3ff2fb50435863c628cb08a71089 SHA512 3d389fc5e116909208994e1fb9e81f25269509137bafa7de385a7054a058068c79840fa64b92747fa1da10afb56119bcf4b5a3cbca3198c14ab3107c29be36a3
-MISC metadata.xml 485 BLAKE2B a5ec0e8d9920cd1f13a9211604ae5eb25db248a81b1d9469931347b77b1c64cee0fb34e54f93ab36611d35b79025966cc0ab13606084c81d1c7959a84bda045d SHA512 d79b3496b6d54ba350161c8b0aeee317df5053d334627ee9e8cdace0a699b4c9f1d9f58e5e391327baa89d4b6aa00fbccfda5b40718f7e852d4e21dc8da3cf27
+DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
+EBUILD lua-bit32-5.3.5-r101.ebuild 1408 BLAKE2B 309e52e5d3486baf442d6a28dab9ba44a89e4d31ae21625482adaa68c5bc501e1d2dc0e9bfbc995baadf9b6e6681314bdbd53d61b926c01b1481a84ebf8b89d8 SHA512 91e678e50e096ed9d2c5695acc1295faa5b96446b72ca405ec820279666539455020c6ad81ede6059ca7ce4372d54a41f8adb156cf90db7f5fbd91acdd4ffd44
+EBUILD lua-bit32-5.3.5-r2.ebuild 1297 BLAKE2B 3ea7275a36d083f34af99f3f6f6b885e0bf71c7d57e1546d668b774fb834f7d33f291aae3a223f871d79996a624128da4e7a8830af43f3393967e0852ba20869 SHA512 6e0e3a642662e49f5af9f2c01a47c4eccc7a019ed3633ff3976484f6afeae683e90f9ec4ab0c9f5381aacddf27fa69be3c2f0a9b98ab46a2d5a556ba15f67ed8
+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
new file mode 100644
index 000000000000..6bb9594da9cc
--- /dev/null
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+MY_PN="lua-compat-5.3"
+MY_PV="0.10"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Backported Lua bit manipulation library"
+HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
+SRC_URI="https://github.com/keplerproject/${MY_PN}/archive/v${MY_PV}.tar.gz -> lua-compat53-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+lua_src_compile() {
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"${LDFLAGS}"
+		"-DLUA_COMPAT_BITLIB"
+		"-Ic-api"
+		"$(lua_get_CFLAGS)"
+		"-c lbitlib.c"
+		"-o lbitlib-${ELUA}.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"-o bit32-${ELUA}.so"
+		"lbitlib-${ELUA}.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	LUA_CPATH="./bit32-${ELUA}.so" "${ELUA}" "tests/test-bit32.lua" || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	exeinto "$(lua_get_cmod_dir)"
+	newexe "bit32-${ELUA}.so" "bit32.so"
+}
+
+src_install() {
+	default
+
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
index 82297b4fe6ab..63a13ff6ed83 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
@@ -5,29 +5,30 @@ EAPI=7
 
 inherit toolchain-funcs
 
+# Weird upstream version descisions...
+# Result tarball may be reused for future lua-compat53 package
+LUA_COMPAT_PN="lua-compat-5.3"
+LUA_COMPAT_PV="0.10"
+
 DESCRIPTION="Backported Lua bit manipulation library"
 HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
-# Wierd upstream version descisions...
-# Result tarball may be reused for future lua-compat53 package
-LUA_COMPAT_V=0.9
-SRC_URI="https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_V}.tar.gz -> lua-compat53-${LUA_COMPAT_V}.tar.gz"
+SRC_URI="https://github.com/keplerproject/${LUA_COMPAT_PN}/archive/v${LUA_COMPAT_PV}.tar.gz -> lua-compat53-${LUA_COMPAT_PV}.tar.gz"
+
+S="${WORKDIR}/${LUA_COMPAT_PN}-${LUA_COMPAT_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-# Strictly for lua 5.1
 DEPEND="dev-lang/lua:0="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_V}"
-
 src_compile() {
-	# TODO maybe sometime there will be luarocks eclass...	
+	# TODO maybe sometime there will be luarocks eclass...
 	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
 	einfo "${compile}"
 	eval "${compile}" || die
diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml
index 32feba463055..5ff7bd4eab78 100644
--- a/dev-lua/lua-bit32/metadata.xml
+++ b/dev-lua/lua-bit32/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 8be0567ffa2f..277fb994bdaf 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,5 +1,5 @@
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
 DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4
 DIST lua-openssl-compat-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.gz 51950 BLAKE2B 16dbf5eb444393f093a5f2cc0fa2a8b394a8b2d62ca36882d02202304a2906b4e2bb87814c1ca198e4b77a9bc27d85627da75244ce9c68c3fd1e06e9262fa970 SHA512 2a8e1d3bb6475225f311995f70417c0620c5efa7384400b2002166daa6fc1baedb32f492dc65cc5b92bf63e850c293a36c1f8aed6e7cf0985e582aa0e52141a8
-EBUILD lua-openssl-0.7.8_p0.ebuild 2204 BLAKE2B 33c0975faadfc890f329136db205cdcb6bd7cf91814ee7430e5a74ced8c4ef573d162b32446fd69c2b964175632a47a7f20802df92a285fcb07042fe001d3cf4 SHA512 2c307a6f6d7c7225237bee3cc38e47cedda52d3a88de54411a920e33a6947b7b1de72045c9e41685a5a225acfad41216520f070e70e5586ee6cdd4b0cbae2744
+EBUILD lua-openssl-0.7.8_p0-r1.ebuild 2221 BLAKE2B 108f0be285519ace2a4216f920a714661c8988213f3d47a3f488fc0ebb596e00b294e2a8f6e0560b29bdbe31253cab050e1653fe9685406203bc56ce791f0320 SHA512 2f75a5b7af5819431ffd301bd79a78da6cf9c037e68a1b097c2427f653f1039f19d4a9dd34ddbf9b48958c83be4e5c9859a4ccd67a63c08ea86442ed55a8ffdf
 MISC metadata.xml 444 BLAKE2B 10922399060a76c4ec3dbb4c11925c2674a65d5bc23d06d76d51aeafe8f885620d647e0054ffbfed39083f8bd54972486dbc1a1a019a1206d8966918aa336ef9 SHA512 248cd6f3e2ca5ed82b4f571aa8c3fc642ea7b0cd94ed14e012bddd81b00363125cadb235261fd45e2366f72d34135fe8476b33d7d2d0d2ce1e1dc029702cc8d3
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
index ec062ec6de51..3f4cf467fa9a 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
@@ -26,8 +26,9 @@ RDEPEND="
 	!luajit? ( >=dev-lang/lua-5.1:0 )
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	!dev-lua/luaossl
 	!dev-lua/luacrypto
+	!dev-lua/luaossl
+	!dev-lua/luasec
 "
 BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index b51de4a48e97..cb18e1a4c4f5 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,5 +1,5 @@
 DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
 EBUILD lua-term-0.3.ebuild 1046 BLAKE2B 77c1acb0eaf7cad9e72c6d4e09e52a60078ffe2e8da1d8d119c5083d6fe3b0c493cee7aba008562dc56997ebda0f1713151354ed633dbd7d27389755bfba841f SHA512 060e77c10f7a78844361be521ffdd0996b090bf7a7413b8c85dcf8f4488cd3cec1c1d61991a64c6f3d64e22c092aa5cbac00b465c91f8b2c06a2791daddc7f39
-EBUILD lua-term-0.7.ebuild 1022 BLAKE2B d9cf479851d2f6edb89df92b9ed665bf3a72d122bbbd60167e46b5bf4ca5bf26cb75fa41aaa6301a55f76a63dc43589fa6e6c68ae2f354a3fea6ecae83f1f01a SHA512 bfd431172ebcba523f7b18254b7b53481e5b14e7d13e85a86ed6013df6f195eabf323dc0dc8665ae0dc702a50e23b56705f83c262b07d4d6abe0571792e88e50
+EBUILD lua-term-0.7.ebuild 1027 BLAKE2B 99a8152b9b3db85d71f1318d43ba23a592f039f71a4bd2f675c104c4b370d1a8d88614bbcc0ed186fb0128c953d7beb7efbffcf46768f29e462f96fbd28f92d9 SHA512 1953613e17b240c7742bedb8c3aa2808d44754cf18adead116f676568ac78a8dbddcb28eb200431595c92998fd31a75a5e0d9bee2b92c9fc43327c91552ab716
 MISC metadata.xml 329 BLAKE2B 53838f32093f301c09eca7e323feeb35d9ceee5a2a38fe0902bafd8893afed48e8b7f8b4bfebfa183cdcabc63d654b983658ae69c08c640cb97239c5f15ea4b9 SHA512 927fa93e0060fdb183c77425cf3716dde54c4b2a6a4fdbfadf9a8bbeeb186b55ac93589003c8259382d3985075e9ef4239c3a7be359bc704cc6d3febc3c8f89e
diff --git a/dev-lua/lua-term/lua-term-0.7.ebuild b/dev-lua/lua-term/lua-term-0.7.ebuild
index e9c4c9e672c7..9a20c97daf95 100644
--- a/dev-lua/lua-term/lua-term-0.7.ebuild
+++ b/dev-lua/lua-term/lua-term-0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index 86812580eaaf..877f8aa662b7 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,5 +1,4 @@
-DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633
 DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4
-EBUILD lua-zlib-1.1.ebuild 565 BLAKE2B ac5f7d1ea868cfd2215de7772f071c2b33d3712e0cefd7bcb4bd41e574fe00f72efedcb0843bbcc52f3438a6f4353f567bd6cfe594b1b2c8edaa3e82f01410cb SHA512 49d7e482d1d7af71df1a9866e2354d34ec82f70c94da387887261e4dac10e7cf4eed6b60c28a1cd700492644ed3a8519ff6fd941c3c66700928b7368385de0a4
-EBUILD lua-zlib-1.2.ebuild 666 BLAKE2B 17bd0666214ee732ec6200649b000d82a9ef1e127ff59715e35539a8d7f64584acee39cf4cdf9fe8ef063aa4f45a2cbb88156fe69e760f71879aa687e3bac08b SHA512 194d5b50aa7c2c0d27b3f2d56a0a73294bc42a7699ce83a4a5daa44145fb62a5fbcac64748cdd21bb506f2cc5aa2d9b8a5ad699874b34e0c60cb2af0e83a6167
-MISC metadata.xml 255 BLAKE2B 820ddc4489fc6c4387305bcbc3b339e13be1230d100ef3e9b45e13dfb850c2be0e7968c9cbe1c15e8cf3a4887b05637615ca11d3358aa032f96f23edfccc5cd1 SHA512 3d46a3689375944f47933ce2af13543ecb79bce6a7eaad56083931111c277da45d3b8120bdc1643985cd746be3ffc84017da34038adc05367e90601e883e5b92
+EBUILD lua-zlib-1.2-r100.ebuild 905 BLAKE2B 293c3d92f72dd30b850da97df405ee7f3356b415cab9495bd6dc7ca2b9a7f33760b10b904ecfcae8b8b8bf4abf98b6a628b12268f8636a90bbbeab010d948092 SHA512 09523f5bc1c99db7aabbeffe29c6e59d27cba440e141b9185fd2de98c1fed5b312156abee303ab28b7034678709a025238c3c0308d32bea0a692f80005134ac2
+EBUILD lua-zlib-1.2.ebuild 669 BLAKE2B ee74b9e5ae1a0fa181a577918d8068a1ea833322aaeced3ea0f6a4f1e1adc71e8abed2fc38f5ce10cdfdd7e331976170b42c2e7bbfda812b7e62cc0e4c9f0e71 SHA512 dd59320eac58f73c6e632bca41cd680c77d2a236a74adbddff13380a2a076a97da879bc78b821ac6fd737bb0e6c9fcdd7db9c8d8a98e3584cb57d6ab38571276
+MISC metadata.xml 333 BLAKE2B f65699b0f49f67c857500010ae12d8416cdb0c7d5817b445aed9de46000bc80186ff7d84f8eafcc63d760c8b95713561eedfe24f0500781866b294f9086ba30e SHA512 9473337d43cd76c8d23c3d4c300412f06b296afa9ca59d51b46d4c880a0b5e36523f71eb86a5d0bb856b29aa1cb936ee611aceae81a9d2d4907b9392e51b282b
diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
deleted file mode 100644
index b51a835e97de..000000000000
--- a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Lua bindings to zlib"
-HOMEPAGE="https://github.com/brimworks/lua-zlib"
-SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(-DINSTALL_CMOD="$(pkg-config --variable INSTALL_CMOD lua)")
-	cmake-utils_src_configure
-}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
new file mode 100644
index 000000000000..1fbf98752889
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
@@ -0,0 +1,49 @@
+# 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 lua
+
+DESCRIPTION="Simple streaming interface to zlib for Lua"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	sys-libs/zlib
+	${LUA_DEPS}
+
+"
+DEPEND="${RDEPEND}"
+
+lua_src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CMOD="$(lua_get_cmod_dir)"
+		-DUSE_LUA_VERSION="$(lua_get_version)"
+	)
+
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=( -DUSE_LUAJIT="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_install() {
+	lua_foreach_impl cmake_src_install
+}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
index 243df12a0a09..6c5c6083b3af 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	sys-libs/zlib"
diff --git a/dev-lua/lua-zlib/metadata.xml b/dev-lua/lua-zlib/metadata.xml
index b89e350d8c26..0cc17802b297 100644
--- a/dev-lua/lua-zlib/metadata.xml
+++ b/dev-lua/lua-zlib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">brimworks/lua-zlib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brimworks/lua-zlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index b51000ada0a4..217d693deab4 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -3,5 +3,5 @@ DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd
 DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024
 EBUILD lua_cliargs-2.5_p5.ebuild 876 BLAKE2B ba627334a770918356cd474f97b7b8f39bad574cd26ecc7de552db033920797a709d78285dbb7940c4800a690133a06d239b618c9635ecde5c2e2367b65c651c SHA512 00571f5fc51ba97a5affd68efa419c47e8646e9cb0ae1d99f085b0a0032dcfcf42b58e4405b7143a7f4bf114b136013ad5e8e5a7986537439a3517a2fc3b98a0
 EBUILD lua_cliargs-3.0_p1.ebuild 906 BLAKE2B 8e1c46a73b29fd61fb06a5fa8fcb202d91df30748e6ab0fa24b2e3befb930c051c451aecaff0847f4156c68b82dc26a87c55dc61a25d91eedf84fb3e3dd451ec SHA512 24b3b938bf998a0c12a48854356d6854c40ce06c73f9dad9c276f1cc69cbee7cf9612440ec045e8584bfe0b7908dafdf6c49a216ff2febbd6630c3d2bbb684b2
-EBUILD lua_cliargs-3.0_p2.ebuild 905 BLAKE2B f7fc7a5ff2434f20de4c012b4cd204932a4909224db74e06f0ca5e5b504680a52893c062b0b1cc882c6b9980913530d473255e1bcf5ab79d13edced146453000 SHA512 f2e16324261e5838500b1863c2e8f60caa9c68580e7770fc8ff9e6ec934c703596ebc2fe6230c97b7226f82918c37c40c3fe3e73596cb0dcaaf2078b66698fb5
+EBUILD lua_cliargs-3.0_p2.ebuild 910 BLAKE2B 9d5af5719e4e332bca4e29d38a88c6c3eeb0ee567c0a6ec6c088def98712e7ba3d611b97bf98c2563220ee7a50b3de6d6c193ff0b6193e5e5d2aec7bb3ac5195 SHA512 c26317b487a804ff466229a980bc0cc8d63eb8af9173acca88d8f36f8afaffa820bbb3143e2ab40a87e097e7ea4b9f0487cf6dabb6b94a14849eac3c7ab43703
 MISC metadata.xml 561 BLAKE2B a38b859e36bacd5481ca588a97d39f3353aedeae25b219c7b6e24353979c659407088e9ef16b71d642c19e26ff628f314ec0fab72ebd55a7fa42d0f0f32638d4 SHA512 da9b4c1e00524c0cc7963b0339a18f0b2fe254338269b8fc77e790ad26704ef92f450859838d7e0730cceda34ed34548c367659fae27302fba02252636537c59
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
index b124dace5b77..73fcadaf0b12 100644
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 04841ca198ab..d1763d331a89 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,5 @@
-AUX 0.5-r2-Makefile.patch 1784 BLAKE2B 212e3b7c86b54d1633a95ed4a00c0c92cf10504c51ae173aa0fd1b77b98b44203f0b9b4994ef72b6879f281e3342806e84c85012bb522769b73f5292450a750b SHA512 c5399e53e124fbb6bf362bf6d1588c5afc02c12074e12a8208f5b7c97c155f4ba164118ab0ce2c93e8cf1195c12aa6c142a62cb9ba519a38ef0e01e080a8dce4
-DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
-EBUILD luadbi-0.5-r5.ebuild 1806 BLAKE2B 04e53cad9497933fd81bdefead2de4093e8f8f778f4376a8da511e1af6d01a172f6b3d4a7d795e5797d92b2e74fc6b218d3376e79776a8053637f12770e623e3 SHA512 46a3f2a28f6cdbce7d89effa1a887e007ef360c6d73fd08d17361e43afd8f9dd87f287e4d67e95c1c64adeb4757b7870b2820c48524a02f54bd74dec7b741b5b
-EBUILD luadbi-0.5-r6.ebuild 1861 BLAKE2B f2536d15d61eec9ee55acae0c96a691ed46709378a6707495103efc338b73e24adf5891d5ecbc8a5788dd2e5f4fd994b8cf8a34aa972726483ddc001d3e0bdf4 SHA512 708b87a4230980c455be08a03b3e088d0d6215881d7d0031a8cf8e9d69feb05ba6b9e4cfd5f59290075110c12ac03bb80ec8c78db9a16ae8935bed54de90f468
-MISC metadata.xml 243 BLAKE2B ae629fd9f0637db05afd7749d7ecef15baf33f716d7a6f9972214040c75ab219283b85aab2721d88ae59eb24040af1e744f75f39c6c0a1bd2ff5c007a24f5eb9 SHA512 05ffe6ac7acff76e9dced367bfd8033602835e047e01f8a87decf2a05ff548395e56f8a1d3be5388b61df32d6bb329725141a0d356efa2651a1c555d882219cc
+AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
+DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
+EBUILD luadbi-0.7.2-r100.ebuild 1769 BLAKE2B 6d5c67dde0eb5a59636789f74e3263cc7ff76dd023cb9c926c449b10e3c4ba89e36e569bda3f47e1dbe1a24ce70dc39e2b08b9c8acb0150b9d9ab95d24e6be13 SHA512 bbb89034fd723046ba26256251df95c5828bf1d73d81b32ba684ee6d8b840676203aa5531373d0dc0c5b27c2f402e3074ae5e27ac4a5783603b980ec83d6a8e6
+EBUILD luadbi-0.7.2.ebuild 1579 BLAKE2B fa7b1bd1ae6913826966f6687ae8af24f62f3cc4771133ddc17cf72b1b2ff87dfe6a7b0034defe931e7cf5062efcb101609664e6be1a2de04648360141bff7b6 SHA512 923534935b8aa20d437fcf65b62a75853e7c80c00b43f48455ffe9f050cf0fef3e2828afee2b402faa7713c035c484f6dba982357f42a344ba6800cf147e09df
+MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
deleted file mode 100644
index 98e4988b281b..000000000000
--- a/dev-lua/luadbi/files/0.5-r2-Makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/Makefile	2013-02-01 13:34:54.490898002 +0400
-+++ b/Makefile	2013-02-01 13:44:25.927772130 +0400
-@@ -1,5 +1,6 @@
- CC=gcc
--CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
-+INCLUDES=-I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
-+CFLAGS+=-pedantic -shared -fpic $(INCLUDES)
- AR=ar rcu
- RANLIB=ranlib
- RM=rm -rf
-@@ -27,6 +27,14 @@
- DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o
- ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o
- 
-+INSTALL = install
-+INSTALL_PROGRAM = $(INSTALL)
-+INSTALL_DATA = $(INSTALL) -m 644
-+LUA_INC_DIR=/usr/include/lua5.1
-+LUA_LIB_DIR=/usr/lib
-+INSTALL_DIR_LUA=/usr/share/lua/5.1
-+INSTALL_DIR_BIN=/usr/lib/lua/5.1
-+
- free: mysql psql sqlite3
- 
- all:  mysql psql sqlite3 db2 oracle
-@@ -90,3 +98,21 @@
- build:
- 	$(MKDIR) ${BUILDDIR}
- 
-+install_lua:
-+	$(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua
-+
-+install_mysql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL)
-+
-+install_psql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL)
-+
-+install_sqlite3: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3)
-+
-+install_db2: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2)
-+
-+install_oracle: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE)
-+
diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch
new file mode 100644
index 000000000000..ef463433357e
--- /dev/null
+++ b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch
@@ -0,0 +1,55 @@
+From b72503cad0654878841172451b2ea860a59e30c1 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Tue, 13 Oct 2020 07:34:16 +0200
+Subject: [PATCH] dbd/mysql/statement.c: fix compilation with mysql-8
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ dbd/mysql/dbd_mysql.h | 2 +-
+ dbd/mysql/statement.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dbd/mysql/dbd_mysql.h b/dbd/mysql/dbd_mysql.h
+index 233bc35..4777289 100644
+--- a/dbd/mysql/dbd_mysql.h
++++ b/dbd/mysql/dbd_mysql.h
+@@ -3,7 +3,7 @@
+ #endif
+ 
+ 
+-#include <mysql.h>
++#include <mysql/mysql.h>
+ #include <dbd/common.h>
+ 
+ #define DBD_MYSQL_CONNECTION	"DBD.MySQL.Connection"
+diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
+index aca865a..6af4c39 100644
+--- a/dbd/mysql/statement.c
++++ b/dbd/mysql/statement.c
+@@ -424,7 +424,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 
+ 		    if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
+ 
+@@ -435,7 +435,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_TIME) {
+ 			char str[9];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
+ 
+@@ -446,7 +446,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_DATE) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
+ 
diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
deleted file mode 100644
index e1cdb2f76572..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DBI module for Lua"
-HOMEPAGE="https://code.google.com/p/luadbi/"
-SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND=">=dev-lang/lua-5.1
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql )
-		sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-r2-Makefile.patch
-	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" \
-		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" \
-		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" \
-		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" \
-		-e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die
-
-	drivers=""
-
-	if use mysql; then
-		drivers+="mysql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \
-			-e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die
-	fi
-
-	if use postgres; then
-		drivers+="psql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \
-			-e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die
-	fi
-
-	use sqlite && drivers+="sqlite3"
-}
-
-src_compile() {
-	append-flags -fPIC
-	for driver in ${drivers}; do
-		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
-	done
-}
-
-src_install() {
-	for driver in ${drivers}; do
-		emake DESTDIR="${D}" "install_${driver// /}"
-	done
-}
diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
deleted file mode 100644
index 2f194b5ab36c..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DBI module for Lua"
-HOMEPAGE="https://code.google.com/p/luadbi/"
-SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND=">=dev-lang/lua-5.1
-		mysql? ( dev-db/mysql-connector-c:0= )
-		postgres? ( dev-db/postgresql )
-		sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${PV}-r2-Makefile.patch )
-
-src_prepare() {
-	default
-	local pkgconf=$(tc-getPKG_CONFIG)
-	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(${pkgconf} --variable INSTALL_LMOD lua)#" \
-		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(${pkgconf} --variable INSTALL_CMOD lua)#" \
-		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(${pkgconf} --variable INSTALL_INC lua)#" \
-		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(${pkgconf} --variable INSTALL_LIB lua)#" \
-		-e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die
-
-	drivers=""
-
-	if use mysql; then
-		drivers+="mysql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \
-			-e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die
-	fi
-
-	if use postgres; then
-		drivers+="psql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \
-			-e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die
-	fi
-
-	use sqlite && drivers+="sqlite3"
-}
-
-src_compile() {
-	append-flags -fPIC
-	for driver in ${drivers}; do
-		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
-	done
-}
-
-src_install() {
-	for driver in ${drivers}; do
-		emake DESTDIR="${D}" "install_${driver// /}"
-	done
-}
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
new file mode 100644
index 000000000000..f7f3c1fdcab6
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
@@ -0,0 +1,90 @@
+# 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 lua toolchain-funcs
+
+DESCRIPTION="A database interface library for Lua"
+HOMEPAGE="https://github.com/mwild1/luadbi"
+SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql postgres +sqlite test"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	|| ( mysql postgres sqlite )
+"
+RESTRICT="test"
+
+RDEPEND="
+	${LUA_DEPS}
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted
+		dev-lua/luarocks
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+}
+
+lua_src_compile() {
+	tc-export AR CC
+
+	local myemakeargs=(
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
+	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
+	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}"/tests && ${ELUA} run_tests.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		LUA_CDIR="$(lua_get_cmod_dir)"
+		LUA_LDIR="$(lua_get_lmod_dir)"
+	)
+
+	use mysql && emake ${myemakeargs[@]} install_mysql
+	use postgres && emake ${myemakeargs[@]} install_psql
+	use sqlite && emake ${myemakeargs[@]} install_sqlite3
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild
new file mode 100644
index 000000000000..338881effc6e
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A database interface library for Lua"
+HOMEPAGE="https://github.com/mwild1/luadbi"
+SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="mysql postgres +sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:=
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC
+
+	local myemakeargs=(
+		"LUA_INC=-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua5.1"
+	)
+
+	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
+	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
+	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
+}
+
+src_test() {
+	cd "${S}"/tests && lua run_tests.lua || die
+}
+
+src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	)
+
+	use mysql && emake ${myemakeargs[@]} install_mysql
+	use postgres && emake ${myemakeargs[@]} install_psql
+	use sqlite && emake ${myemakeargs[@]} install_sqlite3
+}
diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml
index 2ff9f66c8898..1dbf53904c3d 100644
--- a/dev-lua/luadbi/metadata.xml
+++ b/dev-lua/luadbi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">luadbi</remote-id>
+		<remote-id type="github">mwild1/luadbi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
index 9ab21b42da42..d5ae4e2fbc09 100644
--- a/dev-lua/luaevent/Manifest
+++ b/dev-lua/luaevent/Manifest
@@ -1,5 +1,4 @@
-DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea
 DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913
-EBUILD luaevent-0.4.4.ebuild 1157 BLAKE2B 077a975277825bbc6400237af83a68c9777864bf9456e93da6e00b83b7889ebf0c3a1b841248f16b4377f3bda2483155415976700df96e98c2cb8fa1a2e9fd62 SHA512 339215026520ec8cfae8df034325e5d2cab704072a2c0dd9762ceedc4ca63e579bbb7949389f67c3cd0cf4e21c66c330e09e30ab6c3beb92ad29e8f4c6ac47b6
-EBUILD luaevent-0.4.6.ebuild 1172 BLAKE2B 7254dcd5d2dd1cdc0ae635424d565d9d62f4738720c9d7045b0830766dd48ff402be9cf4081ca84f5ed00c3a736fddaba2e7cba49da4a24cc8fb638e5355270d SHA512 fbce3c232909e12bcc0220e87ff58d89de2fd650b422de594ff2188265f4b94f4cb99c3c83ee9680ab0f8fe8d0ebf305216ada81c99ea94722fb53cf0afc30d3
-MISC metadata.xml 309 BLAKE2B d4292352166a4f69bad73e53a00cc500fdac6b05c4b8deecc774794b6fa7ba6a08398e3a26752d8ceda1a28d4003b5d9b62e457f3f35ef2d424dde4dde0faadd SHA512 29785300a4f0b5f4afdab52d0186698f47afb36b5b94943ad2034ba7a5b34020cd1b8d3e225d4255cc0b1ab380fb19c8f70bf23da3b31eedb88daf6d9e53e0d6
+EBUILD luaevent-0.4.6-r100.ebuild 1124 BLAKE2B 83ccd533dab8c8879348399e1b5cc96beedabe533c62372d762df569f0da6960bbdef183921bc3fb166f4fb4b0411948420ea661120691f9f013c01fe901c420 SHA512 1f7bb7ba0a56bf031500f745d2fb2b5e0f97e3240e9435368fcadd22670f8a826c31c73438aa7905bd8d57a47d5408b15a4dee0d029c786c3fe67ded2242488d
+EBUILD luaevent-0.4.6.ebuild 1167 BLAKE2B 3e5e1ea99cd1fc2a008c9a5c981e0a21d667b0bc29df7fe27c256382ca9952f1bf2bf721728f388a4b1a37add6557c8c49d016756108a339324129638524ae9b SHA512 5d97a433958bd4f49f1100a6b8200ccdac6b6fb240c4115cd63f304dfc910943734db01a0b8708f7b77a495c6ad36bd0218a387c8f091220bd910c81f4fd7d88
+MISC metadata.xml 412 BLAKE2B d38a312a6841ec1c241efdfd7582fc6059578291015bbf4a90fa669864d2e831099c24dd2bd46c73d946613a5440ad52d4cdf1bd87ca468e25bbb259e1495aa4 SHA512 63aafaff1b4115b3f1f530563e417dd6c6cfad2a62e8be3deaeb1b49a2154efc9756073636c2efa11d534c3019c33bdda0cf9c420f6d0713790f26206ccb2d19
diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild
deleted file mode 100644
index fc40540709ab..000000000000
--- a/dev-lua/luaevent/luaevent-0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="libevent bindings for Lua"
-HOMEPAGE="http://luaforge.net/projects/luaevent"
-SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	dev-libs/libevent:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
new file mode 100644
index 000000000000..3ada51666ed5
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
@@ -0,0 +1,61 @@
+# 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 lua toolchain-funcs
+
+DESCRIPTION="Binding of libevent for Lua"
+HOMEPAGE="http://luaforge.net/projects/luaevent"
+SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/libevent:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	local mysedargs=(
+		-e "'s/CFLAGS =/CFLAGS +=/'"
+		-e "'s/LDFLAGS =/LDFLAGS +=/'"
+		-e "'s:-I\$(LUA_INC_DIR):\$(LUA_INC_DIR):'"
+		-i Makefile
+	)
+
+	eval sed ${mysedargs[@]} || die
+}
+
+lua_src_compile() {
+	tc-export CC
+
+	emake LUA_INC_DIR="$(lua_get_CFLAGS)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		INSTALL_DIR_BIN="$(lua_get_cmod_dir)"
+		INSTALL_DIR_LUA="$(lua_get_lmod_dir)"
+		LUA_INC_DIR="$(lua_get_CFLAGS)"
+	)
+
+	emake ${myemakeargs[@]} install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild
index e814d6b25c58..1e2debab47c3 100644
--- a/dev-lua/luaevent/luaevent-0.4.6.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.6.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"
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	dev-libs/libevent:0="
diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml
index 32ed283086a3..41cbd4dc71b8 100644
--- a/dev-lua/luaevent/metadata.xml
+++ b/dev-lua/luaevent/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">harningt/luaevent</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">harningt/luaevent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 4a3f1d6707bc..c375026b5773 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,6 +1,10 @@
-AUX luaexpat-1.3.3_makefile.patch 410 BLAKE2B 45b0c24795c679fc69c5cbf9683aa2a47da5ef1f874acb0336df014ef319566a7149c51253f843e5113263212ea585b517095423c77f3bf0580f31acee140b09 SHA512 c34f4e68d3b72b2dc5f7f09ed2f3128ec37becfbc6fa0d72d35be3374f4fc92a4159fa279d6a101a3671c05a4a1f3e248756ba1a0505f900bbece3290376c577
+AUX luaexpat-1.3.3_getcurrentbytecount.patch 945 BLAKE2B 311210432c90d2d67ba0f44f3d2f4c811b9603e22d1b3c60e7e5d9bdc4e4cd08f133585edb9f5fc97b5b6b8e14c06f81fa15cc4fd099b761effa5cee70cc7f06 SHA512 4664a52bb964e1556f7b47602728f0bec2a1f909b240c3e46775e8879cdf75e7bd764c83ba464aa12838678fe9fc08bb91c8ef41f6460623468c259a33a24e9b
+AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff9a3645eb430b56889fb26410b49a5dd20878c5c95406629bfbf11de080ae0a7761e0d9bfbb0cf032b2f14fa36ea25d SHA512 9dc6026cd12a3aa7513d7eb52f228ac32e1d71b018f50555e19dbd301e466def1c2afef40feedf060332d979b3007855a908617c4061832fc9895bec006a0efc
+AUX luaexpat-1.3.3_restore_functionality.patch 3944 BLAKE2B d6e502f44039110cfc8eabc3a83405b0c72522ec43628af16f72d21d0976d617e7280818259258c15cb8582f917e5fdadd81bc2ce35c052a951fec0ccd200e5c SHA512 f6e56fc84550af781c40d8bd004c3f840021a730cccd988f5547b83e2ccc89072ebd09f49631442b25fac8a81a4d7e7f5d4163d7f62dedc876356dee94d96b41
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
 DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63
-EBUILD luaexpat-1.3.0-r1.ebuild 1330 BLAKE2B 590fc39478e83833ecd56830181a630e19da3bbfa785b724c27b41e0716f13f4200cc8198418485740b4e6a2aeedf45c3f7cfda14edcf8408f5662a227548999 SHA512 7aef89e153094caf0d3ed99ac2a226b9f00f6f252842dfdb6f4a5e3cf3b72b47f2d5de95770eb5cfe2558b9c9b1ee9fc5357d6b9071a1656c39775d6217905fd
-EBUILD luaexpat-1.3.3.ebuild 1171 BLAKE2B 762679f6a2a91e5a52d3b52c4fa9f3a9323b1766da347abe25e43d6f2bd8aad303383b438b148755f863f152b408237f5d606d0afce54cc921dd75fcdcd6dc7f SHA512 abcde4cfdf6ee944c9ce74775a8508faa81243c7eed92fa02a765245bf551eca3d7e3111b610f37f3d8e5e4d7841e99e1eed75cc66fcb9d4c5e0ab1969972eda
-MISC metadata.xml 480 BLAKE2B 2eaf94b50215f43616af6cca2a5102ea4c52ba629f54e6b32b1b9bc4a4edf601619902de285129cab26cf97dd5f847c2dad80d36d896b03a8b5e83d3cda9a4f3 SHA512 33052ffee5b4e34879461358cdd6fd553d093e03d53e13e61186ad45d5c8d1d9171c7c8d461a8d7ab40457458cdac1f7794b2c450423764a19306699a3fad0c3
+EBUILD luaexpat-1.3.0-r100.ebuild 1655 BLAKE2B 9f44f5f19c9caafe525688caa9bead4d5f2b4d171241b6198b5a84438d8876e6f52faf224a3866c044a83c89843f9d01fb3fae3ee49cd5df5c4bddff8221e3f6 SHA512 a618f92cd3cec78238166e252344493b40cacc009beb098f345772884750bc276ba565ec70ff038f7261d1d7020b21af6f0bdd484cafa6fd0ef1aae5f8a2c970
+EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20
+EBUILD luaexpat-1.3.3-r100.ebuild 1783 BLAKE2B 3707e3ffffc44ce4c6c466513529f367964875d9d500ecb1394c203b2425f06b4601a18210ec47328c22c789e745b9f6f9e912e30bd3118c5c59ee235ce71c76 SHA512 f791c4ca6cc4416e3537dbe833eb3e7778a0050461f63627c1abb65a8afac46636bccdd15388ba275bb0a82a69e73793488f1d07b03fb3a7975d1e5b5d45fd41
+EBUILD luaexpat-1.3.3-r2.ebuild 1265 BLAKE2B 3ddd7ae3f5a75fac07bbb465dc1477c59f6ac950b3cd3d2ef1171444122788d59b4e0e2d865590b52e4e6ecbcbbd0be67285b4137de3a41e3039344c1a6d764f SHA512 681d5ee8233e60ae96d84f6315c9886080dd211bd55c8e3ceb89b679221c0d3bc8871bf96ee8b91c24fa12feecca6f213e6e0f91de94b9b102e4308130ee208c
+MISC metadata.xml 575 BLAKE2B d4d3ac883ccfd199e985d1d78be584a14b0233550e41142bdfeda2243d514476daeef6b47d2ccba16525eccc58df0ec58215b810b995d0b83df53c6de58a2895 SHA512 5d1e6633bab522940d2461d230f3eff660d3c0088063ec82c7506aeca071a553d63893851968c20f4073bb2fb554e63deb2da54b405a4c75923e77f4286fe578
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
new file mode 100644
index 000000000000..7366163d9d82
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
@@ -0,0 +1,33 @@
+From 0926f2d705109b7d35b721344264b39c1169e0de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= <francois.perrad@gadz.org>
+Date: Sat, 16 Feb 2019 16:08:25 +0100
+Subject: [PATCH] restore method getcurrentbytecount
+
+fix #3
+---
+ src/lxplib.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/lxplib.c b/src/lxplib.c
+index 7726913..35bec3c 100644
+--- a/src/lxplib.c
++++ b/src/lxplib.c
+@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) {
+   return 1;
+ }
+ 
++static int lxp_getcurrentbytecount (lua_State* L) {
++  lxp_userdata *xpu = checkparser(L, 1);
++  lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser));
++  return 1;
++}
++
+ static const luaL_Reg lxp_meths[] = {
+   {"parse", lxp_parse},
+   {"close", lxp_close},
+   {"__gc", parser_gc},
+   {"pos", lxp_pos},
++  {"getcurrentbytecount", lxp_getcurrentbytecount},
+   {"setencoding", lxp_setencoding},
+   {"getcallbacks", getcallbacks},
+   {"getbase", getbase},
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
index 95de7be60690..a780dddea838 100644
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/makefile b/makefile
-index 1a5a145..df09239 100644
+index 1a5a145..50912f0 100644
 --- a/makefile
 +++ b/makefile
 @@ -45,7 +45,7 @@ OBJS= src/lxplib.o
@@ -11,3 +11,11 @@ index 1a5a145..df09239 100644
  
  install:
  	mkdir -p $(LUA_LIBDIR)
+@@ -53,6 +53,7 @@ install:
+ 	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+ 	mkdir -p $(LUA_DIR)/$T
+ 	cp src/$T/lom.lua $(LUA_DIR)/$T
++	cp src/$T/totable.lua $(LUA_DIR)/$T
+ 
+ clean:
+ 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
new file mode 100644
index 000000000000..c0bc8c1a7b41
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
@@ -0,0 +1,109 @@
+From 4ef48128bd9a725daca1d5a4aabe0c1665d78742 Mon Sep 17 00:00:00 2001
+From: Matthew Wild <mwild1@gmail.com>
+Date: Wed, 2 Apr 2014 21:02:29 +0100
+Subject: [PATCH] Make merging of CharacterData events optional, controlled by
+ the 3rd parameter of lxp.new()
+
+---
+ src/lxplib.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxplib.c b/src/lxplib.c
+index a7d6c42..794f6e3 100644
+--- a/src/lxplib.c
++++ b/src/lxplib.c
+@@ -57,6 +57,7 @@ struct lxp_userdata {
+   int tableref;  /* table with callbacks for this parser */
+   enum XPState state;
+   luaL_Buffer *b;  /* to concatenate sequences of cdata pieces */
++  int bufferCharData; /* whether to buffer cdata pieces */
+ };
+ 
+ typedef struct lxp_userdata lxp_userdata;
+@@ -171,8 +172,13 @@ static void f_CharData (void *ud, const char *s, int len) {
+   lxp_userdata *xpu = (lxp_userdata *)ud;
+   if (xpu->state == XPSok) {
+     if (getHandle(xpu, CharDataKey) == 0) return;  /* no handle */
+-    xpu->state = XPSstring;
+-    luaL_buffinit(xpu->L, xpu->b);
++    if(xpu->bufferCharData != 0) {
++      xpu->state = XPSstring;
++      luaL_buffinit(xpu->L, xpu->b);
++    } else {
++      lua_pushlstring(xpu->L, s, len);
++      docall(xpu, 1, 0);
++    }
+   }
+   if (xpu->state == XPSstring)
+     luaL_addlstring(xpu->b, s, len);
+@@ -393,8 +399,10 @@ static void checkcallbacks (lua_State *L) {
+ 
+ static int lxp_make_parser (lua_State *L) {
+   XML_Parser p;
++  int bufferCharData = (lua_type(L, 3) != LUA_TBOOLEAN) || (lua_toboolean(L, 3) != 0);
+   char sep = *luaL_optstring(L, 2, "");
+   lxp_userdata *xpu = createlxp(L);
++  xpu->bufferCharData = bufferCharData;
+   p = xpu->parser = (sep == '\0') ? XML_ParserCreate(NULL) :
+                                     XML_ParserCreateNS(NULL, sep);
+   if (!p)
+From cbaf85740f6032cfc025c7bde3f9861d15825928 Mon Sep 17 00:00:00 2001
+From: Matthew Wild <mwild1@gmail.com>
+Date: Wed, 2 Apr 2014 20:56:58 +0100
+Subject: [PATCH] Add support for XmlDecl handlers
+
+---
+ src/lxplib.c | 14 +++++++++++++-
+ src/lxplib.h |  1 +
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/src/lxplib.c b/src/lxplib.c
+index 35bec3c..a7d6c42 100644
+--- a/src/lxplib.c
++++ b/src/lxplib.c
+@@ -345,6 +345,16 @@ static void f_StartDoctypeDecl (void *ud, const XML_Char *doctypeName,
+   docall(xpu, 4, 0);
+ }
+ 
++static void f_XmlDecl (void *ud, const XML_Char *version,
++                                 const XML_Char *encoding,
++                                 int standalone) {
++  lxp_userdata *xpu = (lxp_userdata *)ud;
++  if (getHandle(xpu, XmlDeclKey) == 0) return;  /* no handle */
++  lua_pushstring(xpu->L, version);
++  lua_pushstring(xpu->L, encoding);
++  lua_pushboolean(xpu->L, standalone);
++  docall(xpu, 3, 0);
++}
+ /* }====================================================== */
+ 
+ 
+@@ -365,7 +375,7 @@ static void checkcallbacks (lua_State *L) {
+     "Default", "DefaultExpand", "StartElement", "EndElement",
+     "ExternalEntityRef", "StartNamespaceDecl", "EndNamespaceDecl",
+     "NotationDecl", "NotStandalone", "ProcessingInstruction",
+-    "UnparsedEntityDecl", "StartDoctypeDecl", NULL};
++    "UnparsedEntityDecl", "StartDoctypeDecl", "XmlDecl", NULL};
+   if (hasfield(L, "_nonstrict")) return;
+   lua_pushnil(L);
+   while (lua_next(L, 1)) {
+@@ -420,6 +430,8 @@ static int lxp_make_parser (lua_State *L) {
+     XML_SetUnparsedEntityDeclHandler(p, f_UnparsedEntityDecl);
+   if (hasfield(L, StartDoctypeDeclKey))
+     XML_SetStartDoctypeDeclHandler(p, f_StartDoctypeDecl);
++  if (hasfield(L, XmlDeclKey))
++    XML_SetXmlDeclHandler(p, f_XmlDecl);
+   return 1;
+ }
+ 
+diff --git a/src/lxplib.h b/src/lxplib.h
+index 9c0be4f..4c7084c 100644
+--- a/src/lxplib.h
++++ b/src/lxplib.h
+@@ -20,5 +20,6 @@
+ #define ProcessingInstructionKey	"ProcessingInstruction"
+ #define UnparsedEntityDeclKey		"UnparsedEntityDecl"
+ #define StartDoctypeDeclKey		"StartDoctypeDecl"
++#define XmlDeclKey			"XmlDecl"
+ 
+ int luaopen_lxp (lua_State *L);
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild
new file mode 100644
index 000000000000..28ce6e137095
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
+SRC_URI="https://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	# Add '-DLUA_32BITS' for fixing compilation with lua5.3
+	sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so" "src/lxp-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so" "src/lxp.so" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CDIR=$(lua_get_cmod_dir)"
+		"LUA_INC=$(lua_get_include_dir)"
+		"LUA_LDIR=$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
index 2cbb8f239da6..37600917577e 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib toolchain-funcs flag-o-matic eutils multilib-minimal
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="http://www.keplerproject.org/luaexpat/"
@@ -11,18 +11,17 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+	sed -i -e 's:-g::' -e 's:-O2::' Makefile || die "sed failed"
 	multilib_copy_sources
-
-	append-flags -fPIC
 }
 
 multilib_src_compile() {
@@ -30,9 +29,6 @@ multilib_src_compile() {
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) -shared" \
-		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
 		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
 }
 
@@ -46,6 +42,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc README
-	dohtml -r doc/*
+	dodoc -r README doc/*
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild
new file mode 100644
index 000000000000..7674c7cd76ab
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://github.com/tomasguisasola/luaexpat"
+SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/us/." )
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_getcurrentbytecount.patch"
+	"${FILESDIR}/${P}_restore_functionality.patch"
+)
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i makefile || die
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so.${PV}" "src/lxp-${ELUA}.so.${PV}" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so.${PV}" "src/lxp.so.${PV}" || die
+
+	local myemakeargs=(
+		"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
+		"LUA_INC=${ED}/$(lua_get_include_dir)"
+		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
index 9c6db1a5eef6..5b99b5d96bac 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
@@ -20,6 +20,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_getcurrentbytecount.patch"
+	"${FILESDIR}/${P}_restore_functionality.patch"
 )
 
 src_prepare() {
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index 33b51fda50f9..7b5da0bdee8c 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tomasguisasola/luaexpat</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tomasguisasola/luaexpat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 3b10740a6302..4881d745ac57 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,9 +1,4 @@
-DIST luafilesystem-1.5.0.tar.gz 26660 BLAKE2B 555a119c580a14377e0b721929d33f6e15e4b4449c061860d611a12896020959f3755bde44ba29d492e8bd10a084a6dc7cd78ed0ef67c1fad85a7acb49bcf6c2 SHA512 79e767be5b923424c2f3c0025e050b6a5b15550cf96d153072f817b0f94757032feeaa579e4d73cc009a5954d38a30079db1c1c15545a45e9f13c0c776080aac
-DIST luafilesystem-1.6.2.tar.gz 27886 BLAKE2B fa13cc529f3ff2b5c5bbf082c5071d066da2da97c066054c9c312366a43e0a2e136bf6eae139abb63e6de916ecca60421cd36bce132393cf0333f9d124027117 SHA512 75debecd3b35d43e76b51de02cface73808547be6a26e15c06c969c50bbfd7c4d0801ccb68812b7ecb99e56eaa63deeadaba6d0387748e215e5bdab784d463ff
-DIST luafilesystem-1.6.3.tar.gz 30389 BLAKE2B 412d2893a59ccde2eb8912523bea4d06d4f140dee2f47b5e8e9795d1ca950a4be93a32eb5632775277ab2c2c22a9229c9f33d062e0d1fcd5397178962b96bae9 SHA512 47a2637903c9d42ce3ab7cf3e27b6457845aeed7ce90c0fee964ba9bf9eabf6a6eea940f960713f6b982f1b64167dbd5da8f217281284143c89e3cc5488b8404
-DIST luafilesystem-1.7.0.2.tar.gz 30877 BLAKE2B c90d960b3cb28a7339e5d103a262beb76864cfd30e0502e991ae82d6fb8706da8a99d9c19d037d7c299139346a5b925e10886addce07e3755891f11b9c2ec4d9 SHA512 a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511
-EBUILD luafilesystem-1.5.0.ebuild 773 BLAKE2B 643e89ebe7fe41aea3c113c52f2456a1b298e5cc40f1a87884230bfbade8bffd899575b3169d82b2f6a1ea78fbb17877376d533c13d918afc431edcb6b8758b5 SHA512 c13733e18224c6d490ea3136e7ca8b4a85e9e5b1a8ac3cbce3807d0e64dea9768a2d8d11fe5355ea7532c7ba7eb1fb7cf6494dcb974b19e50d6a38fe3b0be4d7
-EBUILD luafilesystem-1.6.2.ebuild 771 BLAKE2B fc7c88ba0d86deed70375c3e53acf138470b270ee13025599b88eb7e9f6cc0f800d95b48eb2af8b3fbfcdaff296bda033dfeaa5663cff315e2c82f7104c9ffc2 SHA512 65f35e92c1be83462e5b14b3fb9e591de20beba32e526db06162483a4d1759ed1ede08717a43c0d3133019b3b11b05bbda25fbb215cfde00aea1baaf76ff345f
-EBUILD luafilesystem-1.6.3.ebuild 1130 BLAKE2B 5bcb69de6dc311b039196d8f82b2759882d0a818b5ba0b80a536dd41b038fac6dfae201e354a779677316d16115cbeed8c865cce563845547f57a32adb63e474 SHA512 c02e9f2acd82e3103c4c938af738cf2fb9329cbd5ed54c3c4ae6187b34b2e05a766bc86a092ff98fd8dcfd440275aad27b148fb5601343e53e53a890bb3e67ba
-EBUILD luafilesystem-1.7.0.2.ebuild 1679 BLAKE2B 4761eec2bc6e02da04a3592dde6a78e599e01c8def3bf03cdd208993da4e98a0a52593f2aef9149621d81ae68d1c97c973d4e7ad6c233dc069cec9af5989fa5c SHA512 6f62c00a21353984f6d7c390fe65a550829fd02a702ccd6163164abce97c6b90fc11743b72bf3058140e9d5bce3d2c622a5fa714ddf723ed519c6812cedb107f
-MISC metadata.xml 757 BLAKE2B 078885172ec5e45e79fecdee8232357edb9f381b990aca6d29ec54ef49bb7de2d7359399536e38195293658568dd647c0b2d1129003bb901e59708dd25d804d2 SHA512 188f7d27fad84637eac606ffe476aa605e8f7c9ceb8dcae1783547b406d97fac171de90db695ba869671dfda245a9bc3494b26d1191a5f50c3e91918b41499a9
+DIST luafilesystem-1.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247
+EBUILD luafilesystem-1.8.0-r1.ebuild 1074 BLAKE2B 5fb971448dfb2fd52e15d05dccbed4a685eee4501d23ae260ea42747dcfe8923c22153f3bc9d8cd3fca4051477d2721b8e050607c2ef287592c55f460f8f5105 SHA512 0a7636dd88865d9b0139a376e0129e48ca83f422401ac598b47c118fe3fb7eb79a87280f5f8fb8963d2fb88145155180521e0519b58fb580c0a5a8b078c1a94b
+EBUILD luafilesystem-1.8.0-r100.ebuild 1622 BLAKE2B 184a8f9b5e4c847d4b3cf9915e773b99082308e4b8d5b4659bf2c80085d0d5002f63221820d36aadfc2a6430b80eea900753c34f398691f22e1947b05cba42d5 SHA512 f28887f4a48c54bf5f6a1abe3b8e3133ac8c5b7247f0eca26d12a1ee8ebc8d4f33c601cb8f0816382cf5c32e15275a6cd716de6f0b353705c4ca52ec2c8ff26a
+MISC metadata.xml 858 BLAKE2B 6f50e96acfa2b1aa606c616eda03ac35c214902a2d39dee101ecc32a3f1fe91980d4f735e4ecf066133d573910b10dda51ca1e57421f9f5327148e74fde3212f SHA512 6816a7b67fd5c7cab8cf90b2e096877e360e482644b339214becbc47dcd6b1b6a3e49470a481493dc31fe611d8c8ff7470b7c4eb5080bcd201e6543dbf3f2a7a
diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
deleted file mode 100644
index 657786056c85..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s|gcc|$(tc-getCC)|" \
-		-e "s|/usr/local|/usr|" \
-		-e "s|/lib|/$(get_libdir)|" \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" install
-	dodoc README
-	dohtml doc/us/*
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
deleted file mode 100644
index def72540b454..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s|gcc|$(tc-getCC)|" \
-		-e "s|/usr/local|/usr|" \
-		-e "s|/lib|/$(get_libdir)|" \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" install
-	dodoc README
-	dohtml doc/us/*
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
deleted file mode 100644
index 75ab037289ac..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-SRC_URI="https://github.com/keplerproject/luafilesystem/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1 )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-HTML_DOCS=( doc/us )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		INCS="-I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	LUA_CPATH=./src/?.so $(usex luajit 'luajit' 'lua') tests/test.lua
-}
-
-src_install() {
-	emake \
-		LUA_LIBDIR="${ED%/}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
-		install
-
-	einstalldocs
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
deleted file mode 100644
index 88b4ef4b5a98..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc luajit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:*
-	luajit? ( dev-lang/luajit:2 )"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	cat > config <<-EOF
-		# Installation directories
-
-		# Default installation prefix
-		PREFIX="${ED}/$($(tc-getPKG_CONFIG) --variable exec_prefix $(usex luajit 'luajit' 'lua'))"
-
-		# System's libraries directory (where binary libraries are installed)
-		LUA_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-
-		# Lua includes directory
-		LUA_INC=-I$(pwd)/src
-		LUA_INC+=-I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))
-
-		# OS dependent
-		LIB_OPTION=\$(LDFLAGS) -shared
-
-		LIBNAME=$T.so.$V
-
-		# Compilation directives
-		WARN=-O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
-		INCS=\$(LUA_INC)
-		CFLAGS+=\$(WARN) \$(INCS)
-		CC=$(tc-getCC)
-	EOF
-}
-
-src_test() {
-	LUA_CPATH=./src/?.so $(usex luajit 'luajit' 'lua') tests/test.lua || die
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/us/. )
-	einstalldocs
-
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..0366ccae8958
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="File System Library for the Lua programming language"
+HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	luajit? ( dev-lang/luajit:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	cat > "config" <<-EOF
+		CC=$(tc-getCC)
+		CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua')) -fPIC
+		DESTDIR=${ED}
+		LIB_OPTION=${LDFLAGS} -shared
+		LUA_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))
+	EOF
+}
+
+src_test() {
+	LUA_CPATH="src/lfs.so" lua tests/test.lua || die
+}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild
new file mode 100644
index 000000000000..a1e0b4c454bd
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild
@@ -0,0 +1,82 @@
+# 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 lua toolchain-funcs
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="File System Library for the Lua programming language"
+HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+lua_src_prepare() {
+	cat > "config-${ELUA}" <<-EOF
+		CC=$(tc-getCC)
+		DESTDIR=${ED}
+		CFLAGS=${CFLAGS} $(lua_get_CFLAGS) -fPIC
+		LIB_OPTION=${LDFLAGS} -shared
+		LUA_LIBDIR=$(lua_get_cmod_dir)
+	EOF
+}
+
+src_prepare() {
+	default
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	# Clean project to compile it for every lua slot
+	emake clean
+
+	emake CONFIG="config-${ELUA}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lfs.so" "src/lfs-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	LUA_CPATH="src/lfs-${ELUA}.so" ${ELUA} tests/test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lfs-${ELUA}.so" "src/lfs.so" || die
+
+	emake CONFIG="config-${ELUA}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index 9e9cb608e469..5b577f074b21 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>
@@ -9,7 +13,7 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
+	<longdescription>
 		LuaFileSystem is a Lua library developed to complement the set of functions
 		related to file systems offered by the standard Lua distribution.
 
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index b94803760112..af1e0d05d4e3 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,6 +1,5 @@
-DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-EBUILD luasec-0.7.ebuild 1110 BLAKE2B 8776d00d3c3b5e437b70f91a0785a655ec95e2981321ec4002b207da2a1e2581f27b93471d08f527a16e032424a824e613c82ffc57297f3f74a4578072977761 SHA512 3aa16b8fd2c58a95ef4e1744ca4b96ecabd5d82a34121e3dabe394548d7ee92ff0e17249cc3120c12ae093c9ebb68e8bbdb96901f9dafd0123c9a685702e43f4
-EBUILD luasec-0.9.ebuild 994 BLAKE2B 680eaffcf974bcd70d01133f95ef4df3d375effe55aef2b7756030624431c4e2c51a13ef81a5651b2430379eaddb7e6d4f05b12222807ca10a95964c538699d2 SHA512 9c8c944fabaf6053ddbe4ebe6bda040b95c4ee2093a18c344e397c642fcaa227f3eb3a5390187e3573fdeb054385be60c57af0b8dd43735e09768ee60efad7b2
-EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
-MISC metadata.xml 471 BLAKE2B 678f1c3e123d5690a1f7c68ee5b4c0bba74f48762692e9fc27739bdfa79e609ca9c140cb2eed1548b8c9f08f29bd828f805b28ca8b99ec51f301c77e52e41113 SHA512 8b5bd42751700ef9893f73111e8014c116b4a6e07891346602c42485c7daf4de63388936c95182bc6d2a9506353a48354e1a1e56e7ef299643206ced57d506df
+EBUILD luasec-0.9-r100.ebuild 1685 BLAKE2B 9c11015228dff2c453c9b5433ec96a751142b01a6cf4c00d51d72c2ff5f34d61a0809fbcafc72619976e1c4e396640621ebd4163e5720597aca451db962b9b90 SHA512 184f598125ac692d389a25c46bcd7c36bd039d1b933cf2afa2d957d0177752ddd6fdf1bf12149d0e64893b7787cd332e6b70a81f4b32f86d49d9bb3fc9b3fa33
+EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2
+EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60
+MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
deleted file mode 100644
index 4dc8f5927ae9..000000000000
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/brunoos/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0[deprecated]
-	dev-lua/luasocket
-	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e "s/-O2//" src/Makefile || die
-	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
-		linux
-}
-
-src_install() {
-	emake \
-		LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
-		LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
-		install
-}
diff --git a/dev-lua/luasec/luasec-0.9-r100.ebuild b/dev-lua/luasec/luasec-0.9-r100.ebuild
new file mode 100644
index 000000000000..d908b664a4c5
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.9-r100.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="deprecated"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-lua/luasocket-3.0_rc1_p20200328-r100
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i src/Makefile || die
+}
+
+lua_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	# Generate SSL options
+	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"INC_PATH=-I$(lua_get_include_dir)"
+		"LIB_PATH=$(lua_get_CFLAGS)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" linux
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/ssl.so" "src/ssl-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/ssl-${ELUA}.so" "src/ssl.so" || die
+
+	local emakeargs=(
+		"DESTDIR=${ED}"
+		"LUAPATH=$(lua_get_lmod_dir)"
+		"LUACPATH=$(lua_get_cmod_dir)"
+	)
+
+	emake "${emakeargs[@]}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasec/luasec-0.9.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
index 013a9b13d85e..49603d3ef4c2 100644
--- a/dev-lua/luasec/luasec-0.9.ebuild
+++ b/dev-lua/luasec/luasec-0.9.ebuild
@@ -8,7 +8,7 @@ inherit multilib toolchain-funcs
 DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
 HOMEPAGE="https://github.com/brunoos/luasec"
 SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index df666e66d836..0023fbd9de48 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN}-${P}
 fi
 
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index e33b533b4b13..67fc375b3b4a 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brunoos/luasec</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brunoos/luasec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 0ca2f25f2929..964e87c6bdff 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,7 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
-EBUILD luasocket-3.0_rc1-r4.ebuild 1200 BLAKE2B 195a0adc1922c68d5ec34b9e918a5f95e7fda0144c2f6b67970523885e3c77375ee184421804de32b41930a7b5f7c5f70e22030362423e4f4dbcc27591239e98 SHA512 ddec5f0f99583101aa5a3524e783d3aec40522c8ab5552ff0b762e0908c19d47eaec8e7a84bee96053ab98a9b9d7d17926ff93bbb7632841545354e58fdce980
+DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
 EBUILD luasocket-3.0_rc1-r5.ebuild 1269 BLAKE2B 2d68f6772b9b9b64f6e4a7019fe0fbb0d1b06853b22dbf6b25df7e1009fc9cadf71d011ce25192533b2327e9c9a0e696922da36e37e979ebcb684c385fc38be3 SHA512 e26279b51433c160b3eeed4891684ef339c711986ffd6bce5f0b89b714bcdaac792b033cf6a28558be8c5660dd12258e513a7025465a34be53e07e4130bbae39
-MISC metadata.xml 477 BLAKE2B 52f02912583a3e2ab7d848bbfa824053e739efd616e07f73ffa49e8224f2b96da7007ee3d6e4fcbc613d9fbf92749d36f9db6f06cf2602f5df7fd6b9336fb310 SHA512 ea7c6680247c77e364316be205f5845357d940c6efd38e8f9ce2575afd02012a544cd859903f25255893653c1ab9afd3403fb67a5e9dc5469fc7bbf4b94d7677
+EBUILD luasocket-3.0_rc1_p20200328-r100.ebuild 1948 BLAKE2B 520cca570a1bc4a66d6bfbf4668a035857265d983a13159b630445333df23d5959098752288a509fd27e2352a00c66af2c1bf129c9835eb79ac7a6eb9cdb3163 SHA512 b9631e0d568994989ef221f5bade7d3c67346638a3827787f53fe5f4052aa6d74843b08b9d0accae75a3b574d7d4d6c203697454bad48edc5a74461ea595d314
+EBUILD luasocket-3.0_rc1_p20200328.ebuild 1824 BLAKE2B acd961363bba7bd85d0437f2b81712863becfefef7cb76172b9ae88a189065ee5a5ae5035a35923df1a9de96ab2df04fa624ef8fefae3a952d27ae13f1e86309 SHA512 afc8bf466ffcd25e15899e043a7fa5fd9cad9d3025abb8931c14471b53a12b8262d3f714ed3b611f4216c131d5cf2cff9ba0790642bb2cd8199d42d729f13b98
+MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
deleted file mode 100644
index edede5c979ef..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal flag-o-matic toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/proxy-fix.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		LD="$(tc-getCC) ${LDFLAGS}"\
-		$(usex debug DEBUG="DEBUG" "")
-}
-
-multilib_src_install() {
-	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
-	emake \
-		DESTDIR="${D}" \
-		LUAPREFIX_linux=/usr \
-		LUAV=${luav} \
-		CDIR_linux=$(get_libdir)/lua/${luav} \
-		install-unix
-}
-
-multilib_src_install_all() {
-	dodoc NEW README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild
new file mode 100644
index 000000000000..479cb3ff4eef
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit flag-o-matic lua multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="
+	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/diegonehab/luasocket
+"
+SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS="doc/."
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
+
+	# Workaround for 32-bit systems
+	append-cflags -fno-stack-protector
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LDFLAGS_linux=-O -fpic -shared -o"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"LUAV=${ELUA}"
+		"MIME_V=1.0.3-${ELUA}"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+		"SOCKET_V=3.0-rc1-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	local myemakeargs=(
+		"CDIR=$(lua_get_cmod_dir)"
+		"DESTDIR=${ED}"
+		"LDIR=$(lua_get_lmod_dir)"
+		"LUAPREFIX_linux="
+		"MIME_V=1.0.3-${ELUA}"
+		"SOCKET_V=3.0-rc1-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$(lua_get_include_dir)"/luasocket
+	doins src/*.h
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
new file mode 100644
index 000000000000..4591859cc608
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="
+	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/diegonehab/luasocket
+"
+SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS="doc/."
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
+
+	# Workaround for 32-bit systems
+	append-cflags -fno-stack-protector
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LDFLAGS_linux=-O -fpic -shared -o"
+		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua$($(tc-getPKG_CONFIG) --variable V lua)"
+		"LUAV=$($(tc-getPKG_CONFIG) --variable V lua)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+multilib_src_install() {
+	local myemakeargs=(
+		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+		"DESTDIR=${ED}"
+		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+		"LUAPREFIX_linux="
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/$($(tc-getPKG_CONFIG) --variable V lua)"/luasocket
+	doins src/*.h
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index 2af4fc2a4ace..a173d5088869 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">diegonehab/luasocket</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">diegonehab/luasocket</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index aaebc89d9e46..ae97f17fdcb7 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -3,5 +3,5 @@ DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f36973
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
 EBUILD luassert-1.7.10.ebuild 874 BLAKE2B 52842a1da1aa2f7403ad84eb8038361e738f0c54ae5c298a01f5aad4924e79da65464a97674d20974efc7150e20d124fe40693fa285b8ffcee6f91d7cbccab36 SHA512 9bfda9a13d9a1e46e5c04a28905a1341ff7782ec4f22a714470a48d03956ea2864e5ca5effc8bab26115e9d05f153f5300d46e004f35883558a923bdb08acdf8
 EBUILD luassert-1.7.9.ebuild 609 BLAKE2B bb29a2069407537bd1e0bb9dc7561951c4615c6405108d11f83fd8132d032e0696f16be288e365a0b4201a41e45dda36e8b360313d58d1b7b0b58628b0c62b59 SHA512 920ca16cdb8eb819218d6eeaf97fcfb18777f68963cc79249622e856b7ef35cc8231e7436c8cb84a673ea50ce20dd95960834be0f19d71c2041e827a3f51bd9d
-EBUILD luassert-1.8.0.ebuild 959 BLAKE2B 81b0dafbc66fa3791df0896df2053a566435a2494822893b5e95fbe691f61dc6f0c145012621ce30a08848d5a422b5863337c50e4b23d7368f6eb646b7f1dfcc SHA512 62be46711291c987656ef51d3b1ff43d5bf4e00e37605bb2915bf65f531dd4f09708793ebe1e55a2ecd8ae3f3aed19574df5eb67c23d2af8b07f3e40b30af71d
+EBUILD luassert-1.8.0.ebuild 964 BLAKE2B 32f893d6b00623c8a9afe92e0adec313b37f865ed7da3a5d21bd471e1205f0b7eac23bc8c3220d73bcb36b4076e8b4dd53857cfa4f2ecea29ef854edfd0350e1 SHA512 171af919bbe8a5f1a18b1ef61e888baf25aee1e6b73da9fd201785d658a228ffaa50e285595b0f5873bb5cfe992d7ceaf2e0611fc1cf65439e76657ca74c2b7d
 MISC metadata.xml 497 BLAKE2B 009bcaf2379e9d29771f83aba63ad50ec2e9e02a328e9605a8d2e171e43e59025aab51ba876206d58f86fd7d0e51a28e9d0d1851f0cc4d87c2cce02e11b048a6 SHA512 8bb0c5cc23259fd9e259620ecde2b377220b3d8062b5229777d811b3827a36d770c2518245009be328f932a5fe6f84ecb719d7e9ff604d7cb4524d9a59811f6b
diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild
index a0544d7aa066..af01777b7a73 100644
--- a/dev-lua/luassert/luassert-1.8.0.ebuild
+++ b/dev-lua/luassert/luassert-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="luajit test"
 RESTRICT="test" # Requires same version to be installed or busted will fail.
 
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index bcfb02a3a9f3..706b5fb0df8b 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -3,5 +3,5 @@ AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de
 DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
 EBUILD luasystem-0.2.0_p0.ebuild 1044 BLAKE2B 09dc31b189eec831c6d464eb802eb29b4846a45efe2c30e692e96c9f578ec71b480f82451e407b7fc36bca90065626090a209e75c761d07ef3f77df5d544d6cf SHA512 4c443043cb0b480975288d596d97af29c570e33f44ad7b634c7d86b5660f6e6d14556065ff15c4ed9990091d3a0d916ec3f4affeb32f763b6530258417a2b71f
-EBUILD luasystem-0.2.1_p0.ebuild 1187 BLAKE2B 7cd1eecd647d22155c86d0be478a29d402fc26ef5b168d13bfeb473e19a3c0ce1a3b39e786c2e94bae120422645ae751da576cd8650466ff531f3651f9fd6eaf SHA512 8f834985e3f24324aa39cca786e4c664686369044c94786c901d27328254816ecf06e7c4cd249350eac30ab2c6e22777e6fa604e0858a89de98a186e7e373834
+EBUILD luasystem-0.2.1_p0.ebuild 1192 BLAKE2B 9bb036f72b3123bacdecee7d7b02544f7561022291a5a4578f51527fd0e92df9fb080d25ebd47647a4f6b31ebc5cc47abb2ca51088e4e35f219a8df92de9e938 SHA512 fd242fdd1fb0966fb04e2b0221f7d7b91c480b85aa5811fc741bd781978a995115d53b9f4deffce66db914c14d2d2318ebc81b742a72bfbd50b86f114c3dd626
 MISC metadata.xml 490 BLAKE2B 59d66fdd8685e01d7b7e928ebb0e43c111062bd7c43ddbbfa070b5af4a5bbc9db1031d0b95f56a05c1b39c35c7aa148e86e6d3761cfc193c5baa6ddffad68639 SHA512 bb9b143436c281ca2664b17b1d1c31ba46befb1139ebd62213dba66003dba43f9d769b65ff8954307faa40690bb31ca7b617628b2feb7c755759b642fc3699ab
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
index 416161626135..7633f8d98223 100644
--- a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="luajit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 6c5f306bcb30..62e2732885be 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,4 +1,5 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
 EBUILD lutok-0.4-r1.ebuild 754 BLAKE2B 3fe886271f7515a575d95112777472c40b32f700ae0191e6d284f8ba767567c4c8dc4ad155ed4e25474a71b73554ffed6127bdb102df3706a1121d987595df13 SHA512 a003eb9cb09759e8a467cf926e441e2583a78d730cfbe35d0dba66f64970a46928ff608a522b45c6bab0e2974bec7cc901a875f4f2465f1fec445bbb203c96ba
+EBUILD lutok-0.4-r10.ebuild 1025 BLAKE2B 6cc449e4de7d5b5b9e560248896c1eac8f8ee877ae269a389b2c7f0317803f25e6cba6fac802355a58d50734f93b2e5654aeb5488a6bac3f5e91846b90db3099 SHA512 f59b9a4140f7947a3d117e05d9e6208a8bf06867b71e442a7e8f02482a1e6d388cd9f934257debbf8fd29e7728c037d1f1a6aa76343ea65797d7528fccdbc186
 EBUILD lutok-0.4-r2.ebuild 837 BLAKE2B 3d3fe5fcbd35fe809def568aa4dfd4f75285534b52697d5d21bd873337dc4ddd830d7c28726cccd84edf16182bf19c7ccfbde070bbe9ad30f195c7a8374084fd SHA512 b46af7dc3a0ac47b394ec507ddaa162d3f75d3f11186ed99e0fcb2c393f776abe1eacb41313afdce1bfe3b4ee30ed429be60f5c68e99d711f9d4b425b2e7df2c
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
new file mode 100644
index 000000000000..378ed963caf4
--- /dev/null
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single
+
+DESCRIPTION="Lightweight C++ API library for Lua"
+HOMEPAGE="https://github.com/jmmv/lutok"
+SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	lua_setup
+	local myconf=(
+		--enable-shared
+		--disable-static
+		LUA_CFLAGS="$(lua_get_CFLAGS)"
+		LUA_LIBS="$(lua_get_LIBS)"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index bee97ff91be0..7d8ff92ef925 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,4 +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-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST luv-lua-compat-0.7.tar.gz 51383 BLAKE2B ae86f314de971fcd7d8706009d59d684c035fb661ecf392c581a3c317cc1a396321ef7af0418d8f23151c52c66613a0749e8fa9ac889a183c2ffe749091dae35 SHA512 665ece98422a105b818cffd96eea5788696fbb854d2ba41d2d387e8bd25c1fa9de601468e55e22e9e749979a66d4d2e0f7dfd656e5bf27b489d37bb07c96f48d
+EBUILD luv-1.32.0.0-r101.ebuild 2973 BLAKE2B 0735044bb0363923faa5e61f6d479194ff1e658086bbeb48cb7272aa24ddebc91a968ffa26d6d841dbb64e562556df3680a00c63eb02594be823891ab09b99c3 SHA512 7304ea117511225fb0d7bc7b1fd47edb7df9c44c999091f6f5ca7238fd3b31f06d4e396e2a96d51b273051e6ca52b4b0622e4705dd61937463e2ed6a18cd512e
 EBUILD luv-1.32.0.0.ebuild 1565 BLAKE2B b3cb0bc8ef2eb95e6b78ef0203feaa19b825b21f323599039da197715d829f3af596fa0489051a43c4d84ed62744e4cfef44ab7f2989494124a28f8ac05d522c SHA512 91bfaef1b5efb7bbb38707dff7a81baa620dad9d7d97c787adb233387e225f9b193ecc9419e5eaa6b0e02e0cbf5e9a225e8e01dcddc6869ddeae2bfe193c3716
 MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
diff --git a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..84af757d248b
--- /dev/null
+++ b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@
+       include_directories(${LUAJIT_INCLUDE_DIR})
+       link_directories(${LUAJIT_LIBRARIES})
+     else (USE_LUAJIT)
+-      find_package(Lua REQUIRED)
++      find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+       include_directories(${LUA_INCLUDE_DIR})
+     endif (USE_LUAJIT)
+ 
diff --git a/dev-lua/luv/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r101.ebuild
new file mode 100644
index 000000000000..f45e0eee2820
--- /dev/null
+++ b/dev-lua/luv/luv-1.32.0.0-r101.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua 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"
+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
+}
+
+lua_src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="$(lua_get_cmod_dir)"
+		-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
+
+	cmake_src_configure
+}
+
+lua_src_test() {
+	# We need to copy the implementation-specific library back so that the tests see it
+	rm -f ./luv.so
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
+
+lua_src_install() {
+	cmake_src_install
+	mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig && \
+	mv "${ED}$(lua_get_cmod_dir)"/pkgconfig/libluv.pc \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/libluv-${ELUA}.pc || \
+	die "Failed make pkgconfig file for ${ELUA} implementation-specific"
+	rmdir "${ED}$(lua_get_cmod_dir)"/pkgconfig || die
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
+
+pkg_postinst() {
+	ewarn "Please note that in order to properly support multiple Lua implementations,"
+	ewarn "this ebuild of ${PN} installs its library files into implementation-specific"
+	ewarn "module directories, as well as multiple .pc files named after implementations"
+	ewarn "(e.g. 'libluv-lua5.3.pc'). Since upstream by default only supports a single"
+	ewarn "Lua implementation at a time and thus only provides a single, unversioned"
+	ewarn ".pc file, projects depending on ${PN} might require changes in order to"
+	ewarn "support the multi-implementation approach."
+}
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
index 1dbe7f878755..1cad91dd40fd 100644
--- a/dev-lua/mediator_lua/Manifest
+++ b/dev-lua/mediator_lua/Manifest
@@ -1,3 +1,3 @@
 DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
-EBUILD mediator_lua-1.1.2_p0.ebuild 789 BLAKE2B d47c91ea051797b91ceafc9ef5c6a357e3d74873bbf7f09d564f575731da6ccdd961ce53b5d92d7f52f53f3fc05a18f9919ab7b8b6665e3c2759f79cd21e1276 SHA512 ce25a50ae8ceb75c2ec422deec9fb8db8812443c96f8da19cc9c3d16f4fe9367881ac20c1d0cec8e476ad8aed55df26e2eb4aefb9b26ce4499e8b44098e9d7ca
+EBUILD mediator_lua-1.1.2_p0.ebuild 796 BLAKE2B f3731646697ab1c65bb058a856cdbd2c2ec2dc1f62cdcb261ea1b6f26029bb0e225d216b74fa2f246217ebf2722a62c0499d1e2ae7d8f0571c5ced78b5a5e9a8 SHA512 cf1e7536527a28fdf3ee7ecc8ac8e52c151ea17b04154788a54ff68ab13c79e8503215e0e05160f16a17872545417e0f3de1b1d37174092a17afb2a5ba878c1e
 MISC metadata.xml 623 BLAKE2B f6e574caf2544132e811d3399dbec685c535e6a9ca63833ecba15d5f3df3faa3f0d585ae5a923aef9455e4d2489a1065e1aad577ee849488b3f982e90beaefd0 SHA512 52bea35c9427c5f7a81b7690447698137215cb1ccfeee60a4733a6a5512f204aef0a258e71701b4565bc2696e491514391c82140507f45ebf72c23a01156b6fb
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
index 4e8abcb12deb..6ef744723156 100644
--- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.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=5
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1:="
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
index a5facd4b1461..9379c5012593 100644
--- a/dev-lua/messagepack/Manifest
+++ b/dev-lua/messagepack/Manifest
@@ -1,3 +1,4 @@
 DIST lua-messagepack-0.3.2.tar.xz 13416 BLAKE2B 03d80c3a1fc8d8bfa30821f3b83ead61bc0a8ccf565d9ac17ca0b1d97ac7c72d0550695ee13feb6ff38cd8098fa331c3acaf4b52c0f95bfc3141b70a655ba9df SHA512 d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd
+EBUILD messagepack-0.3.2-r100.ebuild 978 BLAKE2B a53ba1880589a4919da703cd41d1cc9bffc4e3e492e6c49a9c84c882ac4bf031f638550a345be5c82f7d98c582eb66fa91150cc0c6d0a227c0b9136942e3e1ed SHA512 40b43b12bdfeb03c3067a4a0f583cd9ee82ccf6d8df728b1441ce72988e4c07d4ce5f069c33f5a0f9983de9f44f0bc57da66d6ccce31d6b8f17eec10ecf09f48
 EBUILD messagepack-0.3.2.ebuild 688 BLAKE2B e4c72a03d21716dc334d6c0b6a028fe8a038d33998f75fdeaba53981632bcf611ac4e430356e9ee5c1d07c0ed5a212ad1edf8c4cb1e4700749dea4d62c90ddbc SHA512 d2eeeffe2fe4c8596924b0655108854f1798a4b0dcb5136415a6065f01da145eb1c448fd74ded4cb94e63fdbfcc7f45553191daa0d3c80f494559f7092b80772
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild b/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
new file mode 100644
index 000000000000..d9897a706c27
--- /dev/null
+++ b/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
@@ -0,0 +1,47 @@
+# 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 lua
+
+DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
+HOMEPAGE="http://fperrad.github.io/lua-MessagePack/"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/lua-${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires lua-TestMore, which we currently haven't got in the tree
+RESTRICT=test
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+lua_src_install() {
+	local src_postfix=""
+	if [[ ${ELUA} != luajit ]] && $(ver_test $(lua_get_version) -ge 5.3); then
+		src_postfix="5.3"
+	fi
+
+	insinto "$(lua_get_lmod_dir)"
+	doins src${src_postfix}/MessagePack.lua
+}
+
+# nothing to compile
+src_compile() { :; }
+
+src_test() {
+	lua_foreach_impl default
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	dodoc CHANGES README.md
+}
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 86235dd25c24..4d26c64376fb 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -3,5 +3,5 @@ DIST penlight-1.5.4.tar.gz 213938 BLAKE2B c6bba4fd7fc491d2e6ca464f71b897ba4b5dc8
 DIST penlight-1.7.0.tar.gz 384917 BLAKE2B 153660f5029509611265399aad8b92d82b266ac470414c06e9d7f01b37225834f98488f30f9bbdfdc3a6714edfe2edc0fccd0356ebb966d964be633bff38eb25 SHA512 edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d
 EBUILD penlight-1.3.2.ebuild 653 BLAKE2B ff029eaaf0cb3d19c04840e8cf4fe05b6456e8467a2c5452ed2064d5c4ebe7e14418d2f1ec349729ac6733e212f5b8030d27e25c289fad72a03cf5c8c2a6a39f SHA512 14aaea5b639507e25b2ebe5eba54aa10e268cd9147961e03219e389ee11b64c71a65650c719062f617335fb0a42d9defebda748b59da057e5321b29eea744db3
 EBUILD penlight-1.5.4.ebuild 756 BLAKE2B d598d38a6ea20256a2bda11b68a5568d476c4d030132c290ebd3678f3a55c8b5ba4a5b9b20caca1f2e8714c440d59a9aa6567fe2d2dc7fa105764c5de9b4aa13 SHA512 f5c135d7d71145dc50075782afe4a70c148e1094d0b86e7ecf1fbfa26592704dc6503d9f96a8797e8fbd48e4619065965a932c49d40adc3eb1c1939e931fb9fc
-EBUILD penlight-1.7.0.ebuild 753 BLAKE2B 03623c6396462eae88caf61801d2cdbe2a47716254754e536511ac62c69ac4d6e081c15bae0277c90a530e8d50b9f54a546579762a4cc46106d7869d19191532 SHA512 5e3cebbb10fd3e75bbc3394c8fec42ff94e142cb7dc41d76eb4bb028709a1d00c46628942c57168697241ed42a65e0614820315e83bdfacc417ff2364ae4c4a1
+EBUILD penlight-1.7.0.ebuild 758 BLAKE2B 798cc49ef29bac845a22832105a530d9b0d9d1feab8fae143c049a2171431f0e4305131eeb8dbfc7450a4233b1d773c0cb141f968adb55382bfe30d739185c25 SHA512 8133a9b84ad0933b6efbcf83d4d844a4ab4c9905d6bd44833a740e740d629145b5b5e61ec6bd3de210b58b55278db1c36cb32cbcf3330a2ed019fecf9e78b913
 MISC metadata.xml 603 BLAKE2B 98847845a10c23006c481f3447fb3439d4c9e1223770455a0eb5d0051d609b48ab51ad274ba4d6ae8249ecc0ed38ff6b33be0b7a7b4ba5dddb6cb6a59df33b23 SHA512 540eed16b3e9223e2ee5181a0ca9cbb794bba41b6f5c5979d9f4796c9382ec24573e05aed2535665b83337e84fbd08b4da1c77ee3bf24f7e1b2bd58e2810f28f
diff --git a/dev-lua/penlight/penlight-1.7.0.ebuild b/dev-lua/penlight/penlight-1.7.0.ebuild
index 1036bea9323e..cdb9a2b0bb78 100644
--- a/dev-lua/penlight/penlight-1.7.0.ebuild
+++ b/dev-lua/penlight/penlight-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index c4246a91eaf0..fbbb8057f2ca 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,4 +1,4 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
-EBUILD say-1.3_p1-r1.ebuild 880 BLAKE2B a8ca9d061b256cfcd8e074683cc0f8e4d051bf87d906d0683dcc444a9287f17e1ba9b34255231626de4b684f97c84dcd04420da8b7b49c8bf5857058101b5b84 SHA512 a1514c5661fcb46f65f5b484e2beaa09ce64f8707e073615a826a6128e18e4b0b38a28347383d63f2c20f36d6785f8daecd2700d7d3ac80b373ba3a491ce764d
+EBUILD say-1.3_p1-r1.ebuild 887 BLAKE2B 4cfd1027b04900f9df4cf4c94ebbc2d7094dcce9a122dc90641fb6034b0a29bddb940565180a913663295f4afa2fbd3bf570f78e2b424940a781df938d496665 SHA512 853c051df61f99b614077d07802df809d845f0aa149afd45785a645c3812c675ed03b13d2421f1a965c9f64512f0d8b5a66145c0df06fe20e629ac6b630c9549
 EBUILD say-1.3_p1.ebuild 664 BLAKE2B 23a1ec3ce6ae91d6ee0a79f2b882e49c75b25ac2b6dd45cbbe6c46a44e088f9050120cd21e90b0222e6f7029521a79a3040b4500687fe6aca625cfc0abd287f0 SHA512 348ac3a993aeee0c570dabdf7fc632c8532801620ce384f1b1b8f18b75ee20b6894f0ac1fc0a4d646e6be38df6136f88631f37e26a79275c6f27d8314a486ba8
 MISC metadata.xml 329 BLAKE2B 325677f6bc343be31e86ec9fc075e35d5b4502d56bbca921a051259d3c3f0465ea8b413097b016e1da1071a568379b33f7f68f1415b48f3e7d6da61dd5496580 SHA512 682e04f76b25420d553f0f557f8b236c52882f6789783dcb4ef4df71bfb702dac268bedaba38e3dd1504cc97e403663571bfe07186cf9101cfceb9aaefc8de92
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
index 92eab17267b8..931cbd14b210 100644
--- a/dev-lua/say/say-1.3_p1-r1.ebuild
+++ b/dev-lua/say/say-1.3_p1-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
index 155eb1ceaa89..b905132a6ee0 100644
--- a/dev-lua/toluapp/Manifest
+++ b/dev-lua/toluapp/Manifest
@@ -1,4 +1,6 @@
 AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1435 BLAKE2B cdcfa5e194dafa466cca5fb05d8cdfc285b97ff3a91c81fe71159601245576527a2f3d8539c3a3f15be745eab14cfe084a3fc90042e141b503dcee8063c85f8f SHA512 2cf6c341e3749aff13a89cc5894b900132b78b423a3b3c858d0235735c2c237b5503ea5a187ddcb851c12a69d42400da1e7556081e178edaafd406b84fb6e893
+AUX toluapp-1.0.93_p20190513-lua-version.patch 288 BLAKE2B c98560e520abbc9106be46a28e604f1436a110de9fb267ec106c9ad00241dcb849861ef195e9344d785520e78d821b7a2750685778746eefc6c4d3619c81043f SHA512 cad6055a6fd10af78f068abbcc6921f22119206cca190d41010182edd4805b38b595b33bb7fe6ed3e90cca19b9ae944dfde8910ba14d284bca0fbf20f9a4ee1b
 DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442
 EBUILD toluapp-1.0.93_p20190513-r1.ebuild 702 BLAKE2B de6ee14cc2d14325a4f6249795fecf1a88e840146ea8ab708e0a3312467988932fd955096a019412a72561c9621900bebcd031db87238353a89f7f6de8a02199 SHA512 7fefa380e3bab68844e1b37869d5cabb17fb7dfdd6e1cdbbe3851523ef52cfedf792aaaf74a7b6d1cf851e6dc807565ee552e75197746717a88b1b4fd2d13fc3
+EBUILD toluapp-1.0.93_p20190513-r100.ebuild 970 BLAKE2B dc3f19a814ed66f061ab0833fa05f6cbbd8a7fa7fb53c0e952a9129276b2ffe8925ac5ae07b3de0bb120d58df771d66b6d259d4f4dd1244b72755b85f297f52c SHA512 b4cea412393ecfc62ffe776bce22ce09a69222efdfa181d3bab35a47b141df92c19dd5cec549769b55052a357c7e6587dd33d0956cb5de35f011f360284a9b28
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch
new file mode 100644
index 000000000000..fda6c253c2e6
--- /dev/null
+++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ cmake_minimum_required ( VERSION 2.8 )
+ include ( cmake/dist.cmake )
+ 
+-find_package ( Lua REQUIRED )
++find_package ( Lua ${LUA_VERSION} EXACT REQUIRED )
+ include_directories ( include src/lib ${LUA_INCLUDE_DIR} )
+ 
+ # Build lib
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
new file mode 100644
index 000000000000..ab25d1fac8dc
--- /dev/null
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Newer Lua versions are NOT supported, see Bug #508222
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single
+
+MY_PN=${PN/pp/++}
+COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887"
+
+DESCRIPTION="A tool to integrate C/C++ code with Lua"
+HOMEPAGE="https://github.com/LuaDist/toluapp"
+SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
+	"${FILESDIR}"/${PN}-1.0.93_p20190513-lua-version.patch
+)
+CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+	)
+	cmake_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-lua
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)