gentoo Easter resync : 12.04.2020

39 files changed, 791 insertions, 22 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index dc9361a538a7..b8da88994b3b 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 496cb68a057b..3a82a0ce11a2 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,5 +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_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
new file mode 100644
index 000000000000..72b120bd9650
--- /dev/null
+++ b/dev-lua/busted/busted-2.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Elegant Lua unit testing"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:=
+	>=dev-lua/lua_cliargs-3.0
+	>=dev-lua/luafilesystem-1.5.0
+	>=dev-lua/luasystem-0.2.0
+	>=dev-lua/dkjson-2.1.0
+	>=dev-lua/say-1.3
+	>=dev-lua/luassert-1.7.8
+	>=dev-lua/lua-term-0.1_p1
+	>=dev-lua/penlight-1.3.2
+	>=dev-lua/mediator_lua-1.1.1_p0
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		>=dev-lua/busted-2.0.0
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	busted ./spec || die
+}
+
+src_install() {
+	dobin bin/busted
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+	doins -r busted/*
+	dodoc *.md
+}
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index c7c242bd369c..52f8646f14ce 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -2,6 +2,6 @@ AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca76
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.1.ebuild 1246 BLAKE2B 3bd53964f81605c56758395984aaaf815a50bef2e03346a5dc658ac46d98d76c16f18df8af7a2224995206d49397cff0281b750a6b1aabc90a8e40ae2497cc06 SHA512 5a364050082fba5a1e1aa598d0892cbbe915b540981d99807b461346f98671ad8707286467243cc1f1f04014d455df747891dc23376e4ecabd13fc4408e6d0b5
+EBUILD lpeg-1.0.1.ebuild 1250 BLAKE2B 1b3499dae04f7ef7a50b829b0afc779a22d95ad4fa62b5142b6d68d6d5788104185428a7e92608cc9cc4e9f9d551788e785d70b12a94650cb2184d75909899ce SHA512 30a851b9e817604f0e263eaab05cf340626407830a63bb8d952b92901b7d592008957e0aecc7e7b5c293b6e0047f726dfbe70f4d3bf2d4d5b56db8b4047dbb57
 EBUILD lpeg-1.0.2.ebuild 1241 BLAKE2B 8ca6008090465d46fb8946c2d0d8d1e122014683afa756dccd4d16cbc4ea4455f3da24708598126e9bc4955274b18be200e01e4ae93ff5e98ffed15dbf30fc45 SHA512 b253d69d8ab5919e05f501194897ab4f78609bed58764953c31d32b69854445254099b00446461ba888acbe599a24a011722d1c70ce6e21b80554e9934c26b52
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
index 1578b536ade8..bf680aafc2a2 100644
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="debug doc luajit"
 
 RDEPEND="
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
new file mode 100644
index 000000000000..01bbd22699b5
--- /dev/null
+++ b/dev-lua/lua-argparse/Manifest
@@ -0,0 +1,3 @@
+DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
+EBUILD lua-argparse-0.6.0-r1.ebuild 1129 BLAKE2B 00ab2b3e17a029874aaba896c2231920ff06d6874d2d1f15636b583e4da33c39cc7b3cf37d6c8f50125dd31e2883308ba5f0722e989b162048db3db4224e233a SHA512 8c409d0c24e2e4ab25217da10c47d0614479c2bc99a0a3eb261982589a22811a66fc6f4cecde9dc19f195d2329089654df39d462fcf6dd536475a6ac73d020b4
+MISC metadata.xml 751 BLAKE2B f75d9b07c3ed56932062de304c0df556f31d34afb4254705acda96ff7c535fe8c85c0740c4cb704eee552d53a1dde6f5d9810e132ca17df4edd619992f055d6b SHA512 7e797e99ee38995fb576f7270fcf69d736195809a1e55a4f09364ad6a4a2dbd2614aba7c5823e70716e0ef81021d020ee0d56927f9ea85b08163ff9554faccac
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..daa669b32c0f
--- /dev/null
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Command line argument parser for the Lua Programming Language"
+HOMEPAGE="https://github.com/mpeterv/argparse"
+SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="doc luajit test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:=
+	luajit? ( dev-lang/luajit:2 )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		dev-lua/busted
+	)"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN//lua-/}-${PV}"
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+		rm -rf "${S}"/html/{.doctrees,_sources} || die
+	fi
+}
+
+src_test() {
+	busted -o gtest --exclude-tags="unsafe" || die
+}
+
+src_install() {
+	use doc && local -a HTML_DOCS=( html/. )
+	local -a DOCS=( README.md CHANGELOG.md )
+	einstalldocs
+
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+
+	insinto "${instdir#${EPREFIX}}"
+	doins src/argparse.lua
+}
diff --git a/dev-lua/lua-argparse/metadata.xml b/dev-lua/lua-argparse/metadata.xml
new file mode 100644
index 000000000000..3af620136775
--- /dev/null
+++ b/dev-lua/lua-argparse/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Argparse is a feature-rich command line parser for Lua inspired by argparse for Python.
+
+		Argparse supports positional arguments, options, flags, optional arguments, subcommands
+		and more. Argparse automatically generates usage, help and error messages.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mpeterv/argparse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index 011a1985aab3..b51de4a48e97 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..e9c4c9e672c7
--- /dev/null
+++ b/dev-lua/lua-term/lua-term-0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Yes, upstream used different version numbers.
+# The rockspec version number is 0.7, but the version associated with
+# the tarball is 0.07.
+MY_PV=0.07
+
+DESCRIPTION="Terminal functions for Lua"
+HOMEPAGE="https://github.com/hoelzro/lua-term"
+SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
+		-o core.so core.c"
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
+		-o core.so core.c || die
+}
+
+src_install() {
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/term
+	doexe core.so
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r term
+}
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
new file mode 100644
index 000000000000..fd401294695f
--- /dev/null
+++ b/dev-lua/lua-utf8/Manifest
@@ -0,0 +1,4 @@
+AUX lua-utf8.Makefile 1099 BLAKE2B 5a704cb815f41cee6a5d681ec80f9c3ceab97c6711fddcd91581aaa39d033a418bccc0c59e1c41c1d7f5ada1b85615566d3443f2dcf02e57c8dec88c5480fe41 SHA512 f7a2b59c22cd92b7560a24ac469ffdd24641ab9907c26a8c22d944e75f26b3fe2d80298d70138fd6bdfc5da7a87b1a52cb7243106b47f6daebb237a17fdb06f4
+DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B 99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471 SHA512 e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897
+EBUILD lua-utf8-0.1.1.ebuild 1029 BLAKE2B 479407b8397e0894446a08a9a484a9cdd0fa81485f060088a09011118441c606ebbc47f8f76eccd37f672f5f66146e6dbd4eaac9d08a6dfeb120768bc72e3c3a SHA512 f62e7fa5253d94fbbf016092f0b8f146de112fd7641e0c85273c890681a73cd19d94557f90f5e74b43a13a03180ba82bd36a321724a0723ae78e25d38d703b90
+MISC metadata.xml 639 BLAKE2B eaf42f0f69767063b2e0c4745bd49529dbe1c8edd62dc22422a1af9363321f610625ad138f6a7a6828ebdfef0ade15577ed062f4de2817d99dfc2864c305ae09 SHA512 785c2139f6715e4b177d1d97f7ec13988f59af95461af9400e6085388cac83fcb99e3eb65cbf47449be9ff60ee4d0662316ea82b5fb761a22b3d8207b27b465f
diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile b/dev-lua/lua-utf8/files/lua-utf8.Makefile
new file mode 100644
index 000000000000..456c52f4aaa0
--- /dev/null
+++ b/dev-lua/lua-utf8/files/lua-utf8.Makefile
@@ -0,0 +1,42 @@
+# this file builds lua-utf8
+
+MY_USE_LUA?=luajit
+PKG_CONFIG?=pkg-config
+PREFIX?=/usr/local
+DESTDIR?=/
+
+LUA_LIBDIR      := $(shell $(PKG_CONFIG) --variable INSTALL_CMOD $(MY_USE_LUA))
+LUA_INC         := $(shell $(PKG_CONFIG) --variable INSTALL_INC $(MY_USE_LUA))
+LUA_SHARE       := $(shell $(PKG_CONFIG) --variable INSTALL_LMOD $(MY_USE_LUA))
+CWARNS          := -Wall -pedantic
+CFLAGS          += -I$(LUA_INC) -fPIC $(CWARNS)
+LIB_OPTION      := -shared
+LDFLAGS         += $(LIB_OPTION)
+
+SONAME          := lua-utf8.so
+SONAMEV         := $(SONAME).0
+LIBRARY         := $(SONAMEV).1.1
+SRC             := lutf8lib.c
+OBJ             := $(patsubst %.c, %.o, $(SRC))
+
+FILES           := parseucd.lua
+
+all: $(LIBRARY) $(SONAMEV) $(SONAME)
+
+$(SONAMEV):
+	ln -s $(LIBRARY) $@
+
+$(SONAME):
+	ln -s $(SONAMEV) $@
+
+$(LIBRARY): $(OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc
+
+install:
+	install -d $(DESTDIR)$(LUA_LIBDIR)
+	install $(SONAME) $(DESTDIR)$(LUA_LIBDIR)
+	install -d $(DESTDIR)$(LUA_SHARE)
+	install --mode=0444 $(FILES) $(DESTDIR)$(LUA_SHARE)
+
+clean:
+	rm -rf $(LIBRARY) $(SONAMEV) $(SONAME) *.o
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
new file mode 100644
index 000000000000..0b6609140168
--- /dev/null
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="UTF-8 support for Lua"
+HOMEPAGE="https://github.com/starwing/luautf8"
+SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="luajit test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN//-/}-${PV}"
+
+src_prepare() {
+	default
+
+	cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" install
+	einstalldocs
+}
+
+src_test() {
+	LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die
+}
diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml
new file mode 100644
index 000000000000..efc3ff445600
--- /dev/null
+++ b/dev-lua/lua-utf8/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		This module adds UTF-8 support to Lua.
+
+		It use data extracted from Unicode Character Database, and tested on Lua 5.2.3, Lua 5.3.0 and LuaJIT.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">starwing/luautf8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index 93c585f184cf..b51000ada0a4 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -1,5 +1,7 @@
 DIST lua_cliargs-2.5_p5.tar.gz 19513 BLAKE2B 25cdfd9e96fd0cf5d600394c47ec53dd80e619dac8a37a40e22366e1090ffc9f9f250d71683140959fbd33b3983a759c931c3ac70a3f14e9556005fe5f82f72c SHA512 7c4d490f5d86b07bdf299c976b99bf83c9ba86fabeb321f348587f8ad207983292e3e9268ef72f3cc6ff9d6e32a43669de1d3c21c47499852f971c2cc2a4e746
 DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd3678277e11b6218d56ae38e4678dd48472d65dd959b59bb44d5c42c1e64697fe4e54b67e80933ab706d9d2b01c79f SHA512 2bdcd3c790a82351df598cb3d289de980fe771222ebd9715036678eecdbe51b7563d24629afa4d286b900d722bf844004d12f2330744a1e644d9286ac44b4dbe
+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
 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
new file mode 100644
index 000000000000..b124dace5b77
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Below is the upstream package version.
+# The final component of the version number has been mapped to the _px
+# component of the version number in portage so should be kept in sync.
+MY_PV="3.0-2"
+
+DESCRIPTION="A command-line argument parser."
+HOMEPAGE="https://github.com/amireh/lua_cliargs"
+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"
+IUSE="doc"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=dev-lang/lua-5.1:="
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r src/cliargs.lua src/cliargs
+
+	if use doc; then
+		local HTML_DOCS=( doc/. )
+		dodoc -r examples
+	fi
+
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 94ad3b13c58f..adc5f22a1ae9 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,3 +1,5 @@
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
+DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
 EBUILD luacheck-0.20.0.ebuild 1054 BLAKE2B 3e5aa98c7f3953c831904625dcbcaa24b662620b57a04f85d03c189330f44e305c33b578320aecefd1cd4fdd1aa70fbb839a8f7fbcb563bec6e4be77cb02adff SHA512 3e5c5bb402eb22c464c1d080f23dac3952bd5fbbcb7a21747badf01fb274295059c39ea33f560636be0100dca2fb55cfbdeff8d04703df9eb52c3264ba003834
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD luacheck-0.23.0.ebuild 1154 BLAKE2B a3c0cd37f1d390749752d5bb24302ea1194e64c7de1e338bbefa35b18b543a61605cdfbf70a04f90e3b28f5bfa4c02ce2f5dcf232f6cd500cfbb492c34213fe2 SHA512 ea4ca844a4bc2aae637793045957025d14a23ad3aeb708c3885e340770fa9a54db98d251ea8e5c02050e22670b8bb97f1331b3c3c4e746f9b43f1f01cb3b24ee
+MISC metadata.xml 718 BLAKE2B 6fa684f1c29b7ce764e08e6643404e461bb2def6a4e08bca778f81798147de4d1c924038d8a824276623aff9a34a5cd17c7296ccb2d3a57b5d1fe2cc1252bbb9 SHA512 2fe325b68e5bbf2977f1d6dc956080815b7cfcc54105f4138780394592f93c0b490ad21dce68cddbbb7678a62e8a79fda9795e1652e4ee72acdfd5a6650efe46
diff --git a/dev-lua/luacheck/luacheck-0.23.0.ebuild b/dev-lua/luacheck/luacheck-0.23.0.ebuild
new file mode 100644
index 000000000000..a81865ebd13b
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.23.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/mpeterv/luacheck"
+SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="doc luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lua/lua-argparse[luajit=]
+	dev-lua/luafilesystem[luajit(-)=]
+	dev-lua/lua-utf8[luajit=]
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		dev-lua/busted
+	)"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+	fi
+}
+
+src_test() {
+	busted -o gtest || die
+}
+
+src_install() {
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	insinto "${instdir#${EPREFIX}}"
+	doins -r src/luacheck
+
+	newbin bin/luacheck.lua luacheck
+
+	use doc && local HTML_DOCS=( html/. )
+
+	local -a DOCS=( CHANGELOG.md LICENSE README.md )
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index 585b0dc75dda..dcba9d1f5774 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		A tool for linting and static analysis of Lua code.
+
+		Luacheck supports checking Lua files using syntax of Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT. Luacheck itself is written in Lua and runs on all of mentioned Lua versions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mpeterv/luacheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 70ab53167131..3b10740a6302 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,7 +1,9 @@
 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
-MISC metadata.xml 469 BLAKE2B 152af3a7142706f25a8cb2f934d4864f8f907103e059d4871301c14ede3b3e7e226e3bccfe317b2bb196435f732156417542f925c66452a376fc6d6e7878ed76 SHA512 32e03c96130bd280f2ef80fcd75c3c1b9a00588f0bef02512c46475d1b49c09b4fff51601756cf2883fd085b370f532145f07975f566e8b7f77669c9a9f42ea5
+EBUILD luafilesystem-1.7.0.2.ebuild 1679 BLAKE2B 4761eec2bc6e02da04a3592dde6a78e599e01c8def3bf03cdd208993da4e98a0a52593f2aef9149621d81ae68d1c97c973d4e7ad6c233dc069cec9af5989fa5c SHA512 6f62c00a21353984f6d7c390fe65a550829fd02a702ccd6163164abce97c6b90fc11743b72bf3058140e9d5bce3d2c622a5fa714ddf723ed519c6812cedb107f
+MISC metadata.xml 757 BLAKE2B 078885172ec5e45e79fecdee8232357edb9f381b990aca6d29ec54ef49bb7de2d7359399536e38195293658568dd647c0b2d1129003bb901e59708dd25d804d2 SHA512 188f7d27fad84637eac606ffe476aa605e8f7c9ceb8dcae1783547b406d97fac171de90db695ba869671dfda245a9bc3494b26d1191a5f50c3e91918b41499a9
diff --git a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
new file mode 100644
index 000000000000..88b4ef4b5a98
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
@@ -0,0 +1,66 @@
+# 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/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index dc620825e440..9e9cb608e469 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<longdescription lang="en">
 		LuaFileSystem is a Lua library developed to complement the set of functions
 		related to file systems offered by the standard Lua distribution.
@@ -9,4 +16,7 @@
 		LuaFileSystem offers a portable way to access the underlying directory
 		structure and file attributes.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">keplerproject/luafilesystem</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 044f6e1efd8c..5d299a878c85 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,3 +1,7 @@
 DIST luarocks-2.2.0.tar.gz 111549 BLAKE2B 214c1c03e03f95ca1acfc1fda863895c91c508221c615fe3ccc064e9adbcaa8549d24ff788141c0093259ca52578fadccfb3f6891209f86336c57937ac5ec32d SHA512 41f32e383263485758e64df661ecfbd744369035362755c64466f2c52a8740ed941b80cab3212222d7d24e4b1a7ed9ccb84fa66c8e458526056af0b06d97224f
+DIST luarocks-3.2.1.tar.gz 232149 BLAKE2B f8298ef054f50b8f70bf48748435a54f683ba8eef3113641e98b00e1aa872b95e75b36f0df96de7870d3576d3b9149dde8af1b68a3d7ceda86d3654dbad507c0 SHA512 9abf2c5477b9ab8e3caf485dd10fc154435b41efc13c7709f36a9182ccbd98d022738627f76901977a9b7c42ae61e5f139e78070d469094a7571910afbb747ff
+DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
 EBUILD luarocks-2.2.0.ebuild 1220 BLAKE2B 0ca8c9c627287a0f8e6da220ad362a7f8b812d78c2b757459001a14cbad6b3b0b2ecd2625be3be316e39aa4be7a860d76c9b220048ca1b0dfb20acc9a39c2f22 SHA512 88849c9c84375a188fb6c94d1d09519f0f695ea1284c7247ea69d7faca042aea16a7d7cc776db9c90e1d8ae24f6fa8905924e32917b3cc49f9b6eadae922588f
-MISC metadata.xml 430 BLAKE2B e62f93589ced22a63f66c525fce2477693ad711a1baedcca41b95bb1a3f60fb49b81058671264fad4c827ff2737a6e0896dd130c4622c6f83ff3b14ee4090228 SHA512 501e7bcaa0b14bd33f64852d35a3dfc461b5dc57647ae2d796ed3288edf8440b26e18e805b72265c5c02640e03d7f97d0bd63ba8e099a51604db9d916d269d59
+EBUILD luarocks-3.2.1.ebuild 898 BLAKE2B cc809c35dcddfd9e7b8a684f8ead406129f1a5ed989352f916c71e2ce14fd81fde69dd1d292eea657d128848f5bf521846e6122d8313551e0a845bb47066571e SHA512 2cbe3f8f7736b94053b53dc59a3db6fc18742ac8f3d472f58ede37b67eb7475958e01f0612db5b3b68d0370dce13029c4be20679d7c1b8c2e4bda9a762bccb9c
+EBUILD luarocks-3.3.1.ebuild 898 BLAKE2B cc809c35dcddfd9e7b8a684f8ead406129f1a5ed989352f916c71e2ce14fd81fde69dd1d292eea657d128848f5bf521846e6122d8313551e0a845bb47066571e SHA512 2cbe3f8f7736b94053b53dc59a3db6fc18742ac8f3d472f58ede37b67eb7475958e01f0612db5b3b68d0370dce13029c4be20679d7c1b8c2e4bda9a762bccb9c
+MISC metadata.xml 863 BLAKE2B 6ae628676393509ea3ea05922a4296a2df5ecd22ab21028cb83dfa8aa78c3d461fa2058c01b5c27e35a1069c913e64fcc478f27d826ef0692bcdcb3775470436 SHA512 c8b868cd8e23dd41c772da7f5f80fbde1bc309153ffc2772dc1483c8b50bb4a4b1db320df8cd27c63843a38a37273464fa0de9724eaee9def09a2347cde1de85
diff --git a/dev-lua/luarocks/luarocks-3.2.1.ebuild b/dev-lua/luarocks/luarocks-3.2.1.ebuild
new file mode 100644
index 000000000000..7607520b4826
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A deployment and management system for Lua modules"
+HOMEPAGE="http://www.luarocks.org"
+SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+
+DEPEND="dev-lang/lua:="
+RDEPEND="${DEPEND}
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix="${EPRIFIX}/usr" \
+			--with-lua-lib="${EPRIFIX}/usr/$(get_libdir)" \
+			--rocks-tree="${EPRIFIX}/usr/$(get_libdir)/lua/luarocks" \
+			|| die "configure failed"
+}
+
+src_install() {
+	default
+	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die "sed failed"
+}
diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild
new file mode 100644
index 000000000000..7607520b4826
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A deployment and management system for Lua modules"
+HOMEPAGE="http://www.luarocks.org"
+SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+
+DEPEND="dev-lang/lua:="
+RDEPEND="${DEPEND}
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix="${EPRIFIX}/usr" \
+			--with-lua-lib="${EPRIFIX}/usr/$(get_libdir)" \
+			--rocks-tree="${EPRIFIX}/usr/$(get_libdir)/lua/luarocks" \
+			|| die "configure failed"
+}
+
+src_install() {
+	default
+	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die "sed failed"
+}
diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
index eb1224dd6d97..da075190f828 100644
--- a/dev-lua/luarocks/metadata.xml
+++ b/dev-lua/luarocks/metadata.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="curl">Uses <pkg>net-misc/curl</pkg> for fetching lua
-      packages instead of <pkg>net-misc/wget</pkg>.</flag>
-    <flag name="openssl">Uses <pkg>dev-libs/openssl</pkg> for verifying lua
-      packages instead of md5sum.</flag>
-  </use>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="curl">Uses <pkg>net-misc/curl</pkg> for fetching lua
+			packages instead of <pkg>net-misc/wget</pkg>.</flag>
+		<flag name="openssl">Uses <pkg>dev-libs/openssl</pkg> for verifying lua
+			packages instead of md5sum.</flag>
+	</use>
+	<longdescription lang="en">
+		Package manager for Lua.
+
+		It allows you to create and install Lua modules as self-contained packages called rocks.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">luarocks/luarocks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index 9a6c67db2be0..aaebc89d9e46 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,5 +1,7 @@
 DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05
 DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b
+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
 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
new file mode 100644
index 000000000000..a0544d7aa066
--- /dev/null
+++ b/dev-lua/luassert/luassert-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua Assertions Extension"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="luajit test"
+RESTRICT="test" # Requires same version to be installed or busted will fail.
+
+RDEPEND="
+	>=dev-lua/say-1.3_p1[luajit(-)=]
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-lua/busted
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+src_test() {
+	busted -o gtest || die
+}
+
+src_install() {
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN}
+	insinto "${instdir#${EPREFIX}}"
+	doins -r src/*
+	local -a DOCS=( CONTRIBUTING.md LICENSE README.md )
+	einstalldocs
+}
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index f7ed681e1de3..bcfb02a3a9f3 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,4 +1,7 @@
 AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990491da070a6ff24a78c6eb1bb86ac583e93a32c4576b956fd06836e0088dafcffba155ae254eb3273230bf84cfaa90e70464d45 SHA512 7123c427527788034cd2a5f759f5924bd00dc2ca7a2071d986152f535a4da641887e75131ae7d6afe39d82b4c71c84796cf52a451603db50a21ad99f061c746e
+AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de832d611e851bbe8c8edb7c1861c43b5496d47306a2f61d29087b83a0b8d87ecb2731572c2c3d149a19000c7173161bd0f326fd SHA512 980ee1089e4b2b45c54e0ac953bb441e5c31164417e64dbf3fd8f75010d50ddda84572fa0b8ed6101f1924a96a64de0ce31d4e24cf69f9f15d5c59b8f5ef8e3e
 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
-MISC metadata.xml 331 BLAKE2B 8878c677de3e97ca867c0acff719fa5c949149e77f09649e4792927f33abdc971156809f0f1cec4caae2e619dec8f686c92cfade7a4fc12bc5b575305533a6f0 SHA512 f597f3af9c0e0422e49e8da76ecbb645b02cf6b0dd2ff3420c8923aaa173160610a9edd8f7aa5411479e1c1c2e2805f9e5a36b637e3fc42d2b48caf9033796aa
+EBUILD luasystem-0.2.1_p0.ebuild 1187 BLAKE2B 7cd1eecd647d22155c86d0be478a29d402fc26ef5b168d13bfeb473e19a3c0ce1a3b39e786c2e94bae120422645ae751da576cd8650466ff531f3651f9fd6eaf SHA512 8f834985e3f24324aa39cca786e4c664686369044c94786c901d27328254816ecf06e7c4cd249350eac30ab2c6e22777e6fa604e0858a89de98a186e7e373834
+MISC metadata.xml 490 BLAKE2B 59d66fdd8685e01d7b7e928ebb0e43c111062bd7c43ddbbfa070b5af4a5bbc9db1031d0b95f56a05c1b39c35c7aa148e86e6d3761cfc193c5baa6ddffad68639 SHA512 bb9b143436c281ca2664b17b1d1c31ba46befb1139ebd62213dba66003dba43f9d769b65ff8954307faa40690bb31ca7b617628b2feb7c755759b642fc3699ab
diff --git a/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch
new file mode 100644
index 000000000000..373ef95c42fa
--- /dev/null
+++ b/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch
@@ -0,0 +1,33 @@
+diff --git a/src/Makefile b/src/Makefile
+index 10fc31a..af5e4e4 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -144,8 +144,8 @@ O_linux=o
+ CC_linux=gcc
+ DEF_linux=
+ CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
+-LDFLAGS_linux=-lrt -O -shared -fpic -o
++	-Wimplicit -fpic -fvisibility=hidden
++LDFLAGS_linux=-lrt -shared -fpic -o
+ LD_linux=gcc
+
+ #------
+@@ -208,7 +208,7 @@ SOLIB=core.$(SO)
+ #
+ CC=$(CC_$(PLAT))
+ DEF=$(DEF_$(PLAT))
+-CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
++CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
+ LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
+ LD=$(LD_$(PLAT))
+ LUAINC= $(LUAINC_$(PLAT))
+@@ -248,7 +248,7 @@ none:
+ all: $(SOLIB)
+
+ $(SOLIB): $(OBJS)
+-	$(LD) $(OBJS) $(LDFLAGS)$@
++	$(LD) $(OBJS) $(LDFLAGS) $@
+
+ install: all
+	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
new file mode 100644
index 000000000000..416161626135
--- /dev/null
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# The below is the upstream version number. The -x suffix should be kept
+# in sync with the _px suffix in the ebuild version.
+MY_PV="0.2.1-0"
+
+DESCRIPTION="platform independent system calls for lua"
+HOMEPAGE="https://github.com/LuaDist2/luasystem"
+SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
+	${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="luajit test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-lua/busted
+	)"
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
+
+src_test() {
+	busted -o gtest || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \
+		LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r system
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system
+	doexe src/core.so
+	einstalldocs
+}
diff --git a/dev-lua/luasystem/metadata.xml b/dev-lua/luasystem/metadata.xml
index 8ee365e7918b..009738e31d63 100644
--- a/dev-lua/luasystem/metadata.xml
+++ b/dev-lua/luasystem/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<longdescription lang="en">
+		luasystem is a platform independent system call library for Lua.
+		Supports Lua >= 5.1 and luajit >= 2.0.0.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">LuaDist2/luasystem</remote-id>
 	</upstream>
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 920d3ecbcc35..72663ec32b4d 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,4 +1,4 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
-EBUILD lutok-0.4-r1.ebuild 757 BLAKE2B 17a6fbd9796efa705bbafe8cd2dfc06edd2312c9369925548d7de75bbafb3127f7014610ce9aed244b061203ffd8bb1091f2a9ace01db91d8e53a51659bde9d1 SHA512 a59bba0d949b89b5daaefb596614334e4f6b09857649969de13110a168eb1dd70734677c3840fee876fca72d8334320f38200df96c124151f707dac9e3e8b989
-EBUILD lutok-0.4-r2.ebuild 751 BLAKE2B bec9e8cf4f352c34bf97509364c51a68ccacc49b33c52b2e4c90964f90b736ca2c0591f556868f5c1e4c5dfb205be340fe6cd3381d01da0e63a99561b29992a1 SHA512 19bc2d4ccb72267b2a8c44cf9a66b9d81db5db49f37135636d8ef354890fb064eb28429833ff828cdad1f8521e7e210140b0d0e1116bff589d8ab64918b1769e
+EBUILD lutok-0.4-r1.ebuild 754 BLAKE2B 3fe886271f7515a575d95112777472c40b32f700ae0191e6d284f8ba767567c4c8dc4ad155ed4e25474a71b73554ffed6127bdb102df3706a1121d987595df13 SHA512 a003eb9cb09759e8a467cf926e441e2583a78d730cfbe35d0dba66f64970a46928ff608a522b45c6bab0e2974bec7cc901a875f4f2465f1fec445bbb203c96ba
+EBUILD lutok-0.4-r2.ebuild 747 BLAKE2B f03e0d91b3e0da4ce393ac38dac3f2e15bf7227bc1ae937444c292bdaa4dae0a98901e8eafe76300b795868d19e93fc799dcf9e6088dfa13ea9bc46f75f04808 SHA512 58c525bd404456ddf9fc188e42dd133966a8ca9b1f0c902a79a7f75c9530530e477d44865d028c38f5c2ea7cb8af20b12e21dd14c14d35edda25b5eda2e44b2f
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index 32250c1a373b..1fcf61cf71a2 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/lutok/lutok-0.4-r2.ebuild b/dev-lua/lutok/lutok-0.4-r2.ebuild
index 104c598e5077..42aefd393be6 100644
--- a/dev-lua/lutok/lutok-0.4-r2.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r2.ebuild
@@ -9,7 +9,7 @@ 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 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index da49bc141ee4..86235dd25c24 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,3 +1,7 @@
 DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02
+DIST penlight-1.5.4.tar.gz 213938 BLAKE2B c6bba4fd7fc491d2e6ca464f71b897ba4b5dc8dc94e7340fd77d3add47a9b4a72ce48cea268f94fe55c2aef1edd850f96f00f2ba1ef7186e1e8d86a4e3155366 SHA512 c46e7875410a90390bfbf010a53f1d536475e2094668722618d03951caad0fcb0674c9bc7119a0753e4ed3df9e4d70fef828ba4c6c24e8ada4036948d2432519
+DIST penlight-1.7.0.tar.gz 384917 BLAKE2B 153660f5029509611265399aad8b92d82b266ac470414c06e9d7f01b37225834f98488f30f9bbdfdc3a6714edfe2edc0fccd0356ebb966d964be633bff38eb25 SHA512 edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d
 EBUILD penlight-1.3.2.ebuild 653 BLAKE2B ff029eaaf0cb3d19c04840e8cf4fe05b6456e8467a2c5452ed2064d5c4ebe7e14418d2f1ec349729ac6733e212f5b8030d27e25c289fad72a03cf5c8c2a6a39f SHA512 14aaea5b639507e25b2ebe5eba54aa10e268cd9147961e03219e389ee11b64c71a65650c719062f617335fb0a42d9defebda748b59da057e5321b29eea744db3
-MISC metadata.xml 523 BLAKE2B c9b7340d34bfa27978dfedde2becbb1ea65d911986be0868c76d16796285be730c073da63cd05e46d7ec58af155a09cd6fe635360324a8e252210eb47e3097a7 SHA512 c4a0a69c82dc2dfe49d9f5145847e952f466fd6254baef24f20cd122137071c5731643202bc7bfbb20934ae955454d077fdd74eb30f9d14f67823eec8b089cbc
+EBUILD penlight-1.5.4.ebuild 756 BLAKE2B d598d38a6ea20256a2bda11b68a5568d476c4d030132c290ebd3678f3a55c8b5ba4a5b9b20caca1f2e8714c440d59a9aa6567fe2d2dc7fa105764c5de9b4aa13 SHA512 f5c135d7d71145dc50075782afe4a70c148e1094d0b86e7ecf1fbfa26592704dc6503d9f96a8797e8fbd48e4619065965a932c49d40adc3eb1c1939e931fb9fc
+EBUILD penlight-1.7.0.ebuild 753 BLAKE2B 03623c6396462eae88caf61801d2cdbe2a47716254754e536511ac62c69ac4d6e081c15bae0277c90a530e8d50b9f54a546579762a4cc46106d7869d19191532 SHA512 5e3cebbb10fd3e75bbc3394c8fec42ff94e142cb7dc41d76eb4bb028709a1d00c46628942c57168697241ed42a65e0614820315e83bdfacc417ff2364ae4c4a1
+MISC metadata.xml 603 BLAKE2B 98847845a10c23006c481f3447fb3439d4c9e1223770455a0eb5d0051d609b48ab51ad274ba4d6ae8249ecc0ed38ff6b33be0b7a7b4ba5dddb6cb6a59df33b23 SHA512 540eed16b3e9223e2ee5181a0ca9cbb794bba41b6f5c5979d9f4796c9382ec24573e05aed2535665b83337e84fbd08b4da1c77ee3bf24f7e1b2bd58e2810f28f
diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml
index 8fc3b6a3bf44..2d40d2a40111 100644
--- a/dev-lua/penlight/metadata.xml
+++ b/dev-lua/penlight/metadata.xml
@@ -11,4 +11,7 @@
 		configuration files and the like. Provides functional operations
 		on tables and sequences.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">Tieske/Penlight</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/penlight/penlight-1.5.4.ebuild b/dev-lua/penlight/penlight-1.5.4.ebuild
new file mode 100644
index 000000000000..4b6e900613f6
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.5.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="http://stevedonovan.github.com/Penlight",
+SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-lang/lua-5.1:=
+	dev-lua/luafilesystem"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN//penlight/Penlight}-${PV}"
+
+src_install() {
+	local -a DOCS=( README.md CHANGES.md LICENSE.md CONTRIBUTING.md )
+	einstalldocs
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r lua/pl
+}
diff --git a/dev-lua/penlight/penlight-1.7.0.ebuild b/dev-lua/penlight/penlight-1.7.0.ebuild
new file mode 100644
index 000000000000..1036bea9323e
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="https://github.com/Tieske/Penlight",
+SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-lang/lua-5.1:=
+	dev-lua/luafilesystem"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN//penlight/Penlight}-${PV}"
+
+src_install() {
+	local -a DOCS=( README.md CHANGELOG.md LICENSE.md CONTRIBUTING.md )
+	einstalldocs
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r lua/pl
+}