gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-lua
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
204 files changed, 3473 insertions, 728 deletions
diff --git a/dev-lua/LuaBitOp-1.0.1-r1 b/dev-lua/LuaBitOp-1.0.1-r1
deleted file mode 100644
index 15ad4be69218..000000000000
--- a/dev-lua/LuaBitOp-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND==dev-lang/lua-5.1*
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=http://bitop.luajit.org
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==dev-lang/lua-5.1*
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=595bc7781ba09d9c480f4194c1141ed8
diff --git a/dev-lua/LuaBitOp-1.0.2 b/dev-lua/LuaBitOp-1.0.2
deleted file mode 100644
index 7110f0ce392a..000000000000
--- a/dev-lua/LuaBitOp-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/lua virtual/pkgconfig
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=http://bitop.luajit.org
-KEYWORDS=amd64 ~arm hppa ~mips x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=339b6875e957827d32cf541068010404
diff --git a/dev-lua/LuaBitOp-1.0.2-r1 b/dev-lua/LuaBitOp-1.0.2-r1
deleted file mode 100644
index 5226f687ec33..000000000000
--- a/dev-lua/LuaBitOp-1.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=http://bitop.luajit.org
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b867f76a388f22900bd288c9a07df6e0
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..78892a01833e
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils multilib
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="http://bitop.luajit.org"
+SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-lang/lua-5.1*"
+RDEPEND="${DEPEND}"
+
+src_prepare()
+{
+	sed -i \
+		-e '/^CFLAGS.*=/s/=/ +=/' \
+		-e '/^CFLAGS/s/-O2 -fomit-frame-pointer //' \
+		Makefile || die "sed failed"
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+}
+
+src_compile()
+{
+	emake CC="$(tc-getCC)"
+}
+
+src_test()
+{
+	make test
+}
+
+src_install()
+{
+	exeinto /usr/$(get_libdir)/lua/5.1
+doexe bit.so
+	dohtml -r doc/*
+}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..59c3d41f14f4
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="http://bitop.luajit.org"
+SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile()
+{
+	emake CC="$(tc-getCC)" INCLUDES= CCOPT=
+}
+
+multilib_src_test() {
+	# tests use native lua interpreter
+	multilib_is_native_abi && default
+}
+
+multilib_src_install()
+{
+	local instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe bit.so
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml -r doc/.
+}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
new file mode 100644
index 000000000000..66d3e88a1af1
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit toolchain-funcs
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="http://bitop.luajit.org"
+SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~mips x86"
+IUSE=""
+
+RDEPEND="dev-lang/lua"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile()
+{
+	emake CC="$(tc-getCC)" INCLUDES= CCOPT=
+}
+
+src_install()
+{
+	exeinto "$(pkg-config --variable INSTALL_CMOD lua)"
+	doexe bit.so
+
+	dodoc README
+	dohtml -r doc/*
+}
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
new file mode 100644
index 000000000000..88467ede001a
--- /dev/null
+++ b/dev-lua/LuaBitOp/Manifest
@@ -0,0 +1,7 @@
+AUX LuaBitOp-ldflags.patch 376 BLAKE2B f1681d7c9b403a31bc687d93e700ec160cc474064da6cfbc33b4aaccbec3856dfa1b4103d32253a54c6a379676d9f4a79a24225dfe8c602e0614cab1d518e42f SHA512 14b779c738dff2413d3b658c6861de02afd4cf577e7fd95b72af4d58240ed406d9727e1fb47d2ccce4d783fd2aeb576770790c85625935723da15d5c18a486c1
+DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e
+DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
+EBUILD LuaBitOp-1.0.1-r1.ebuild 741 BLAKE2B f30f2071fab3726dfb6b304b60e683fe5497c8106db3a727874d8959b10e7e6e12789dec3cb8eb722e22ce6a8b3033567f790a614f329c6a00341ea83bf4d8cb SHA512 609d1b86bf6fc402f89eac77e9980c093a4f9ae56ef2bdccecc554c66b30e0275aa0d68eb6c47b5277ef564546350e4cd57f2ccfdfd1eb9d6350741651528637
+EBUILD LuaBitOp-1.0.2-r1.ebuild 948 BLAKE2B 24da145c76160ab0c62151b990ebedb9387b96073a3ead9860cabddc834269763668094c52854c2555f3eeda57e06b143113ebf84c0ce12d239c5d359e2552c9 SHA512 88c7eeed78a6230c1c46678bf7317c0875a2772d3dcb38456a8b7e223766145f2f82a8ca6455ab07d48564be9f4bf29041183ccd838ad053ac7af09bf74fd5ef
+EBUILD LuaBitOp-1.0.2.ebuild 612 BLAKE2B 2c019f29af3ae8fd6048a733c48fc768990943b7d1b923c4c2f616a3bb702c24b20d837edf9c52285e76500c0584eecaa6794ef06cb7a7cdac22e1e788c9784f SHA512 12b76d07cb530a957097c3683d30344b657a85855968116af9be39b0317f41e2165d70b399a5eb0dba6fae2a6347043ac8775ee3bd20798c640176a5cf252078
+MISC metadata.xml 383 BLAKE2B 2298e7e7688ded3e292e5b8c2259eb4e451f4002a010686c09b57706f2b98d488938a7cf50c84d7d0af069ed8c8245d63a16a2817c611e18c9f22dfa9365d2e0 SHA512 da16922d2ea545172b8e6b4e92efa3ae9fef4697052c3b21cfe3762f816ecb70c1689fd6b385542393bdc1280cead3b1a19530c5e240f3b2570e062016c1c0f1
diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
new file mode 100644
index 000000000000..2a690cdb5866
--- /dev/null
+++ b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
@@ -0,0 +1,13 @@
+Index: LuaBitOp-1.0.1/Makefile
+===================================================================
+--- LuaBitOp-1.0.1.orig/Makefile
++++ LuaBitOp-1.0.1/Makefile
+@@ -14,7 +14,7 @@ LUA= lua
+ 
+ CC= gcc
+ SOCFLAGS= -fPIC
+-SOCC= $(CC) -shared $(SOCFLAGS)
++SOCC= $(CC) -shared $(SOCFLAGS) $(LDFLAGS)
+ CFLAGS += -Wall $(SOCFLAGS) $(DEFINES) $(INCLUDES)
+ RM= rm -f
+ INSTALL= install -p
diff --git a/dev-lua/LuaBitOp/metadata.xml b/dev-lua/LuaBitOp/metadata.xml
new file mode 100644
index 000000000000..e4f0a6dd481d
--- /dev/null
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a library for the Lua programming language which performs bit
+		operations.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b8c2b4973e86..a3482f37370a 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted-2.0_rc11_p0 b/dev-lua/busted-2.0_rc11_p0
deleted file mode 100644
index 9ed3137b4900..000000000000
--- a/dev-lua/busted-2.0_rc11_p0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Elegant Lua unit testing
-EAPI=5
-HOMEPAGE=http://olivinelabs.com/busted/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:= ~dev-lua/lua_cliargs-2.5_p5 >=dev-lua/luafilesystem-1.5.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 >=dev-lua/luasocket-2.0.1
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.rc11-0.tar.gz -> busted-2.0_rc11_p0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=288d69ba714951577d91a0d44a41c859
diff --git a/dev-lua/busted-2.0_rc12_p1 b/dev-lua/busted-2.0_rc12_p1
deleted file mode 100644
index 9c0a9360a862..000000000000
--- a/dev-lua/busted-2.0_rc12_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Elegant Lua unit testing
-EAPI=6
-HOMEPAGE=http://olivinelabs.com/busted/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-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
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.rc12-1.tar.gz -> busted-2.0_rc12_p1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=924b02fa606a0f81c42409485b875722
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
new file mode 100644
index 000000000000..d3f91a955167
--- /dev/null
+++ b/dev-lua/busted/Manifest
@@ -0,0 +1,5 @@
+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_rc11_p0.ebuild 1021 BLAKE2B 6be1c981d3259907dcbd7878c11f6eeb9894ebddd9eda8559881c087bec7e4a1f7d8016765920148defac4644bef46f82b107b4136866e1377c7465f184431cb SHA512 47e1e443cbce25838a3647d2aadcdf244219abff50be7a4cac51906a65ee8dbe2b122145de4c84cd18384c5aa1c4b818d308bb733a4af77e16bff9cf15b16ffe
+EBUILD busted-2.0_rc12_p1.ebuild 1043 BLAKE2B c94e43194f1ebf6e1768edc8db623b314b59a67778ceaea4b6621602a84c684a23703faf7a1f6894e229b6a5c64eb685583e3dd16d1ba0974ed5c97a7c476206 SHA512 938c7a034c5ea83c332c5a509d0e67f3e496b575236d1e394d6be534d3f8cf28d52a8cd4bf8da84858a8a72098adb38a80ddfa3e0f494f2b3a2cbe846180e687
+MISC metadata.xml 652 BLAKE2B 97daa2438be52bd6aa462673572d6b1efce6331e9dfbfa5d3b2915619661ec2b359c6687c5aa294d66eb089e152e93c24f1c2f00dd8ad9dc9d13934fe8170883 SHA512 7b07510891c5df25357c17f05de4bcbf1ea54f44f9ce06507de70ae9ddd835bfd20d1cb4bd3787ffb9ffeb88b238bc148b5c5ffad7abb1853ed0517b03a7d122
diff --git a/dev-lua/busted/busted-2.0_rc11_p0.ebuild b/dev-lua/busted/busted-2.0_rc11_p0.ebuild
new file mode 100644
index 000000000000..7ad217bf0d5b
--- /dev/null
+++ b/dev-lua/busted/busted-2.0_rc11_p0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="2.0.rc11-0"
+
+DESCRIPTION="Elegant Lua unit testing"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	~dev-lua/lua_cliargs-2.5_p5
+	>=dev-lua/luafilesystem-1.5.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
+	>=dev-lua/luasocket-2.0.1
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+dobin bin/busted
+insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+doins -r busted/*
+dodoc *.md
+}
diff --git a/dev-lua/busted/busted-2.0_rc12_p1.ebuild b/dev-lua/busted/busted-2.0_rc12_p1.ebuild
new file mode 100644
index 000000000000..829bb1fb7f08
--- /dev/null
+++ b/dev-lua/busted/busted-2.0_rc12_p1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="2.0.rc12-1"
+
+DESCRIPTION="Elegant Lua unit testing"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	>=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
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin bin/busted
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+	doins -r busted/*
+	dodoc *.md
+}
diff --git a/dev-lua/busted/metadata.xml b/dev-lua/busted/metadata.xml
new file mode 100644
index 000000000000..e8e32b1eb332
--- /dev/null
+++ b/dev-lua/busted/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		An elegant, extensible, testing framework.
+		Ships with a large amount of useful asserts,
+		plus the ability to write your own. Output
+		in pretty or plain terminal format, JSON,
+		or TAP for CI integration. Great for TDD
+		and unit, integration, and functional tests.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/busted</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/dkjson-2.5 b/dev-lua/dkjson-2.5
deleted file mode 100644
index b1ba20ee4118..000000000000
--- a/dev-lua/dkjson-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= !>=dev-lang/lua-5.4 virtual/pkgconfig
-DESCRIPTION=David Kolf's JSON module for Lua
-EAPI=5
-HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:= !>=dev-lang/lua-5.4
-SLOT=0
-SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5 -> dkjson-2.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=516bacd9832df9467dd77184b7780926
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
new file mode 100644
index 000000000000..93419658bbce
--- /dev/null
+++ b/dev-lua/dkjson/Manifest
@@ -0,0 +1,3 @@
+DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af
+EBUILD dkjson-2.5.ebuild 648 BLAKE2B b1fb2774569d3d4b61f7bef7b02737890d5c3bec58e74dc1a7db3357f58607879135db402cbf10d50d884a1a1db79509fdf02761f8d5354ae9e3ef334868d54b SHA512 57e2173fa2ae6ecd226256d903b1131fe32853bb9f624a45febef5e0d7d78c5b0f6a4a179ec0bbf429d3bdc2486387630b656b77d336c43717bd4f222d903152
+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
new file mode 100644
index 000000000000..f1743700b60b
--- /dev/null
+++ b/dev-lua/dkjson/dkjson-2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="David Kolf's JSON module for Lua"
+HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/"
+SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:=
+	!>=dev-lang/lua-5.4"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+doins dkjson.lua
+dodoc readme.txt
+}
diff --git a/dev-lua/dkjson/metadata.xml b/dev-lua/dkjson/metadata.xml
new file mode 100644
index 000000000000..dda2ed524394
--- /dev/null
+++ b/dev-lua/dkjson/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		dkjson is a module for encoding and decoding JSON data. It supports
+		UTF-8.
+
+		JSON (JavaScript Object Notation) is a format for serializing data
+		based on the syntax for JavaScript data structures.
+
+		dkjson is written in Lua without any dependencies, but
+		when LPeg is available dkjson uses it to speed up decoding.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/lanes-3.10.0 b/dev-lua/lanes-3.10.0
deleted file mode 100644
index ddc5c8462173..000000000000
--- a/dev-lua/lanes-3.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/lua-5.1
-DESCRIPTION=lightweight, native, lazy evaluating multithreading library
-EAPI=5
-HOMEPAGE=https://github.com/LuaLanes/lanes
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1
-SLOT=0
-SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.10.0.tar.gz -> lanes-3.10.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2a26521b462c1abeebf568d3dc019c1
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
new file mode 100644
index 000000000000..ecb241de2423
--- /dev/null
+++ b/dev-lua/lanes/Manifest
@@ -0,0 +1,4 @@
+AUX lanes-3.10.0-fix-makefile.patch 855 BLAKE2B 4505cb94476ffcc1100917a660d5b8d9aa062c2a87fa463cc98bcf84190239ceb5ad53bb0c9db57b512db5590dc128f102c1af4b72c02442953220a1ed12e46e SHA512 877e3ad24d9192c2b87de7e684f77c7db725d929d1f2709b531929cf343e1da9b0396a79dd0763d2fa36a492d7920937553f533d9a75dfb353ec2ab4466c2e80
+DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b
+EBUILD lanes-3.10.0.ebuild 755 BLAKE2B 9034cc6d8f6f0124e9e18d1ebad67d33a798b62dd286a2d7b16d2940c44c3c55827e8343da6a19fca663b73a1ebde60845170917f287cecb264fff353bd07938 SHA512 e3dd7ab1960a3fa2e9f90123b1f6d52ed90215c167b504c1d5986d0b2adcac3d279292c26628e8cc8d30d98c95d81acc7f9a0973333451c0173c785b08b0c679
+MISC metadata.xml 458 BLAKE2B 4eb134f1212f3f5177e3db2e2347f7fd06acd2f50985fe95882070148b0b3019623ea50de84fda07c944d6cade018c61868caefd1f19a742f51d3ab19afba560 SHA512 bf51b49998baca68175e79573c3352fb0fdc66d75904dd1ad2058273a3370f23a9979655395d826a22d582f9f86391b84d7d53e0962d0a9e116e9acdb5ac3e8f
diff --git a/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch b/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch
new file mode 100644
index 000000000000..52549704248e
--- /dev/null
+++ b/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index fc44fac..6c87e89 100644
+--- a/Makefile
++++ b/Makefile
+@@ -202,17 +202,17 @@ _perftest:
+ #
+ # LUA_LIBDIR and LUA_SHAREDIR are used by the .rockspec (don't change the names!)
+ #
+-DESTDIR=/usr/local
+-LUA_LIBDIR=$(DESTDIR)/lib/lua/5.1
+-LUA_SHAREDIR=$(DESTDIR)/share/lua/5.1
++PREFIX=/usr/local
++LUA_LIBDIR=$(PREFIX)/lib/lua/5.1
++LUA_SHAREDIR=$(PREFIX)/share/lua/5.1
+ 
+ #
+ # AKa 17-Oct: changed to use 'install -m 644' and 'cp -p'
+ #
+ install: $(_TARGET_SO) src/lanes.lua
+-	mkdir -p $(LUA_LIBDIR) $(LUA_LIBDIR)/lanes $(LUA_SHAREDIR)
+-	install -m 644 $(_TARGET_SO) $(LUA_LIBDIR)/lanes
+-	cp -p src/lanes.lua $(LUA_SHAREDIR)
++	mkdir -p $(DESTDIR)$(LUA_LIBDIR)/lanes $(DESTDIR)$(LUA_SHAREDIR)
++	install -m 644 $(_TARGET_SO) $(DESTDIR)$(LUA_LIBDIR)/lanes
++	cp -p src/lanes.lua $(DESTDIR)$(LUA_SHAREDIR)
+ 
+ 
+ #--- Packaging ---
diff --git a/dev-lua/lanes/lanes-3.10.0.ebuild b/dev-lua/lanes/lanes-3.10.0.ebuild
new file mode 100644
index 000000000000..0db398773e8e
--- /dev/null
+++ b/dev-lua/lanes/lanes-3.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	tc-export CC
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	sed -i -e "s#/lib#/$(get_libdir)#" Makefile || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc ABOUT BUGS CHANGES README TODO
+dohtml -r docs/*
+}
diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml
new file mode 100644
index 000000000000..c1baef2d9b21
--- /dev/null
+++ b/dev-lua/lanes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		lightweight, native, lazy evaluating multithreading library for Lua-5.1 or 5.2.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">LuaLanes/lanes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/ldoc-1.4.6 b/dev-lua/ldoc-1.4.6
deleted file mode 100644
index fc6c718dfe5a..000000000000
--- a/dev-lua/ldoc-1.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lua/penlight
-DESCRIPTION=A LuaDoc-compatible documentation generation system
-EAPI=6
-HOMEPAGE=https://stevedonovan.github.io/ldoc/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=dev-lua/penlight
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_md5_=89109429c143fa3459471e3a37c0a975
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
new file mode 100644
index 000000000000..d36b33780b36
--- /dev/null
+++ b/dev-lua/ldoc/Manifest
@@ -0,0 +1,4 @@
+AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
+DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
+EBUILD ldoc-1.4.6.ebuild 521 BLAKE2B 8fce905741fd0c7f65b2349a90fd36f1a221ad5a75f9fe75e6436e350d878a2aae39442c4a362a4f4f95062996b8b6f38185f124dbb5ccd642f6e9f76e3b1ec6 SHA512 792eba8e9308ee85af156156640271c05b1fce438ded533249203f7948c3f9b5581ab12b4f4349d24dbe635e9190364c7731a57bf567e390bfcf13212c865ad1
+MISC metadata.xml 554 BLAKE2B 001555388d6c8bfab0b395a0b7d4c3458454518f49044b79faf70291b6ac270297e7ad60b03107b2eb1688e3678ab9dd52bcf27de2cfaedbe4cb2f2c256f7fee SHA512 5f7f06c5dd79003675d63ce4eb17147775c82fd0bede0d7b9ce4d15ec51e30054a7bd817c919f1862d27557b62a750b26c56d9df0081669a1a0e2b4be08fec00
diff --git a/dev-lua/ldoc/files/ldoc-1.4.6-mkdir.patch b/dev-lua/ldoc/files/ldoc-1.4.6-mkdir.patch
new file mode 100644
index 000000000000..0c7a9497c4a5
--- /dev/null
+++ b/dev-lua/ldoc/files/ldoc-1.4.6-mkdir.patch
@@ -0,0 +1,10 @@
+--- a/makefile
++++ b/makefile
+@@ -6,6 +6,7 @@
+ ldoc:
+ 
+ install: install_parts
++	mkdir -p $(DESTDIR)$(LUA_BINDIR)
+ 	echo "lua $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 	chmod +x $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 
diff --git a/dev-lua/ldoc/ldoc-1.4.6.ebuild b/dev-lua/ldoc/ldoc-1.4.6.ebuild
new file mode 100644
index 000000000000..e7155ddbb927
--- /dev/null
+++ b/dev-lua/ldoc/ldoc-1.4.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A LuaDoc-compatible documentation generation system"
+HOMEPAGE="https://stevedonovan.github.io/ldoc/"
+SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RDEPEND="dev-lua/penlight"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.6-mkdir.patch" )
+
+S="${WORKDIR}/LDoc-${PV}"
+RESTRICT="test"
diff --git a/dev-lua/ldoc/metadata.xml b/dev-lua/ldoc/metadata.xml
new file mode 100644
index 000000000000..c61dd6235844
--- /dev/null
+++ b/dev-lua/ldoc/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>t@tomoyat1.com</email>
+		<name>Tomoya Tabuchi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainer</name>
+	</maintainer>
+	<longdescription lang="en">
+		LDoc is a LuaDoc-compatible documentation generation system.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">stevedonovan/LDoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lgi-0.6.2 b/dev-lua/lgi-0.6.2
deleted file mode 100644
index c0ba7de3f33c..000000000000
--- a/dev-lua/lgi-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1 x11-libs/gtk+[introspection] virtual/pkgconfig
-DESCRIPTION=Lua bindings using gobject-introspection
-EAPI=4
-HOMEPAGE=https://github.com/pavouk/lgi
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 x11-libs/gtk+[introspection]
-SLOT=0
-SRC_URI=https://github.com/downloads/pavouk/lgi/lgi-0.6.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6ab59bd133914058e54dc9e2fdbaf93
diff --git a/dev-lua/lgi-0.6.2-r1 b/dev-lua/lgi-0.6.2-r1
deleted file mode 100644
index e39a75f92ac6..000000000000
--- a/dev-lua/lgi-0.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi virtual/pkgconfig test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Lua bindings using gobject-introspection
-EAPI=4
-HOMEPAGE=https://github.com/pavouk/lgi
-IUSE=examples test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
-SLOT=0
-SRC_URI=https://github.com/downloads/pavouk/lgi/lgi-0.6.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a1e191a5ce6e125ae0fa30dbba6a083b
diff --git a/dev-lua/lgi-0.7.2 b/dev-lua/lgi-0.7.2
deleted file mode 100644
index 06203f7d7b5f..000000000000
--- a/dev-lua/lgi-0.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi virtual/pkgconfig test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Lua bindings using gobject-introspection
-EAPI=4
-HOMEPAGE=https://github.com/pavouk/lgi
-IUSE=examples test
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
-SLOT=0
-SRC_URI=https://github.com/pavouk/lgi/archive/0.7.2.tar.gz -> lgi-0.7.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b59ae2d8fd70f639ead56599cfd7601
diff --git a/dev-lua/lgi-0.9.0 b/dev-lua/lgi-0.9.0
deleted file mode 100644
index f33bf81a6522..000000000000
--- a/dev-lua/lgi-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi virtual/pkgconfig test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Lua bindings using gobject-introspection
-EAPI=4
-HOMEPAGE=https://github.com/pavouk/lgi
-IUSE=examples test
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
-SLOT=0
-SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b59ae2d8fd70f639ead56599cfd7601
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
new file mode 100644
index 000000000000..c15d09152ade
--- /dev/null
+++ b/dev-lua/lgi/Manifest
@@ -0,0 +1,8 @@
+DIST lgi-0.6.2.tar.gz 257541 BLAKE2B 61d58b1b03fe01d43384693b21336149b06a04e638a32f46e685e0f6f1e7ad693ec3074af3ffcc789f053a2a085a58b41b81023f3b023625309f0f4ed6ae6cff SHA512 02b75f17f98d7f7240c335384a85cdb0bb1c1b117b4ea8baa065715c4e5ecac946618ef83f92ef476a87db3a17a29a0e21d71f4f79db3bc4e519cf795ae181f5
+DIST lgi-0.7.2.tar.gz 270767 BLAKE2B 491fafccbf4d8c5086b48baad0022a76a1f829e0c9a55acbfbd4eaa283c2713ef3f4863a2abf12d24bae0ccb2284506da66578c2d26ab6bda3f6d891c39a8ff4 SHA512 e661e13d6f539c2c434a6b0db9e622ee4af3c039a6488617954643f0b46a908068a14e6d37ff44437fbe5b4cb62863699107ab533aca121d4b8d584ca83c35fc
+DIST lgi-0.9.0.tar.gz 285248 BLAKE2B e5e6fe79899b70f46338827296b921c04c31ac1edc82e5c7a1d443c54c409aea65a766f3666b0ff9fca63a17cb50fe9727d0722007b16a1d4a6c77c48b9f3828 SHA512 1a486a40f504740224b1d277368df65e0a30708c02422390517c2fbf961b5fec264bdbc695d306e2f5fb2aa8ad4539212ef5314b18f45e3b488fd5f492a19f9e
+EBUILD lgi-0.6.2-r1.ebuild 1286 BLAKE2B 12319bf0f17bfdf5780ffc1834cf8a46bdea87c2efd270fe05c57ddafc6f9f8bbc6977f3b66c080e0c28689455bfa501ca788c2ee281ab16e136598635b9e7f4 SHA512 89b07608707c27416b944405c52441453ffe83a4dcd9fea5afbba53146fbd8ba6172be0e423a52eaea68e8b0e64a0d62530b0f69a5058bee7606ba19362f0939
+EBUILD lgi-0.6.2.ebuild 951 BLAKE2B b0cf07bba57acbc9a13af729afa7c773cb46e0de74a593c8bc4b80dc7e7f50efb1d1e06ac2c227ddf1a6489b424202a51cf764a04efecd1c4485ddeb0c77c403 SHA512 9c74e8c1bd328296587a1b958798362e4fe4476433d07beff4f6d70223f7970f070fa0ddac1ed02d72d0666878f5aa8219a209405e8aaf993e8bc67467c97b5e
+EBUILD lgi-0.7.2.ebuild 1295 BLAKE2B 4732376e621ebffae6018acff5ff361d1f364c0d39edc552c5a9efbf809dbb8d39a5b577ca4083d908fee1cf387248f36c829e014f83485b38b078a93a625cfc SHA512 db8e3c3c6b0433ea3caae99914c2376e7fd0e45e465cc826dd8731bac75bc80b29850baf1b92fb92109fa4b74d3b59b9cadf0ff6d56299621e06cf24f8221eff
+EBUILD lgi-0.9.0.ebuild 1295 BLAKE2B 4732376e621ebffae6018acff5ff361d1f364c0d39edc552c5a9efbf809dbb8d39a5b577ca4083d908fee1cf387248f36c829e014f83485b38b078a93a625cfc SHA512 db8e3c3c6b0433ea3caae99914c2376e7fd0e45e465cc826dd8731bac75bc80b29850baf1b92fb92109fa4b74d3b59b9cadf0ff6d56299621e06cf24f8221eff
+MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.6.2-r1.ebuild b/dev-lua/lgi/lgi-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..3128ed21037b
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.6.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi"
+SRC_URI="https://github.com/downloads/pavouk/lgi/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="examples test"
+
+RDEPEND=">=dev-lang/lua-5.1
+		dev-libs/gobject-introspection
+		dev-libs/glib
+		virtual/libffi"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		test? (
+			x11-libs/cairo[glib]
+			x11-libs/gtk+[introspection]
+			${VIRTUALX_DEPEND}
+		)"
+
+src_prepare() {
+	sed -i \
+		-e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \
+		-e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \
+		"${S}"/lgi/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}"
+}
+
+src_test() {
+	Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -r docs/*
+	dodoc README.md
+	if use examples; then
+		dodoc -r samples
+	fi
+}
diff --git a/dev-lua/lgi/lgi-0.6.2.ebuild b/dev-lua/lgi/lgi-0.6.2.ebuild
new file mode 100644
index 000000000000..aa861d1a7abb
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi"
+SRC_URI="https://github.com/downloads/pavouk/lgi/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1
+		x11-libs/gtk+[introspection]"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \
+		-e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \
+		"${S}"/lgi/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -r docs/*
+	dodoc README.md
+}
diff --git a/dev-lua/lgi/lgi-0.7.2.ebuild b/dev-lua/lgi/lgi-0.7.2.ebuild
new file mode 100644
index 000000000000..bd19c1f04850
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.7.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi"
+SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="examples test"
+
+RDEPEND=">=dev-lang/lua-5.1
+		dev-libs/gobject-introspection
+		dev-libs/glib
+		virtual/libffi"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		test? (
+			x11-libs/cairo[glib]
+			x11-libs/gtk+[introspection]
+			${VIRTUALX_DEPEND}
+		)"
+
+src_prepare() {
+	sed -i \
+		-e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \
+		-e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \
+		"${S}"/lgi/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}"
+}
+
+src_test() {
+	Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -r docs/*
+	dodoc README.md
+	if use examples; then
+		dodoc -r samples
+	fi
+}
diff --git a/dev-lua/lgi/lgi-0.9.0.ebuild b/dev-lua/lgi/lgi-0.9.0.ebuild
new file mode 100644
index 000000000000..bd19c1f04850
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi"
+SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="examples test"
+
+RDEPEND=">=dev-lang/lua-5.1
+		dev-libs/gobject-introspection
+		dev-libs/glib
+		virtual/libffi"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		test? (
+			x11-libs/cairo[glib]
+			x11-libs/gtk+[introspection]
+			${VIRTUALX_DEPEND}
+		)"
+
+src_prepare() {
+	sed -i \
+		-e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \
+		-e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \
+		"${S}"/lgi/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}"
+}
+
+src_test() {
+	Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -r docs/*
+	dodoc README.md
+	if use examples; then
+		dodoc -r samples
+	fi
+}
diff --git a/dev-lua/lgi/metadata.xml b/dev-lua/lgi/metadata.xml
new file mode 100644
index 000000000000..8eed56640dac
--- /dev/null
+++ b/dev-lua/lgi/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pavouk/lgi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/lpeg-1.0.1 b/dev-lua/lpeg-1.0.1
deleted file mode 100644
index 97f884a0d549..000000000000
--- a/dev-lua/lpeg-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= ) virtual/pkgconfig
-DESCRIPTION=Parsing Expression Grammars for Lua
-EAPI=6
-HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
-IUSE=debug doc luajit
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= )
-SLOT=0
-SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=486b7ad7b5fe8fdde3ebdee2aeb676bc
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
new file mode 100644
index 000000000000..0fee4f5eaec3
--- /dev/null
+++ b/dev-lua/lpeg/Manifest
@@ -0,0 +1,4 @@
+AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
+DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
+EBUILD lpeg-1.0.1.ebuild 1246 BLAKE2B 3bd53964f81605c56758395984aaaf815a50bef2e03346a5dc658ac46d98d76c16f18df8af7a2224995206d49397cff0281b750a6b1aabc90a8e40ae2497cc06 SHA512 5a364050082fba5a1e1aa598d0892cbbe915b540981d99807b461346f98671ad8707286467243cc1f1f04014d455df747891dc23376e4ecabd13fc4408e6d0b5
+MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
new file mode 100644
index 000000000000..a0be0558aa97
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
@@ -0,0 +1,37 @@
+--- lpeg-0.12.1/makefile
++++ lpeg-0.12.1/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2
++#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+ 
+ # For Linux
+ linux:
+-	make lpeg.so "DLLFLAGS = -shared -fPIC"
++	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+ 
+ # For Mac OS
+ macosx:
+-	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
new file mode 100644
index 000000000000..1578b536ade8
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+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"
+IUSE="debug doc luajit"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2= )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( "HISTORY" )
+HTML_DOCS=( "lpeg.html"  "re.html"  )
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch )
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+}
+
+src_test() {
+	$(usex luajit 'luajit' 'lua') test.lua || die
+}
+
+src_install() {
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+
+	use doc && einstalldocs
+}
diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
new file mode 100644
index 000000000000..3601f139104d
--- /dev/null
+++ b/dev-lua/lpeg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/dev-lua/lua-cjson-2.1.0 b/dev-lua/lua-cjson-2.1.0
deleted file mode 100644
index 5942d67bb6a5..000000000000
--- a/dev-lua/lua-cjson-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0 test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast JSON encoding/parsing module for Lua
-EAPI=5
-HOMEPAGE=https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/mpx/lua-cjson/
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:0
-SLOT=0
-SRC_URI=https://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81ccf810d140a31b7616c47ae5ffa2b1
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
new file mode 100644
index 000000000000..7aaf5873d669
--- /dev/null
+++ b/dev-lua/lua-cjson/Manifest
@@ -0,0 +1,3 @@
+DIST lua-cjson-2.1.0.tar.gz 86024 BLAKE2B 21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db SHA512 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
+EBUILD lua-cjson-2.1.0.ebuild 765 BLAKE2B ce8e5aa06cceba2be9f4436d5f5f2c3356521fcaa6237fe5cf37035ab37d70ba501d3bfb67bdb546d18559bb0bd53d987cbf3445a438f8622f8ee7c8ac350f33 SHA512 f5cf61e13d1306b058196ae7c87038f19d43c98c53c81f9ab769b728f2af9343829926ba9bf5192fe1a37e0e42659036209c227853d0728e3b9f722a6c6fa41c
+MISC metadata.xml 250 BLAKE2B b6882e74d55aa6fb27d372e6b27adc8751cd6bcbc6bbddf7b60b8a666d866a9ea95675b1ea1f0ab644eeeef2ca0ca599fadade594d80b649b2914b0581d805c2 SHA512 c9d378944a0bf99a43e176e333e565fe0e7af8000dbeac1b65e5d0f850eba07d88b15917d3b9bcbe05e927a94b36e310aff905e2147707b674a62f67bb048da5
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
new file mode 100644
index 000000000000..1dd13c83607d
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A fast JSON encoding/parsing module for Lua"
+HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/mpx/lua-cjson/"
+SRC_URI="https://www.kyne.com.au/~mark/software/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-lang/lua-5.1:0"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+DOCS=( NEWS THANKS )
+
+src_test() {
+	cd tests || die
+	ln -s "${BUILD_DIR}"/cjson.so ./ || die
+	ln -s "${S}"/lua/cjson ./ || die
+	./genutf8.pl || die
+	./test.lua || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml manual.html performance.html
+}
diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
new file mode 100644
index 000000000000..441a4c3c3128
--- /dev/null
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -0,0 +1,8 @@
+<?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">mpx/lua-cjson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-openssl-0.4.1-r1 b/dev-lua/lua-openssl-0.4.1-r1
deleted file mode 100644
index 42ab6755fc07..000000000000
--- a/dev-lua/lua-openssl-0.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) virtual/pkgconfig
-DESCRIPTION=OpenSSL binding for Lua
-EAPI=5
-HOMEPAGE=https://github.com/zhaozg/lua-openssl
-IUSE=libressl luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT openssl PHP-3
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.4.1.tar.gz -> lua-openssl-0.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65ac7d0184ea9c436ac953c055536c04
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
new file mode 100644
index 000000000000..be21660b2886
--- /dev/null
+++ b/dev-lua/lua-openssl/Manifest
@@ -0,0 +1,4 @@
+AUX lua-openssl-0.4.1-Makefile.patch 3494 BLAKE2B e007800b599eb7f979fa23ffed4a436f9804c82ec8e4c98307192cc6e25c8c4571bfcf803a99bc6dbf3ac4f05217b7639423e32ce4ac8c73a3a31f25daf73062 SHA512 bc5b4c2dfd95b82bcdef0e0f5467af9249365db73b39ee416795140be95a89c0cc968507d62f9b9424f3a492429a49153bed5f7706a2a878430e6af41be38505
+DIST lua-openssl-0.4.1.tar.gz 363525 BLAKE2B cd2222241f742421c31eb4334a472bdd79b3b348210f02a5d4275163a3d57ea6c13adf894aa9aeb24266a8bedf839aadc3c3923bb65d075963b1810581629fb4 SHA512 c6deda86f77f9d6de1863611db9eb82506ea9789ec0425cb40cdb7d142d53aa633d53e1446b7eeb464636261385822d9cedc841bd35163931cc3758e7c3a308d
+EBUILD lua-openssl-0.4.1-r1.ebuild 1109 BLAKE2B 098681960488aa3c080eab0feebce74262ee90878dd0a0e04f55b80104c68212e2175deec6430c55a796e587c5265fce5831b66a359d5dd8e3465633d1d21548 SHA512 501e5d001021d0cf8ace8ba668f6e7b4880a0cb932573e6444ab0dba959c5116b51e700f48cfc08d3219821878a87b61720596ca2de99a387bc3fc8c9470a5dd
+MISC metadata.xml 249 BLAKE2B 3ab35857c3c6e5cea39d8d6d3b54fdfefd9877895c470c3ca2cfbb50a298410842de32514bf22d823f789aa09b1bd06a8e35f7282359077324737ec01a7dda25 SHA512 4a88e5a29b58bf05ab0d5ba495f472d5642c757067e19ee24ba751e2e3df458b308714f3744f82b54004ab87289eb33d57b78d0785c99eb08f079e9d3f0f5608
diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
new file mode 100644
index 000000000000..bf5374ee90cd
--- /dev/null
+++ b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
@@ -0,0 +1,86 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+
+Fix Makefile to respect system CFLAGS, LDFLAGS, and CC provided by environment.
+Allow to specify pkg-config command using variable, to be friendly with
+cross-compiling etc.
+
+diff --git a/Makefile b/Makefile
+index 195ef6b..375fb65 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,9 +2,10 @@ T=openssl
+ 
+ PREFIX		?=/usr/local
+ LIB_OPTION	?= -shared 
++PKG_CONFIG	?= pkg-config
+ 
+ #Lua auto detect
+-LUA_VERSION ?= $(shell pkg-config luajit --print-provides)
++LUA_VERSION ?= $(shell $(PKG_CONFIG) luajit --print-provides)
+ ifeq ($(LUA_VERSION),)                         ############ Not use luajit
+ LUAV		?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
+ LUA_CFLAGS	?= -I$(PREFIX)/include/lua$(LUAV)
+@@ -12,8 +13,8 @@ LUA_LIBS	?= -L$(PREFIX)/lib
+ LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUAV)
+ else
+ LUAV		?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
+-LUA_CFLAGS	?= $(shell pkg-config luajit --cflags)
+-LUA_LIBS	?= $(shell pkg-config luajit --libs)
++LUA_CFLAGS	?= $(shell $(PKG_CONFIG) luajit --cflags)
++LUA_LIBS	?= $(shell $(PKG_CONFIG) luajit --libs)
+ LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUAV)
+ endif
+ 
+@@ -22,30 +23,30 @@ SYS := $(shell gcc -dumpmachine)
+ 
+ ifneq (, $(findstring linux, $(SYS)))
+ # Do linux things
+-LDFLAGS		    = -fPIC -lrt -ldl
+-OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS	?= $(shell pkg-config openssl --cflags)
+-CFLAGS		    = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS		    += -fPIC -lrt -ldl
++OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS	?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS		    += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring apple, $(SYS)))
+ # Do darwin things
+-LDFLAGS		    = -fPIC -lrt -ldl
+-OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS	?= $(shell pkg-config openssl --cflags)
+-CFLAGS		    = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS		    += -fPIC -lrt -ldl
++OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS	?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS		    += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring mingw, $(SYS)))
+ # Do mingw things
+ V			= $(shell lua -e "v=string.gsub('$(LUAV)','%.','');print(v)")
+-LDFLAGS		= -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll 
++LDFLAGS		+= -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll
+ LUA_CFLAGS	= -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/
+-CFLAGS		= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++CFLAGS		+= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring cygwin, $(SYS)))
+ # Do cygwin things
+-OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS  ?= $(shell pkg-config openssl --cflags)
+-CFLAGS		= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS  ?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS		+= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ #custome config
+ ifeq (.config, $(wildcard .config))
+@@ -61,7 +62,7 @@ WARN_MOST	= -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnest
+ WARN		= -Wall -Wno-unused-value
+ WARN_MIN	= 
+ CFLAGS		+= $(WARN_MIN) -DPTHREADS 
+-CC= gcc -g $(CFLAGS) -Ideps
++CC			?= gcc -g $(CFLAGS) -Ideps
+ 
+ 
+ OBJS=src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \
diff --git a/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..2c0ad960fe58
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	use luajit && LUAV=luajit || LUAV=lua
+}
+
+src_compile() {
+	local pkgconfig=$(tc-getPKG_CONFIG)
+	emake \
+		CC="$(tc-getCC) \$(CFLAGS) -Ideps" \
+		PKG_CONFIG="$pkgconfig" \
+		LUA_CFLAGS="$($pkgconfig --cflags $LUAV)" \
+		LUA_LIBS="$($pkgconfig --libs $LUAV)" \
+		LUA_LIBDIR="$($pkgconfig --variable INSTALL_CMOD $LUAV)"
+}
+
+src_install() {
+	emake \
+		LUA_LIBDIR="${D}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $LUAV)" \
+		install
+	einstalldocs
+}
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
new file mode 100644
index 000000000000..5056b9e74ffb
--- /dev/null
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -0,0 +1,8 @@
+<?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">zhaozg/lua-openssl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-term-0.3 b/dev-lua/lua-term-0.3
deleted file mode 100644
index 2f80985890a3..000000000000
--- a/dev-lua/lua-term-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Terminal functions for Lua
-EAPI=5
-HOMEPAGE=https://github.com/hoelzro/lua-term
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/hoelzro/lua-term/archive/0.03.tar.gz -> lua-term-0.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f7c49bf789f96b79d29c39011782993c
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
new file mode 100644
index 000000000000..3ca7039c700c
--- /dev/null
+++ b/dev-lua/lua-term/Manifest
@@ -0,0 +1,3 @@
+DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7
+EBUILD lua-term-0.3.ebuild 1052 BLAKE2B b51521ed23953db5b3da120a5cba7406a712bcaea0f953d9b634ed22f7a426a881db771d01e9641b339454a520d51e25a99248e671be5dda570b0f7173a9c41f SHA512 2a6e30f1946935e9a9598e9dc1d7a32839073a31b24d8a97b0af6adc6bb3db8de397ed97a13d6aba09e37d7098d241aacc158f2eff92c81265587e6233e1e102
+MISC metadata.xml 329 BLAKE2B 53838f32093f301c09eca7e323feeb35d9ceee5a2a38fe0902bafd8893afed48e8b7f8b4bfebfa183cdcabc63d654b983658ae69c08c640cb97239c5f15ea4b9 SHA512 927fa93e0060fdb183c77425cf3716dde54c4b2a6a4fdbfadf9a8bbeeb186b55ac93589003c8259382d3985075e9ef4239c3a7be359bc704cc6d3febc3c8f89e
diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild
new file mode 100644
index 000000000000..2bf85543e545
--- /dev/null
+++ b/dev-lua/lua-term/lua-term-0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# Yes, upstream used different version numbers.
+# The rockspec version number is 0.3, but the version associated with
+# the tarball is 0.03.
+MY_PV=0.03
+
+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=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+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-term/metadata.xml b/dev-lua/lua-term/metadata.xml
new file mode 100644
index 000000000000..cd082b51556c
--- /dev/null
+++ b/dev-lua/lua-term/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hoelzro/lua-term</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-zlib-0.3 b/dev-lua/lua-zlib-0.3
deleted file mode 100644
index 31e68051122f..000000000000
--- a/dev-lua/lua-zlib-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/lua:0 sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Lua bindings to zlib
-EAPI=5
-HOMEPAGE=https://github.com/brimworks/lua-zlib
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua:0 sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/brimworks/lua-zlib/tarball/v0.3 -> lua-zlib-0.3.tgz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebfb8ff07b1d9b22355a0b19784462fd
diff --git a/dev-lua/lua-zlib-1.1 b/dev-lua/lua-zlib-1.1
deleted file mode 100644
index bdb4f5723710..000000000000
--- a/dev-lua/lua-zlib-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:0 sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Lua bindings to zlib
-EAPI=6
-HOMEPAGE=https://github.com/brimworks/lua-zlib
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua:0 sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.1.tar.gz -> lua-zlib-1.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6dbf37ed3af446b0ffa1299ecc16766b
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
new file mode 100644
index 000000000000..ab3d1a31cb90
--- /dev/null
+++ b/dev-lua/lua-zlib/Manifest
@@ -0,0 +1,5 @@
+DIST lua-zlib-0.3.tgz 11220 BLAKE2B 49134507d74e552c4f8b50bb6fb17c4c336e809c95b92e90230b3c9be3b7f2f2ac1ac0785e5c2dbbd3d577d18491e680d43608ac22fd8243280865e662543e1d SHA512 99711166637d394c806dd16b86a3588ff84eb9180d2da05725ff6d4e86458d1ded7a5fbb303284fa442fd0925bc94fe34772057e0190c1a3e00cbb853865941d
+DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633
+EBUILD lua-zlib-0.3.ebuild 606 BLAKE2B d03f086d416e5b7d3bc462d5d21b87611a9154310a7de1efdd8c913c697179ff3a69c5635874009c98926e200e6150429d55bf86f83deeb8cb655ec0d6e00e39 SHA512 1963c423ae02a4da94a904ad98f851aa9f725a79d6987b9681041dbc5de784401c9416d4a7bde6c0abea33796aa4172515d625ad640ff9aa54c108a35f676de7
+EBUILD lua-zlib-1.1.ebuild 569 BLAKE2B b724c6b39627b304d4b7ed67d1c002231176f5be5bef6771a140556b52a2b88798d4cef66819a0b100c07c24936c7387c266e0cb7c13f4d219f404722476c9e2 SHA512 7702870cd6a873857c01a9e76c391ebe0d9424b4354d43eb0d8e6eec4481e32776a3da1073935356aacae7b3d038cb50466b3056a17c1bb7b2870e4f95c500b3
+MISC metadata.xml 255 BLAKE2B 820ddc4489fc6c4387305bcbc3b339e13be1230d100ef3e9b45e13dfb850c2be0e7968c9cbe1c15e8cf3a4887b05637615ca11d3358aa032f96f23edfccc5cd1 SHA512 3d46a3689375944f47933ce2af13543ecb79bce6a7eaad56083931111c277da45d3b8120bdc1643985cd746be3ffc84017da34038adc05367e90601e883e5b92
diff --git a/dev-lua/lua-zlib/lua-zlib-0.3.ebuild b/dev-lua/lua-zlib/lua-zlib-0.3.ebuild
new file mode 100644
index 000000000000..dfdba4a1a635
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Lua bindings to zlib"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/tarball/v${PV} -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/lua:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_configure() {
+	MYCMAKEARGS="-DINSTALL_CMOD='$(pkg-config --variable INSTALL_CMOD lua)'"
+	cmake-utils_src_configure
+}
diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
new file mode 100644
index 000000000000..f036e0a8aea6
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/metadata.xml b/dev-lua/lua-zlib/metadata.xml
new file mode 100644
index 000000000000..b89e350d8c26
--- /dev/null
+++ b/dev-lua/lua-zlib/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-lua/lua_cliargs-2.5_p5 b/dev-lua/lua_cliargs-2.5_p5
deleted file mode 100644
index 26c65b604684..000000000000
--- a/dev-lua/lua_cliargs-2.5_p5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=A command-line argument parser.
-EAPI=5
-HOMEPAGE=https://github.com/amireh/lua_cliargs
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/amireh/lua_cliargs/archive/v2.5-5.tar.gz -> lua_cliargs-2.5_p5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=233c7077e454785d0895ba7422a1e56b
diff --git a/dev-lua/lua_cliargs-3.0_p1 b/dev-lua/lua_cliargs-3.0_p1
deleted file mode 100644
index ed165c77b045..000000000000
--- a/dev-lua/lua_cliargs-3.0_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=A command-line argument parser.
-EAPI=6
-HOMEPAGE=https://github.com/amireh/lua_cliargs
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/amireh/lua_cliargs/archive/v3.0-1.tar.gz -> lua_cliargs-3.0_p1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5b63d05c75df4b9c4d09010bbd51807d
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
new file mode 100644
index 000000000000..8db25cb69293
--- /dev/null
+++ b/dev-lua/lua_cliargs/Manifest
@@ -0,0 +1,5 @@
+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
+EBUILD lua_cliargs-2.5_p5.ebuild 876 BLAKE2B ba627334a770918356cd474f97b7b8f39bad574cd26ecc7de552db033920797a709d78285dbb7940c4800a690133a06d239b618c9635ecde5c2e2367b65c651c SHA512 00571f5fc51ba97a5affd68efa419c47e8646e9cb0ae1d99f085b0a0032dcfcf42b58e4405b7143a7f4bf114b136013ad5e8e5a7986537439a3517a2fc3b98a0
+EBUILD lua_cliargs-3.0_p1.ebuild 912 BLAKE2B 1638e91d90020754defec1d85d589f95b54c6797893abd2e35a40eb8d58b787ba659cc60544e5379765f81f6d27648e9340e24e38a4b2ede2d03f34af4dc674a SHA512 e1bc9e132a2667f4ead85a9ed09f14ef0be5b5412e88ae2b692be700fefa4411ee4b9e5f28192ee9f5ea0aa1932fccefaf52a23ffc8e42d0ea5dda3f93f72877
+MISC metadata.xml 561 BLAKE2B a38b859e36bacd5481ca588a97d39f3353aedeae25b219c7b6e24353979c659407088e9ef16b71d642c19e26ff628f314ec0fab72ebd55a7fa42d0f0f32638d4 SHA512 da9b4c1e00524c0cc7963b0339a18f0b2fe254338269b8fc77e790ad26704ef92f450859838d7e0730cceda34ed34548c367659fae27302fba02252636537c59
diff --git a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
new file mode 100644
index 000000000000..703880029899
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="2.5-5"
+
+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"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins src/cliargs.lua
+	dodoc README.md
+dodoc -r examples
+	docinto html
+	dodoc -r doc/*
+}
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
new file mode 100644
index 000000000000..4d1282f5bfa9
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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-1"
+
+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=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r src/cliargs.lua src/cliargs
+	dodoc README.md
+	dodoc -r examples
+	docinto html
+	dodoc -r doc/*
+}
diff --git a/dev-lua/lua_cliargs/metadata.xml b/dev-lua/lua_cliargs/metadata.xml
new file mode 100644
index 000000000000..61ea9ce51390
--- /dev/null
+++ b/dev-lua/lua_cliargs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This module adds support for accepting CLI
+		arguments easily using multiple notations and argument types.
+
+		cliargs allows you to define required, optional, and flag arguments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">amireh/lua_cliargs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luacheck-0.20.0 b/dev-lua/luacheck-0.20.0
deleted file mode 100644
index 3e4d2c7a91b7..000000000000
--- a/dev-lua/luacheck-0.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/busted )
-DESCRIPTION=A tool for linting and static analysis of Lua code
-EAPI=6
-HOMEPAGE=https://github.com/mpeterv/luacheck
-IUSE=doc luajit test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-SLOT=0
-SRC_URI=https://github.com/mpeterv/luacheck/archive/0.20.0.tar.gz -> luacheck-0.20.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=be439d5b68b8731ad0ba2a07ea106d81
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
new file mode 100644
index 000000000000..38c254cf485a
--- /dev/null
+++ b/dev-lua/luacheck/Manifest
@@ -0,0 +1,3 @@
+DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
+EBUILD luacheck-0.20.0.ebuild 1034 BLAKE2B ef1d0350af38e755a25219018074d8a1526550cc0c9ecaabaaea814a18f357efb09bee1ed8fc10fbf2696a619ca5cb051918ae513dd11cb7b0c96558041b187c SHA512 004a8a8c6fa13dffce97b33e0a6eeae7de2a75b76ea14465d3f7e381b49a104ce41f2a9b40446bd9314d3fbb779285ee07fe1deac99d9271ebe976df56275b31
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0.ebuild
new file mode 100644
index 000000000000..f4df09eefbb1
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.20.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc luajit test"
+
+RDEPEND="
+	dev-lua/luafilesystem[luajit=]
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? ( dev-lua/busted )"
+
+DOCS=( CHANGELOG.md README.md )
+
+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 && HTML_DOCS+=( html/. )
+
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-lua/luacheck/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-lua/luacov-0.8 b/dev-lua/luacov-0.8
deleted file mode 100644
index a0beddedbfd0..000000000000
--- a/dev-lua/luacov-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=LuaCov is a simple coverage analyzer for Lua scripts
-EAPI=5
-HOMEPAGE=https://github.com/keplerproject/luacov
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/keplerproject/luacov/archive/v0.8.tar.gz -> luacov-0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9edddd85a4bcc8b154269d6afdbf25d
diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest
new file mode 100644
index 000000000000..5807a315ae01
--- /dev/null
+++ b/dev-lua/luacov/Manifest
@@ -0,0 +1,4 @@
+AUX luacov-0.8-fix-makefile.patch 681 BLAKE2B b3f81e28207a97a774a4da75723d006ab043bc4363757ffee44e7b456b44e5ce31e8dcea5dc6f5989595ebef98f4c546c5ae64dc52be7dbc3e2243f9bcad597b SHA512 603ac926108e30d511ac0fba66576fbbf7b98b468bed1a0026addf6f0361b38e41b9d967f983b3a8147b853055538e2ec2f87efc896542e87b73073bc0a881ba
+DIST luacov-0.8.tar.gz 33613 BLAKE2B 942c47de25dbd53de445e1ed1fa924f1be278da4c3b134e4a603f4a5ab5090f87d762c48163cf82ed9bab585e35b0528c330b3dc849e0043ccc96532107c8a94 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11
+EBUILD luacov-0.8.ebuild 747 BLAKE2B e10a473a15575943822d8991d1e3a1181f28cfa49e4fdcf433fef147ff412214685fdcd209b6da9eef7e677ad15002a22e1755454a0c86d6213a2ced860bd232 SHA512 e81255d4b67320c740e3365d06d2bd5e4f3325f01a294f65b6dcfc3af4ec07a8538870729f612178239659904566e2274995ee8fe613db57c3353f7ac81711e5
+MISC metadata.xml 431 BLAKE2B d22c8cd5ad722d9150a489bb868552ffca854fa94368f2db1a32c5d749d52c3a2515db6730131156b028bb516705f1723b1da6271b2e14465632db9da5549413 SHA512 bdb26053ef182f212c11e219f5e29b6ad19494615e2553c26affdcf74861966ddd4583edffe27e5e39ce7e4f822e7b0747bcf3f2c469353f05d3fb22aa453c76
diff --git a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch
new file mode 100644
index 000000000000..7a4ea6ba9ea7
--- /dev/null
+++ b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile b/Makefile
+index 477f9de..adad2cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,13 +6,13 @@ BINDIR=$(PREFIX)/bin
+ LUADIR=$(PREFIX)/share/lua/5.1/
+ 
+ install:
+-	mkdir -p $(BINDIR)
+-	cp src/bin/luacov $(BINDIR)
+-	chmod +x $(BINDIR)/luacov
+-	mkdir -p $(LUADIR)
+-	cp src/luacov.lua $(LUADIR)
+-	mkdir -p $(LUADIR)/luacov
+-	cp src/luacov/*.lua $(LUADIR)/luacov
++	mkdir -p $(DESTDIR)$(BINDIR)
++	cp src/bin/luacov $(DESTDIR)$(BINDIR)
++	chmod +x $(DESTDIR)$(BINDIR)/luacov
++	mkdir -p $(DESTDIR)$(LUADIR)
++	cp src/luacov.lua $(DESTDIR)$(LUADIR)
++	mkdir -p $(DESTDIR)$(LUADIR)/luacov
++	cp src/luacov/*.lua $(DESTDIR)$(LUADIR)/luacov
+ 
+ dist:
+ 	rm -rf $(PACKAGE)-$(VERSION)
diff --git a/dev-lua/luacov/luacov-0.8.ebuild b/dev-lua/luacov/luacov-0.8.ebuild
new file mode 100644
index 000000000000..280c33a87c1f
--- /dev/null
+++ b/dev-lua/luacov/luacov-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="LuaCov is a simple coverage analyzer for Lua scripts"
+HOMEPAGE="https://github.com/keplerproject/luacov"
+SRC_URI="https://github.com/keplerproject/luacov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-fix-makefile.patch
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		PREFIX=/usr \
+		LUADIR="$(pkg-config --variable INSTALL_LMOD lua)" install
+dohtml -r doc/*
+	dodoc -r examples
+}
diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml
new file mode 100644
index 000000000000..e9f9224d483a
--- /dev/null
+++ b/dev-lua/luacov/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		LuaCov is a coverage analyzer for Lua scripts.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keplerproject/luacov</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luacrypto-0.3.2-r1 b/dev-lua/luacrypto-0.3.2-r1
deleted file mode 100644
index c6038f2d8b96..000000000000
--- a/dev-lua/luacrypto-0.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Lua frontend to OpenSSL
-EAPI=5
-HOMEPAGE=http://mkottman.github.io/luacrypto/ https://github.com/mkottman/luacrypto/
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )
-SLOT=0
-SRC_URI=https://github.com/mkottman/luacrypto/archive/0.3.2.tar.gz -> luacrypto-0.3.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=892a93d5355efdc6af375c296708102b
diff --git a/dev-lua/luacrypto/Manifest b/dev-lua/luacrypto/Manifest
new file mode 100644
index 000000000000..921d130bc971
--- /dev/null
+++ b/dev-lua/luacrypto/Manifest
@@ -0,0 +1,4 @@
+AUX luacrypto-0.3.2-lualibdir.patch 299 BLAKE2B 83ec7d532aff1109b78e659abd33bf1df4eae736b3e1018f5283c74ec11be0e79b5d08354d979ae17c2d9da7426295190b203ff01d6c004de6cfde202a0bead9 SHA512 cef182827a67229396dc53f0980829065f83fdd3a1bb6069e452b3945bd74459898954a2f1b3f9ada1d3834388446a720a3d24a1f070efdb814227ad94ea6735
+DIST luacrypto-0.3.2.tar.gz 374363 BLAKE2B 043ef787f9b99f7d25bfa9a96d2495f2bfbeec0200c956b978cfc003c51f0faba99848bf290e011a3f8ba8a50d99bf5b6f9b5346addcd57f71978a4af8f4117d SHA512 4cb20d2cc348a11f140210dffb803629034c72cc7232590f4488f559d5c7233e0c41e56fcd0863959ac0b07e64c9aa79ea573e4126fdc11bc3f1b3b49d13343e
+EBUILD luacrypto-0.3.2-r1.ebuild 778 BLAKE2B 780f423615cbd7f3a35967e34ea5b97e70782fdf7b46bc2323a673cd1018c60417fbaa2e92faa907dff410787f7b7a1c8f97ac39c83842ed9cc0f5f69be3c66a SHA512 eab4d0b16f1aeb932446c9dd5d00387934b9f93cc467923a2f2109cf8e01d7ca10b8b32796ebdadd0b5208e482d396b2da85482be58b27ad5e3b5e7305d4a492
+MISC metadata.xml 255 BLAKE2B 2bf4f730b919a8331ebff73c5bfcf38c49a55714816935d0ad50d95736da91b3984399501e02ad6d50a6bba120cc0c1e70b115e3704215f589616994e23e305a SHA512 2cac273dcf66f34dd2c722aebdac845b9e22f513915d2ad8a0cf7e850b343bbf2724ae8dfe151b49dc57a87c85214d70e4ec081237e8ce8ba2c7d9dcd1675ce3
diff --git a/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch b/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch
new file mode 100644
index 000000000000..461e066865c2
--- /dev/null
+++ b/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch
@@ -0,0 +1,11 @@
+--- luacrypto-0.3.2/configure.ac
++++ luacrypto-0.3.2/configure.ac
+@@ -31,7 +31,7 @@
+ PKG_CHECK_MODULES([LUA], [lua])
+ 
+ # lua libdir
+-LUALIBDIR="`$PKGCONFIG --variable=libdir lua`"
++LUALIBDIR="`$PKGCONFIG --variable=INSTALL_CMOD lua`"
+ 
+ # dest of headers
+ CRYPTOINC="${includedir}/${PACKAGE_NAME}"
diff --git a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..2166a46878b5
--- /dev/null
+++ b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Lua frontend to OpenSSL"
+HOMEPAGE="http://mkottman.github.io/luacrypto/ https://github.com/mkottman/luacrypto/"
+SRC_URI="https://github.com/mkottman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lualibdir.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --htmldir=/usr/share/doc/${PF}/html
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/dev-lua/luacrypto/metadata.xml b/dev-lua/luacrypto/metadata.xml
new file mode 100644
index 000000000000..b6155ce2e922
--- /dev/null
+++ b/dev-lua/luacrypto/metadata.xml
@@ -0,0 +1,8 @@
+<?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">mkottman/luacrypto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/luadbi-0.5-r5 b/dev-lua/luadbi-0.5-r5
deleted file mode 100644
index 390366d26017..000000000000
--- a/dev-lua/luadbi-0.5-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=DBI module for Lua
-EAPI=5
-HOMEPAGE=https://code.google.com/p/luadbi/
-IUSE=mysql postgres +sqlite
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=https://luadbi.googlecode.com/files/luadbi.0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5168e221e332e61657537a4872e033d4
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
new file mode 100644
index 000000000000..d9b1702231d1
--- /dev/null
+++ b/dev-lua/luadbi/Manifest
@@ -0,0 +1,4 @@
+AUX 0.5-r2-Makefile.patch 1785 BLAKE2B c626b6909496a48cf6d059028d882fba69947ceaf2cbb6b5f5ba8ce86ae7f31c240a4e502afb818a51144b97a63946859e1d3dd9396347a2a319f6fac71a1770 SHA512 c9eca24aac386d34dff68a61e538dd2c736569b62e1afc9b0ff2bad14f26c42d402ec1e0eba2f7e974d6e689c70f880c31cfbc955a4e2afa8ca4bebcd351ae58
+DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
+EBUILD luadbi-0.5-r5.ebuild 1806 BLAKE2B 04e53cad9497933fd81bdefead2de4093e8f8f778f4376a8da511e1af6d01a172f6b3d4a7d795e5797d92b2e74fc6b218d3376e79776a8053637f12770e623e3 SHA512 46a3f2a28f6cdbce7d89effa1a887e007ef360c6d73fd08d17361e43afd8f9dd87f287e4d67e95c1c64adeb4757b7870b2820c48524a02f54bd74dec7b741b5b
+MISC metadata.xml 243 BLAKE2B ae629fd9f0637db05afd7749d7ecef15baf33f716d7a6f9972214040c75ab219283b85aab2721d88ae59eb24040af1e744f75f39c6c0a1bd2ff5c007a24f5eb9 SHA512 05ffe6ac7acff76e9dced367bfd8033602835e047e01f8a87decf2a05ff548395e56f8a1d3be5388b61df32d6bb329725141a0d356efa2651a1c555d882219cc
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
new file mode 100644
index 000000000000..b37b3c00efe0
--- /dev/null
+++ b/dev-lua/luadbi/files/0.5-r2-Makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.orig	2013-02-01 13:34:54.490898002 +0400
++++ 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/luadbi-0.5-r5.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
new file mode 100644
index 000000000000..e1cdb2f76572
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -0,0 +1,63 @@
+# 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/metadata.xml b/dev-lua/luadbi/metadata.xml
new file mode 100644
index 000000000000..2ff9f66c8898
--- /dev/null
+++ b/dev-lua/luadbi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="google-code">luadbi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luadoc-3.0.1 b/dev-lua/luadoc-3.0.1
deleted file mode 100644
index 036baf808a29..000000000000
--- a/dev-lua/luadoc-3.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=LuaDoc is a documentation tool for Lua source code
-EAPI=0
-HOMEPAGE=http://luadoc.luaforge.net/
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.3 dev-lua/luafilesystem
-SLOT=0
-SRC_URI=http://luaforge.net/frs/download.php/3185/luadoc-3.0.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=92ad6f7107135e00c6cc4f1cfc1372f4
diff --git a/dev-lua/luadoc/Manifest b/dev-lua/luadoc/Manifest
new file mode 100644
index 000000000000..318fd2e2c44d
--- /dev/null
+++ b/dev-lua/luadoc/Manifest
@@ -0,0 +1,3 @@
+DIST luadoc-3.0.1.tar.gz 108824 BLAKE2B 52092feeb22cdcd7570ba5d54c57598d16688daba7c90d81dc975cfd2545c5e42e6f4b8f1bdc150c877f6b953cbb193d03d1a02f0ac48cfbc5cf1ec4a91b101c SHA512 413b40e72cc0699c00caf47fe3d7233c8619bfd6064eac001762bcb2ae0b21ccc6f800bd05566cd83924546e5616d1e5840d8bc20ec6d1f1c7a64910a9df6be2
+EBUILD luadoc-3.0.1.ebuild 773 BLAKE2B 5f2fc8303da461f90efa530936bf840de65439db22b88aee009c59e077af3700d2fff2c852bba0e9d2b171288baf7f69250717e126f05ea1d65192f22547d696 SHA512 f15db8a56c44a314f09ceadf54ded72f4356ab957193637c892c7f6d6c745399dc9e58354b0f83fe9a62a5ab863d48b1485e6ec58a4a8a2ffd766590a359e1c9
+MISC metadata.xml 527 BLAKE2B 90513513f29682f379946aea92ca66566f9d2000976da5c82b1f273d2af29fe34699b3fea4221b863a515bba0d7a51a4136cd643d268cdec4c62d664ef3f32b9 SHA512 4a3bf73e5b7e7bba048f0f8b251369c9d6e10c885817fd5a8293466df75bee548be3b34e55a5e448be2681ce5cfe1182850d1382f67104feea9886c30f88ad41
diff --git a/dev-lua/luadoc/luadoc-3.0.1.ebuild b/dev-lua/luadoc/luadoc-3.0.1.ebuild
new file mode 100644
index 000000000000..93cd498bdc02
--- /dev/null
+++ b/dev-lua/luadoc/luadoc-3.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit multilib
+DESCRIPTION="LuaDoc is a documentation tool for Lua source code"
+HOMEPAGE="http://luadoc.luaforge.net/"
+SRC_URI="http://luaforge.net/frs/download.php/3185/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/lua-5.1.3
+	dev-lua/luafilesystem"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "s|/usr/local|\$(DESTDIR)/usr|" \
+		-e "s|lib|$(get_libdir)|" \
+		-e "s|lua5.1|lua|" \
+		config || die
+
+	# lua-5.1.3
+	find . -name '*.lua' | xargs sed -i -e "s/gfind/gmatch/g" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+	dohtml -r doc/us/*
+}
diff --git a/dev-lua/luadoc/metadata.xml b/dev-lua/luadoc/metadata.xml
new file mode 100644
index 000000000000..fe12f6f53b37
--- /dev/null
+++ b/dev-lua/luadoc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    LuaDoc is a documentation generator tool for Lua source code.
+    It parses the declarations and documentation comments in a set of Lua
+    source files and produces a set of XHTML pages describing the commented
+    declarations and functions.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-lua/luaevent-0.4.3 b/dev-lua/luaevent-0.4.3
deleted file mode 100644
index 111de7ef5107..000000000000
--- a/dev-lua/luaevent-0.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/lua-5.1 >=dev-libs/libevent-1.4 virtual/pkgconfig
-DESCRIPTION=libevent bindings for Lua
-EAPI=5
-HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/lua-5.1 >=dev-libs/libevent-1.4
-SLOT=0
-SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.3.tar.gz -> luaevent-0.4.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=74ed2137471428b96e9af4a7983add9a
diff --git a/dev-lua/luaevent-0.4.4 b/dev-lua/luaevent-0.4.4
deleted file mode 100644
index c351c1d8d398..000000000000
--- a/dev-lua/luaevent-0.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/lua:0 dev-libs/libevent:0= virtual/pkgconfig
-DESCRIPTION=libevent bindings for Lua
-EAPI=5
-HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/lua:0 dev-libs/libevent:0=
-SLOT=0
-SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.4.tar.gz -> luaevent-0.4.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=63de2ca52bac70dd8a2d1dfe2e465e57
diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
new file mode 100644
index 000000000000..ad8d185ae858
--- /dev/null
+++ b/dev-lua/luaevent/Manifest
@@ -0,0 +1,5 @@
+DIST luaevent-0.4.3.tar.gz 29861 BLAKE2B aa1a2bf3ac708f012fc168616ac19deef55b805deff9e02464d089efa1fe88084103f3638a0443d6df0a699ab95730469f6d15107d4eb2dbcc112412a41a43d4 SHA512 5f02c9d40e59589a2b932b49d27230ca6650174feeda2cf412769c33af056c9df52d38fdd5fc12f0f6318b788e29a2deef54f11beb4becc48818edd27185f161
+DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea
+EBUILD luaevent-0.4.3.ebuild 1191 BLAKE2B 99a595eb5adf68dfd72ee311825c8aed2596a4e3ca482cc2c4756366382d5f9a49980307c1f39aa5c957d5c78745bc1f5155085c267ca700d81e46568d72d5ec SHA512 298532c28584d929254603633d5b4211fd9a4a95b7bd2900fab41124347a57fc84af7af1835d2e589d581f196ca8b448e8a298ab13bad41f78bf572e9a6b69dc
+EBUILD luaevent-0.4.4.ebuild 1186 BLAKE2B 3a96fed04d855495b4f5a90231b9be8f31b7090293acd52426c8e8cdd40870a9ff3ca294516bacdae8ff7b5b936ed89de9dac6612a3625c344ea111811ac6136 SHA512 260ee859714c53fdbed06cd1640a6e866a3bea5bb697256399b6016a6bb2e9a145fcc50d7d5e62844281a24f36db13157fae894b7174ac0d133ff3f0ffda6ff6
+MISC metadata.xml 398 BLAKE2B ac77d026de4e3bf021781616d336e8ee117193f5871fcb027e20dad5857d663b8ac4b463be0ab4eb2fabacee4fbc2921fc5fc96eab5909ab619e9a915573c13f SHA512 f452c9ca43d8558f9cd70c472c85cdf6a3a3e1e021783d82d062832c45844df0552b47ec4d6e1abe329f99fdb1c5cda1bb3e0b2e98900efca77e8feeeedf72e7
diff --git a/dev-lua/luaevent/luaevent-0.4.3.ebuild b/dev-lua/luaevent/luaevent-0.4.3.ebuild
new file mode 100644
index 000000000000..cd7a3d5f2bc5
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# 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-5.1
+	>=dev-libs/libevent-1.4"
+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 || die "Install failed"
+}
diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild
new file mode 100644
index 000000000000..45ed9117a1c5
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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 || die "Install failed"
+}
diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml
new file mode 100644
index 000000000000..1bedf880cb6c
--- /dev/null
+++ b/dev-lua/luaevent/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">harningt/luaevent</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/luaexpat-1.2.0-r1 b/dev-lua/luaexpat-1.2.0-r1
deleted file mode 100644
index d7cf6bb118ed..000000000000
--- a/dev-lua/luaexpat-1.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1[deprecated] dev-libs/expat virtual/pkgconfig
-DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
-EAPI=5
-HOMEPAGE=http://www.keplerproject.org/luaexpat/
-KEYWORDS=amd64 ~arm ~hppa ~mips x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1[deprecated] dev-libs/expat
-SLOT=0
-SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0c4a2c82cec90b755421cbe8aaf7d43
diff --git a/dev-lua/luaexpat-1.3.0-r1 b/dev-lua/luaexpat-1.3.0-r1
deleted file mode 100644
index a27856ae5c80..000000000000
--- a/dev-lua/luaexpat-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
-EAPI=5
-HOMEPAGE=http://www.keplerproject.org/luaexpat/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1a3944b361ecd0a24e07defed941514
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
new file mode 100644
index 000000000000..1f77b7153171
--- /dev/null
+++ b/dev-lua/luaexpat/Manifest
@@ -0,0 +1,6 @@
+AUX 1.2.0-destdir-ldflags.patch 982 BLAKE2B 5f6a6c6a8b57bc97e82f1912097701817f2c07c884e049cb535703652f11b4ae0f3c4c0924636d03bd6cdb64c276dd9cdc9a2af9593596ee39b89ad85683e0fd SHA512 59a222a343ebd04ef146dec4902bad12a0ad2920e680ff11acf31c08e075cd19a79b3430f823f72235e2a7d470afc3787ac92ad522263dae9340679b8fa239c0
+DIST luaexpat-1.2.0.tar.gz 28621 BLAKE2B d47a8c909d10afc103a48a8b4812a9afb15343a31e5106bfc9fa32c5cae2f0db7e1caeb65fd680852f1563dae682c328604f84aea3b7028d0472f08ad790823c SHA512 4f28e36fabcade14f9ae524b8aea19757ceaca9d4ad50c367fe8f58c14c3850efe252df780641159eeb01e96aaba38a9c9c6fe51d21f54a6c4ce33f80c87033f
+DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
+EBUILD luaexpat-1.2.0-r1.ebuild 1230 BLAKE2B 582a8fde2a508f4f21ef4d9936b8e55a9c2a2b68ae83003ec85501aac612d45c3046709a17ba7ba1292da428f932872f3980a304ba0555d1a52c1e7c5d27f2e3 SHA512 01f140836ef5b2f3a7c98cbd2bd2e48e3d86e7bc7535e7d5f8491c03f462e134fa6f0d64d5f309f61f5189bb60a3b9728f89843c2d15b7889ad82f25cf384380
+EBUILD luaexpat-1.3.0-r1.ebuild 1354 BLAKE2B 8c498512971eccbe0ba8efafa32c30ec89e765debaf5a4c3f84489a75dd591cfbf3e66102f1706d654371381f2c6c8f7340fa6cb175535bd350cdcf97c00c1bf SHA512 7b46f944d09ba4010f5d321a9b9eb8e6d23affd7e33cc2d03fe636f475b94753cef56dc2becda20576b6dd83ab92284bfc54bb0cacab9b374b7ff59b7fec792a
+MISC metadata.xml 228 BLAKE2B 6647e8693ddcece1ed5d215bc3502e0a16df0f2fedbf03c0dedac5b669bf0ca178284c69eae29b933f94ec58543c951e7d207d0d8a774fc7e4bfd64f3371ae74 SHA512 27499f64eb2cb593e91dd72dc5498d5df3ea7c4402e86897f79ef6fc7f040c6c09be497959af35ee54943f36ac228a6b92302b5d85763e4d0e96398670e81f45
diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
new file mode 100644
index 000000000000..754fe27c8419
--- /dev/null
+++ b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
@@ -0,0 +1,27 @@
+--- makefile.bak	2012-03-01 13:44:47.000000000 +0100
++++ makefile	2012-03-01 13:45:50.000000000 +0100
+@@ -12,17 +12,17 @@
+ lib: src/$(LIBNAME)
+ 
+ src/$(LIBNAME) : $(OBJS)
+-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
++	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(LDFLAGS) $(OBJS) -lexpat
+ 
+ $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
++	$(CC) -c $(CFLAGS) $(LDFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+ 
+ install:
+-	mkdir -p $(LUA_LIBDIR)
+-	cp src/$(LIBNAME) $(LUA_LIBDIR)
+-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+-	mkdir -p $(LUA_DIR)/$T
+-	cp src/$T/lom.lua $(LUA_DIR)/$T
++	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
++	cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
++	cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
++	mkdir -p $(DESTDIR)$(LUA_DIR)/$T
++	cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
+ 
+ clean:
+ 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..79fc45c14b42
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="http://www.keplerproject.org/luaexpat/"
+SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~mips x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1[deprecated]
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/config"
+	sed -i -e "s#^LUA_DIR=.*#LUA_DIR=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/config"
+	sed -i -e "s#^LUA_INC=.*#LUA_INC=$(pkg-config --variable INSTALL_INC lua)#" "${S}/config"
+	sed -i -e "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" "${S}/config"
+	sed -i -e "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" "${S}/config"
+	epatch "${FILESDIR}/${PV}-destdir-ldflags.patch"
+}
+
+src_compile() {
+	append-flags -fPIC
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) -shared"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+	dohtml -r doc/*
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..26b4cdecaef2
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib toolchain-funcs flag-o-matic eutils multilib-minimal
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="http://www.keplerproject.org/luaexpat/"
+SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	multilib_copy_sources
+
+	append-flags -fPIC
+}
+
+multilib_src_compile() {
+	emake \
+		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)"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		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)" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml -r doc/*
+}
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
new file mode 100644
index 000000000000..379d1734e2d3
--- /dev/null
+++ b/dev-lua/luaexpat/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-lua/luafilesystem-1.5.0 b/dev-lua/luafilesystem-1.5.0
deleted file mode 100644
index 6b99e40fc875..000000000000
--- a/dev-lua/luafilesystem-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/lua-5.1
-DESCRIPTION=File System Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=https://keplerproject.github.com/luafilesystem/
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1
-SLOT=0
-SRC_URI=mirror://github/keplerproject/luafilesystem/luafilesystem-1.5.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c0cbb6d9438c3189b102ef15b5374bdc
diff --git a/dev-lua/luafilesystem-1.6.2 b/dev-lua/luafilesystem-1.6.2
deleted file mode 100644
index 770365c6b292..000000000000
--- a/dev-lua/luafilesystem-1.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/lua-5.1
-DESCRIPTION=File System Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=https://keplerproject.github.com/luafilesystem/
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1
-SLOT=0
-SRC_URI=mirror://github/keplerproject/luafilesystem/luafilesystem-1.6.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f6a6db456b896a6cb3ec2769dd070de4
diff --git a/dev-lua/luafilesystem-1.6.3 b/dev-lua/luafilesystem-1.6.3
deleted file mode 100644
index ca7bf8681c64..000000000000
--- a/dev-lua/luafilesystem-1.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1 ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig
-DESCRIPTION=File System Library for the Lua Programming Language
-EAPI=6
-HOMEPAGE=https://keplerproject.github.io/luafilesystem/
-IUSE=luajit
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1 ) luajit? ( dev-lang/luajit:2 )
-SLOT=0
-SRC_URI=https://github.com/keplerproject/luafilesystem/archive/v1_6_3.tar.gz -> luafilesystem-1.6.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=364b3e2570438baa46e27ddf7f165710
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
new file mode 100644
index 000000000000..41ae8dc0d153
--- /dev/null
+++ b/dev-lua/luafilesystem/Manifest
@@ -0,0 +1,7 @@
+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
+EBUILD luafilesystem-1.5.0.ebuild 791 BLAKE2B 6a7afcc5813045631d933abf2932d123e15c457bb014eff30c8c0a464a3be60ccadea38088d2d491f2bcd69d6d8ef1cadd1c3dc63653237d4634c9a266bc33a5 SHA512 687ca25601f8fe1822576be9c3724ece8562cca30c79c37f01da4378f7faec59731ddf7364ee10a5f4674c9d2c16a6ae440836168dbe77b1c1cbf1f17f220291
+EBUILD luafilesystem-1.6.2.ebuild 768 BLAKE2B 3493601326a2813f4ee4d7678d3bb27e28be66754fa5afc311e06a1d6710cc6df0da558e55d107577f9bbf73600fb43d8afe7a2e461180c2d4791fcd90bbf8a8 SHA512 36bb54693cf2d0dece4a8e704ac43cc18a58b9b9b0e3b2eefec074a1e7be6d34e1069f004afbc1fa806196714f29ffb6ec9eb0f9c054526bd880d31b95333aa1
+EBUILD luafilesystem-1.6.3.ebuild 1147 BLAKE2B 2bad1e87b63a1c8daede9e36281af7d0c0938a7221b2377fa45ea4aea4de2c810b1b18abe9160dc29be24b52c8c5d2efd53f3f55f6270b1fc0809a940d9fd346 SHA512 c4e6d64baf2132fd2de7a44b9fb82b3256ca8f819192a865f49c7e3f8c452766f5eb506b64046be006c9dd45681512880a431f86a8702386ca9f0e8af63eba15
+MISC metadata.xml 526 BLAKE2B 0c439a926e2d4658ac91b70fde013330186edc0978772dd636d88cc332fd536c38ebe26f4d4ccaad0a3397434d699bc55249cf0feb199546681540379a69ee14 SHA512 4625115566950198cede510f5db34531fe6c0ec55d449868f5d99ff524223a5bb0d666197ffdb3bd22c887db26041022956d8cee361e2bb31a2add67c4902a22
diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
new file mode 100644
index 000000000000..f93c58976e06
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# 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="mirror://github/keplerproject/luafilesystem/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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 || die
+	dodoc README || die
+	dohtml doc/us/* || die
+}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
new file mode 100644
index 000000000000..9995175daabd
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
@@ -0,0 +1,33 @@
+# 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="mirror://github/keplerproject/luafilesystem/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+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
new file mode 100644
index 000000000000..2b0ac49cf730
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~x86-fbsd"
+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/metadata.xml b/dev-lua/luafilesystem/metadata.xml
new file mode 100644
index 000000000000..59f1123dc93b
--- /dev/null
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+	</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.
+
+		LuaFileSystem offers a portable way to access the underlying directory
+		structure and file attributes.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/luajson-1.3.2 b/dev-lua/luajson-1.3.2
deleted file mode 100644
index 71b8520db8fe..000000000000
--- a/dev-lua/luajson-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=test? ( dev-lua/luafilesystem )
-DESCRIPTION=JSON Parser/Constructor for Lua
-EAPI=5
-HOMEPAGE=https://www.eharning.us/wiki/luajson/
-IUSE=test
-KEYWORDS=amd64 ~arm hppa ~mips x86
-LICENSE=MIT
-RDEPEND=|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) dev-lua/lpeg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/harningt/luajson/archive/1.3.2.tar.gz -> luajson-1.3.2.tar.gz
-_md5_=9c418d0cc266a826eba5c29689855cbb
diff --git a/dev-lua/luajson-1.3.3 b/dev-lua/luajson-1.3.3
deleted file mode 100644
index bcbce3eb4db6..000000000000
--- a/dev-lua/luajson-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=test? ( dev-lua/luafilesystem )
-DESCRIPTION=JSON Parser/Constructor for Lua
-EAPI=5
-HOMEPAGE=https://www.eharning.us/wiki/luajson/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) dev-lua/lpeg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/harningt/luajson/archive/1.3.3.tar.gz -> luajson-1.3.3.tar.gz
-_md5_=2ca04c4591063c83db2f4cf14bfdc796
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
new file mode 100644
index 000000000000..5beb30c0a918
--- /dev/null
+++ b/dev-lua/luajson/Manifest
@@ -0,0 +1,5 @@
+DIST luajson-1.3.2.tar.gz 42139 BLAKE2B 6c8557d0a01c7c4fa3fab325f2efaeb1a7199d193be8cea255881028102dbcae78c6e7ac50ba4d6a5cd9560767e3e4997b7acf348321336eca81140b64564cf0 SHA512 502fc5b221128b1af291619ffaebdfc8bb4ee6bbfd041b6e18974aee09c3e73fe0aaaf650bbded818f690c332cb1f74de3e28f11ac2b5f18b751bc6259a07633
+DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
+EBUILD luajson-1.3.2.ebuild 682 BLAKE2B 2157f0615bb0055660dc883178fea7c3d9e6729c7d08d98b352134c435067b3a770767f0b794b395ea3ec0202f04626a682d070e6706c480f2d9706c3b037ee7 SHA512 86cb9beab05981538a8298ce4e5c8b97442ae495209fcc7defe806bdd535471f0ab3f97b10abfc89870ce3dc767a88827809130847af5ab0a924b5e61aa945d1
+EBUILD luajson-1.3.3.ebuild 708 BLAKE2B 7ccacb9ef4a878d6e04fff805a7a55aae67fe2e9c69c1db9e43df6ce952940befb5dd01f4a85eecda65042a20b67b6c7baa71123ef83bdd9202fb108540ae2a6 SHA512 1dc490b724fd26cd4c1d1536716aa01915a5324afeb231a3c2ed653317b7d9c3a4c4a8ed1a141690313013f4a572cf4779d57dce5fb7b16075677c445a520e70
+MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c
diff --git a/dev-lua/luajson/luajson-1.3.2.ebuild b/dev-lua/luajson/luajson-1.3.2.ebuild
new file mode 100644
index 000000000000..cee2aa1cf414
--- /dev/null
+++ b/dev-lua/luajson/luajson-1.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="JSON Parser/Constructor for Lua"
+HOMEPAGE="https://www.eharning.us/wiki/luajson/"
+SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~mips x86"
+IUSE="test"
+
+RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+	dev-lua/lpeg"
+DEPEND="test? ( dev-lua/luafilesystem )"
+
+# lunit not in the tree yet
+RESTRICT="test"
+
+# nothing to compile
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt
+}
diff --git a/dev-lua/luajson/luajson-1.3.3.ebuild b/dev-lua/luajson/luajson-1.3.3.ebuild
new file mode 100644
index 000000000000..f38c914fbd8a
--- /dev/null
+++ b/dev-lua/luajson/luajson-1.3.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="JSON Parser/Constructor for Lua"
+HOMEPAGE="https://www.eharning.us/wiki/luajson/"
+SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86"
+IUSE="test"
+
+RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
+	dev-lua/lpeg"
+DEPEND="test? ( dev-lua/luafilesystem )"
+
+# lunit not in the tree yet
+RESTRICT="test"
+
+# nothing to compile
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt
+}
diff --git a/dev-lua/luajson/metadata.xml b/dev-lua/luajson/metadata.xml
new file mode 100644
index 000000000000..1bb1a0290ad3
--- /dev/null
+++ b/dev-lua/luajson/metadata.xml
@@ -0,0 +1,8 @@
+<?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">harningt/luajson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/lualdap-1.2.0 b/dev-lua/lualdap-1.2.0
deleted file mode 100644
index b43ea7d68b8f..000000000000
--- a/dev-lua/lualdap-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lang/lua:* net-nds/openldap net-nds/openldap virtual/pkgconfig
-DESCRIPTION=Simple interface from Lua to OpenLDAP
-EAPI=5
-HOMEPAGE=https://git.zx2c4.com/lualdap/about/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua:* net-nds/openldap
-SLOT=0
-SRC_URI=https://git.zx2c4.com/lualdap/snapshot/lualdap-1.2.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e7964b2e1d531e17c4e2b054de1fa77
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
new file mode 100644
index 000000000000..4313ab8e63fd
--- /dev/null
+++ b/dev-lua/lualdap/Manifest
@@ -0,0 +1,3 @@
+DIST lualdap-1.2.0.tar.xz 12380 BLAKE2B 42bf8633a5ccd60f6082b8729b9ba77c8f5486a7bab6cf727fc011856fec244de9f0fa96dd53c23a3fb5932a1670bbb621739c965618671c2c856c41e3faffbb SHA512 02cd3089dc6ca1f60957fa4733dae3cbfb2e13c25b068ddeb51b059701278eb86e359d56a6ef1df28cf514193311323255b36ff036bafda9fcbae0676d90a238
+EBUILD lualdap-1.2.0.ebuild 480 BLAKE2B d7f2260aa801536ec51588632cb09200d7e1c36569224e6670f2fc2d23f673e31fc3243e1446f2459039072fd2c191e3651a73fe0eadb4f449127137ce5afc30 SHA512 0f4f9b83bf358463ed1d9c6484487bd70467ad72d2bacc25dfbb22a9d6a69732673c0d0856c05228561c74b894223cda9459f9eda67826a726f6d6fe3a0e14c4
+MISC metadata.xml 356 BLAKE2B 0f578759801098220f27f47d45f12ffaf8b354c28323ac8fecbc38a52fd69464458eade8a95884093fd68e3c4dccc1e7a26c12c9a8a36a374cd8b7d63647988f SHA512 7d3ae5848accbb89d176bad4960ef96272151ff2b6ae02c1f32608216a19b461a9bcfd8c27a7ea755ef531969404e1e8865b4d9e81c8d292e2e482419d9140d5
diff --git a/dev-lua/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild
new file mode 100644
index 000000000000..38007f295ddf
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_PN="LuaLDAP"
+
+DESCRIPTION="Simple interface from Lua to OpenLDAP"
+HOMEPAGE="https://git.zx2c4.com/lualdap/about/"
+SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-lang/lua:* net-nds/openldap"
+DEPEND="${RDEPEND}
+	net-nds/openldap
+	virtual/pkgconfig"
diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
new file mode 100644
index 000000000000..485a025884ba
--- /dev/null
+++ b/dev-lua/lualdap/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-lua/luaossl-20150727 b/dev-lua/luaossl-20150727
deleted file mode 100644
index 5f7de1b12996..000000000000
--- a/dev-lua/luaossl-20150727
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
-DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
-EAPI=5
-HOMEPAGE=https://github.com/wahern/luaossl
-IUSE=luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
-SLOT=0
-SRC_URI=https://github.com/wahern/luaossl/archive/rel-20150727.tar.gz -> luaossl-20150727.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf95b176765fb740e6c3611626a70311
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
new file mode 100644
index 000000000000..6d5201b4eb01
--- /dev/null
+++ b/dev-lua/luaossl/Manifest
@@ -0,0 +1,3 @@
+DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f381496837924ce999a58a4528a46b1b43fdd7b14041bab2a4536c89a37c6f31926f353d1bb1997e9ffd57ab6e2cfb83b6ef SHA512 de565ff7b9ac07493e771045b05902dd64e8b6c458180dd03d08cf900067d1b9cb88385c69dc29fb45774e4ec36b563cab705b34d37cec2f5cc792cf4f7b5049
+EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9
+MISC metadata.xml 245 BLAKE2B 3de0e2bf54d5109317127196b0ebfe42b637b6e6cf6fbf82a5f2e7b8a45e2fbe46a7984b99354e626ff06849528bba05d63b46f9248e67e201573d46cda4dac4 SHA512 9d0d12e3741c2df573672c630a1d6d617beda53f531b5413a24ddb5fe8d8ee827998a85b95bf90ecad1f2a9ceccb229d9b37af41ea567961743471f52913c5a6
diff --git a/dev-lua/luaossl/luaossl-20150727.ebuild b/dev-lua/luaossl/luaossl-20150727.ebuild
new file mode 100644
index 000000000000..b0a610625a0f
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-20150727.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
+HOMEPAGE="https://github.com/wahern/luaossl"
+SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	dev-libs/openssl:0[-bindist]
+	!dev-lua/lua-openssl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-rel-${PV}"
+
+src_prepare() {
+	local version_var=
+	local engine=
+
+	use luajit && engine=luajit || engine=lua
+	use luajit && version_var=abiver || version_var=V
+
+	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=${version_var} ${engine})"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
+}
diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
new file mode 100644
index 000000000000..581bc911a605
--- /dev/null
+++ b/dev-lua/luaossl/metadata.xml
@@ -0,0 +1,8 @@
+<?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">wahern/luaossl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luaposix-33.4.0 b/dev-lua/luaposix-33.4.0
deleted file mode 100644
index cabb6411ff93..000000000000
--- a/dev-lua/luaposix-33.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lang/lua:0=
-DESCRIPTION=Bindings for POSIX APIs
-EAPI=6
-HOMEPAGE=https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=public-domain
-RDEPEND=dev-lang/lua:0=
-SLOT=0
-SRC_URI=https://github.com/luaposix/luaposix/archive/release-v33.4.0.tar.gz -> luaposix-33.4.0.tar.gz
-_md5_=c31ce18de6ea2c29d82c0d758e73a9dd
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
new file mode 100644
index 000000000000..29297f21a286
--- /dev/null
+++ b/dev-lua/luaposix/Manifest
@@ -0,0 +1,3 @@
+DIST luaposix-33.4.0.tar.gz 643523 BLAKE2B e407363eb6410d2636024371a169eefe8d0bc633b9fcbad6c2e7edb413b4aa0fc681e94b35c9ea39a561ecdcf225af1033ded1c67d87cd57bed2ba3e0d795aab SHA512 3cb78ccb343a55e2bf5b182410e2050356379e8f7a86d42a79853db6198628cae85f9984854f99f41505cb7e4fbb5288e4a46633a6db459649837729af76044c
+EBUILD luaposix-33.4.0.ebuild 504 BLAKE2B a386c0b35a471baaed4274848ee0f890fb567a4b07ba3f7f0ed1b560443a8cf39a0e5c555a209f21593d010328ee5e2e67fd750e846a16fd440170e47c1f45a8 SHA512 8ea7799d5a73379cfb3b56e3ba78a2409e9dfc1d8228b31649afb301fc49a26504e36d94f2c4df0516bb3b21b49c7555c4e30e3bfc8e21eac0a2bc1561725586
+MISC metadata.xml 326 BLAKE2B 9985432a4cfc1719f956327c3f28d1d77d9461f59c33ec12de0c3899a0b691674f0eb5f3f607668057e115930e134b5a20b8f58915fb4b97bba20bec7d80d38b SHA512 7bfd1897ea30cde9c29058a0f2c13f9cd32a954f01056ff7029e7df57049504dbf3ba692aeb3a2a2777966f53817e2a695c91ae9ae47517b6cc2b6bd60357042
diff --git a/dev-lua/luaposix/luaposix-33.4.0.ebuild b/dev-lua/luaposix/luaposix-33.4.0.ebuild
new file mode 100644
index 000000000000..ba2e3aea549f
--- /dev/null
+++ b/dev-lua/luaposix/luaposix-33.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bindings for POSIX APIs"
+HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
+SRC_URI="https://github.com/luaposix/luaposix/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/lua:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}-release-v${PV}
diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml
new file mode 100644
index 000000000000..686aaf5c3d7a
--- /dev/null
+++ b/dev-lua/luaposix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">luaposix/luaposix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luarocks-2.0.12 b/dev-lua/luarocks-2.0.12
deleted file mode 100644
index b9c9e0c8866c..000000000000
--- a/dev-lua/luarocks-2.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl )
-DESCRIPTION=A deployment and management system for Lua modules
-EAPI=4
-HOMEPAGE=http://www.luarocks.org
-IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=MIT
-RDEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl ) app-arch/unzip
-SLOT=0
-SRC_URI=http://luarocks.org/releases/luarocks-2.0.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=167451fdbeea5706c377cfa620e9ed67
diff --git a/dev-lua/luarocks-2.0.7.1 b/dev-lua/luarocks-2.0.7.1
deleted file mode 100644
index 9bd0c7f1ca79..000000000000
--- a/dev-lua/luarocks-2.0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl )
-DESCRIPTION=A deployment and management system for Lua modules
-EAPI=4
-HOMEPAGE=http://www.luarocks.org
-IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=MIT
-RDEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl ) app-arch/unzip
-SLOT=0
-SRC_URI=http://luarocks.org/releases/luarocks-2.0.7.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=177e898e5f3bb65f9311436ebb7468e4
diff --git a/dev-lua/luarocks-2.0.8 b/dev-lua/luarocks-2.0.8
deleted file mode 100644
index 6630d6f45f52..000000000000
--- a/dev-lua/luarocks-2.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl )
-DESCRIPTION=A deployment and management system for Lua modules
-EAPI=4
-HOMEPAGE=http://www.luarocks.org
-IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=MIT
-RDEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl ) app-arch/unzip
-SLOT=0
-SRC_URI=http://luarocks.org/releases/luarocks-2.0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=806dae19d89d21f382e183ecc3a7bfe5
diff --git a/dev-lua/luarocks-2.2.0 b/dev-lua/luarocks-2.2.0
deleted file mode 100644
index 91c5cca12184..000000000000
--- a/dev-lua/luarocks-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl )
-DESCRIPTION=A deployment and management system for Lua modules
-EAPI=4
-HOMEPAGE=http://www.luarocks.org
-IUSE=curl openssl
-KEYWORDS=amd64 ~ppc x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl ) app-arch/unzip
-SLOT=0
-SRC_URI=http://luarocks.org/releases/luarocks-2.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fcb30cfe2953e12ed9a0c548869fe789
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
new file mode 100644
index 000000000000..fa08223029ed
--- /dev/null
+++ b/dev-lua/luarocks/Manifest
@@ -0,0 +1,9 @@
+DIST luarocks-2.0.12.tar.gz 89028 BLAKE2B 66d06696483f6550421acb8e6834b082f06c5bc0088f730b0316db72725ce5c5ebaf0956a7c84f18b03beafaa6e7c558387025ba9ac701c8b8f7f64fa5557e11 SHA512 5ece403d7bc7804ff47ec8d0ecdea7687d530d10ddf0a800c4a2a68b69a263e68f40ab7e55e39a59ab05315d3e2bc9cf76a0618803dc8e12c7e52941b4a7053f
+DIST luarocks-2.0.7.1.tar.gz 81757 BLAKE2B 2b279fd1302e56eaaa5e5b32f4be37cb1fe21ed5b495aae4014903a5f5e87f198e05f8c2a59fba900ff15f26ec76587b5b8114f6bdf3cdf81d5e59795ffbf792 SHA512 00f37c2baed83bbc7182a4595973bbe5c252fd7f530ebc35ba254fab727c1e6a7f743bafc25bfbde945e40d531f0e764c1f785edddef62fc6219e318bffdc6f3
+DIST luarocks-2.0.8.tar.gz 82313 BLAKE2B e27071c1ef6cf9b4182d8100d76c93e86c606b4ccc62be8e883cdfe7e39de900bef100f1e1a9274cfcae58218768b58a1d1189a0a15696091909b77a83a9ed5f SHA512 8246b3a863197bc5bd9efad343f8f5ba22d7a34904fd3afe99f916631ee30930ec91d15298e67abf22f0bcc6cda02785a5bbc9e60b424a631162e20941d20523
+DIST luarocks-2.2.0.tar.gz 111549 BLAKE2B 214c1c03e03f95ca1acfc1fda863895c91c508221c615fe3ccc064e9adbcaa8549d24ff788141c0093259ca52578fadccfb3f6891209f86336c57937ac5ec32d SHA512 41f32e383263485758e64df661ecfbd744369035362755c64466f2c52a8740ed941b80cab3212222d7d24e4b1a7ed9ccb84fa66c8e458526056af0b06d97224f
+EBUILD luarocks-2.0.12.ebuild 1261 BLAKE2B 09477d04b53cacd26844767717db106a92b244fb6fff12b88ceb5571d2d7be14aa0530b337a2c8d2fc570344443d72ab3e005c1c43989bd306f08bcb4e0c16e5 SHA512 afee82a2ed8bcfd6596879b8ab0c6b624e9d5610eaf4dabeb74450e7df3046a28975f9aef6d04b4e2b44c2a039ba0a72531dc773d9730a197e0556b4619fd832
+EBUILD luarocks-2.0.7.1.ebuild 1204 BLAKE2B d6644c5e6026e70e64746e999cdb8010b31edd2bd2d21ab8850ea90c0b21811b251570b88a7fad4192c7dd0ff4eb8f17278691df22c1030d9b72cf2d9990ac02 SHA512 a9bbb4061cee1e27bdfb306392409a29982345e643ef20804cb4d9b0468d907c310b5852f5434533e3946b37a7a4b0370c1f6fcfc5eaf42386ec03831893d869
+EBUILD luarocks-2.0.8.ebuild 1276 BLAKE2B 8d3ec5b76d419cd4a2fd61167d11d8915f8be32a869efd37c5e7670c19d64dea5f842feb8034614bccc29e4cb66baeb928aa3b29d837a329e531010610da34e4 SHA512 843cfe8db6ae3e771ee8178b5c78e5a926dfe3330f9f4fba682157e2dd4a99a26887ca85e6b0a9e2c2c617875c5f7b60b66a1e3c252cf8ed0a60feed4d8d5504
+EBUILD luarocks-2.2.0.ebuild 1259 BLAKE2B 4f9ef26696091ffd0601df4f834d20227a092e7be255f2c9b9a659da1f343a2b8863c561272fa6b97234f8ff74b17e563388d826e35039ab1573644623a96020 SHA512 a91f1039f43aab50f23eea40d13270bb804981af82b4e2649d3b7c8d206924fa0f5c4e9bce71dfaabd57ce524e07481e4c38acffae72f633a9ad25e700ca24bb
+MISC metadata.xml 490 BLAKE2B d382db4c716bec8c5a8bda5441241069bc92fa8e772ca64d815d16caad6a73754cad42e6d97d6df9247e342eaf597ce07b5cf21fb8ae69b8910f7d95d57856cf SHA512 48050b50c81716c3d43daab16338f22bf05bdfd3b3eff2eeb69b0081527a802b982d9006955039b66ca5cc8cbb057d59c579c922a31abc152bff74b398384021
diff --git a/dev-lua/luarocks/luarocks-2.0.12.ebuild b/dev-lua/luarocks/luarocks-2.0.12.ebuild
new file mode 100644
index 000000000000..6388ebadd599
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-2.0.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+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="~x86 ~amd64 ~ppc"
+IUSE="curl openssl"
+
+DEPEND="dev-lang/lua
+		curl? ( net-misc/curl )
+		openssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+		app-arch/unzip"
+
+src_configure() {
+	USE_MD5="md5sum"
+	USE_FETCH="wget"
+	use openssl && USE_MD5="openssl"
+	use curl && USE_FETCH="curl"
+
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix=/usr \
+			--with-lua-lib=/usr/$(get_libdir) \
+			--rocks-tree=/usr/$(get_libdir)/lua/luarocks \
+			--with-downloader=$USE_FETCH \
+			--with-md5-checker=$USE_MD5 \
+			|| die "configure failed"
+}
+
+src_compile() {
+	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
+	emake DESTDIR="${D}" -j1 || die "make failed"
+}
+
+src_install() {
+	# -j1 b/c otherwise it fails to find src/bin/luarocks
+	emake DESTDIR="${D}" -j1 install || die "einstall"
+}
+
+pkg_preinst() {
+	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
+}
diff --git a/dev-lua/luarocks/luarocks-2.0.7.1.ebuild b/dev-lua/luarocks/luarocks-2.0.7.1.ebuild
new file mode 100644
index 000000000000..49bbaec0dc7f
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-2.0.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+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="~x86 ~amd64 ~ppc"
+IUSE="curl openssl"
+
+DEPEND="dev-lang/lua
+		curl? ( net-misc/curl )
+		openssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+		app-arch/unzip"
+
+src_configure() {
+	USE_MD5="md5sum"
+	USE_FETCH="wget"
+	use openssl && USE_MD5="openssl"
+	use curl && USE_FETCH="curl"
+
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix=/usr \
+			--with-lua-lib=/usr/$(get_libdir) \
+			--rocks-tree=/usr/$(get_libdir)/lua/luarocks \
+			--with-downloader=$USE_FETCH \
+			--with-md5-checker=$USE_MD5 \
+			--force-config || die "configure failed"
+}
+
+src_compile() {
+	emake DESTDIR="${D}" || die "make failed"
+}
+
+src_install() {
+	# -j1 b/c otherwise it fails with to find src/bin/luarocks
+	emake DESTDIR="${D}" -j1 install || die "einstall"
+}
+
+pkg_preinst() {
+	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
+}
diff --git a/dev-lua/luarocks/luarocks-2.0.8.ebuild b/dev-lua/luarocks/luarocks-2.0.8.ebuild
new file mode 100644
index 000000000000..ba04b9c27365
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-2.0.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+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="~x86 ~amd64 ~ppc"
+IUSE="curl openssl"
+
+DEPEND="dev-lang/lua
+		curl? ( net-misc/curl )
+		openssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+		app-arch/unzip"
+
+src_configure() {
+	USE_MD5="md5sum"
+	USE_FETCH="wget"
+	use openssl && USE_MD5="openssl"
+	use curl && USE_FETCH="curl"
+
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix=/usr \
+			--with-lua-lib=/usr/$(get_libdir) \
+			--rocks-tree=/usr/$(get_libdir)/lua/luarocks \
+			--with-downloader=$USE_FETCH \
+			--with-md5-checker=$USE_MD5 \
+			--force-config || die "configure failed"
+}
+
+src_compile() {
+	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
+	emake DESTDIR="${D}" -j1 || die "make failed"
+}
+
+src_install() {
+	# -j1 b/c otherwise it fails to find src/bin/luarocks
+	emake DESTDIR="${D}" -j1 install || die "einstall"
+}
+
+pkg_preinst() {
+	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
+}
diff --git a/dev-lua/luarocks/luarocks-2.2.0.ebuild b/dev-lua/luarocks/luarocks-2.2.0.ebuild
new file mode 100644
index 000000000000..a64514f182e2
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+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 x86"
+IUSE="curl openssl"
+
+DEPEND="dev-lang/lua
+		curl? ( net-misc/curl )
+		openssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+		app-arch/unzip"
+
+src_configure() {
+	USE_MD5="md5sum"
+	USE_FETCH="wget"
+	use openssl && USE_MD5="openssl"
+	use curl && USE_FETCH="curl"
+
+	# econf doesn't work b/c it passes variables the custom configure can't
+	# handle
+	./configure \
+			--prefix=/usr \
+			--with-lua-lib=/usr/$(get_libdir) \
+			--rocks-tree=/usr/$(get_libdir)/lua/luarocks \
+			--with-downloader=$USE_FETCH \
+			--with-md5-checker=$USE_MD5 \
+			|| die "configure failed"
+}
+
+src_compile() {
+	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
+	emake DESTDIR="${D}" -j1 || die "make failed"
+}
+
+src_install() {
+	# -j1 b/c otherwise it fails to find src/bin/luarocks
+	emake DESTDIR="${D}" -j1 install || die "einstall"
+}
+
+pkg_preinst() {
+	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
+}
diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
new file mode 100644
index 000000000000..b813073127f7
--- /dev/null
+++ b/dev-lua/luarocks/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </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>
+</pkgmetadata>
diff --git a/dev-lua/luasec-0.5.1 b/dev-lua/luasec-0.5.1
deleted file mode 100644
index fc46c8854bce..000000000000
--- a/dev-lua/luasec-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) virtual/pkgconfig
-DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
-EAPI=5
-HOMEPAGE=https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/
-IUSE=libressl
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )
-SLOT=0
-SRC_URI=https://github.com/brunoos/luasec/archive/luasec-0.5.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08ddc8e0eadb734780a39fbc57eb289f
diff --git a/dev-lua/luasec-0.6 b/dev-lua/luasec-0.6
deleted file mode 100644
index aa45ecf35a82..000000000000
--- a/dev-lua/luasec-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) virtual/pkgconfig
-DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
-EAPI=5
-HOMEPAGE=https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/
-IUSE=libressl
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )
-SLOT=0
-SRC_URI=https://github.com/brunoos/luasec/archive/luasec-0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d6985fdaebafc048c32cfc5f778c863
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
new file mode 100644
index 000000000000..166588550244
--- /dev/null
+++ b/dev-lua/luasec/Manifest
@@ -0,0 +1,6 @@
+AUX luasec-0.5.1-compdefine.patch 854 BLAKE2B 56099515a5d743a71c01e50f7e45d3d59b1a7eae842b64d40364e976473b682b035555e8df30ed7946ba1927d6b79555e15b886c49fe471f3facb248ec4e149f SHA512 b5b406ca48f505a840e99731eda9d2f8f5b6651f6ba196e47ee2a449b1e94bd390b6fc8eadce40e9ddefed52fc939bdfaac3a634db302f9e09e01672e3161d72
+DIST luasec-0.5.1.tar.gz 46820 BLAKE2B 3b3d33c59c6817a810bb4ab5968657e29d123d5496e9ba28f03636ce389b99fb1e7724d9f2531fc651c86c8252a08973e76ae65ee5ab551cfe4d450519982053 SHA512 c7c92c79d0ec3e12b69f88d810a19397eaf570957d1f13b9695ee435cb6f0f9c31f5bc20a7252aac93d18eed98a5d3fc8a181cd85845a704e469055f215609a8
+DIST luasec-0.6.tar.gz 51071 BLAKE2B d10761399e074eaa657abad2788936296a6fd33db64291663e385b21fc4a4a19ff96fe1a88db9805a3794406f08c597a03c048cfc8675949baf9eaa9368b8b7f SHA512 f7004a329153d0126a3ea27b4986e9d83fb8f2de9c5c2f0c96427c50cc42e1252c69fd8cc69e2e8d423745d2dbfdb5a781b609938f7f502c7aedeb99fd0778cd
+EBUILD luasec-0.5.1.ebuild 1081 BLAKE2B efb926c4f933bbddd415e583601f9b7cd8b33a6fcf377003b9390f02e853a26b937a540b97eb26969fc79ac12b96aeb929104fa7e91d882028bcd4f4fac33f71 SHA512 38eaacb4cbaa94f5549e0e6990fcc8c596428d30f901eb36b1f96bdf010a894983ad572d942d3692f131766dfb19ad99ebca289c043ddc4c1dc211ba5065b367
+EBUILD luasec-0.6.ebuild 1027 BLAKE2B d9aa030c4b22570fc58f43b1a2ccdb8efbf11d02913fe957dcb9ab65efc75f8a5909aade97b4bee5c5d3844321a28903dac4f38368eb8825869ffe28201fc2af SHA512 e8fb6764d9d480048edd2ae1ad68aa730e99c6f7b3839fd7f2dd2577bf162b194fca1093f9432657acbf5535c706b60a78cdaaf66884d30b1ee32ef09828d827
+MISC metadata.xml 311 BLAKE2B af896b539ce840176bc39318cd4fb37c32159103bca6ac35afa80b9aace5a2668a5cfda1c5b43862181ea4ad12673f2858d61b99c5f5bb7258061e4b8275eec8 SHA512 f309e681ac9e07c650fec4685d93a513764277ac6cb830ff1de36620ec4348cfe578776adecb18475bb1e32ba4d41ed4e6d15b74e20e8bb4e4c2450cb753aaf3
diff --git a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
new file mode 100644
index 000000000000..951b6fb11dbf
--- /dev/null
+++ b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
@@ -0,0 +1,36 @@
+diff -ru luasec-0.5.1/src/ssl.c luasec-0.5.1-fixed/src/ssl.c
+--- luasec-0.5.1/src/ssl.c	2015-11-20 22:39:32.000000000 +0100
++++ luasec-0.5.1-fixed/src/ssl.c	2016-03-02 15:48:09.439005988 +0100
+@@ -395,24 +395,30 @@
+   }
+   return 1;
+ }
+-  
++
+ /**
+  * Return the compression method used.
+  */
+ static int meth_compression(lua_State *L)
+ {
++#if !defined(OPENSSL_NO_COMP)
+   const COMP_METHOD *comp;
++#endif
+   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
+   if (ssl->state != LSEC_STATE_CONNECTED) {
+     lua_pushnil(L);
+     lua_pushstring(L, "closed");
+     return 2;
+   }
++#if !defined(OPENSSL_NO_COMP)
+   comp = SSL_get_current_compression(ssl->ssl);
+   if (comp)
+     lua_pushstring(L, SSL_COMP_get_name(comp));
+   else
+     lua_pushnil(L);
++#else
++  lua_pushnil(L);
++#endif
+   return 1;
+ }
+ 
+Only in luasec-0.5.1-fixed/src: ssl.c.orig
diff --git a/dev-lua/luasec/luasec-0.5.1.ebuild b/dev-lua/luasec/luasec-0.5.1.ebuild
new file mode 100644
index 000000000000..f8cdd3945dd0
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
+SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="libressl"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0[deprecated]
+	dev-lua/luasocket
+	!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	sed -i -e "s#^LUAPATH.*#LUAPATH=$(pkg-config --variable INSTALL_LMOD lua)#"\
+		-e "s#^LUACPATH.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" Makefile || die
+	sed -i -e "s/-O2//" src/Makefile || die
+	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
+	epatch "${FILESDIR}/${PN}-0.5.1-compdefine.patch"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		linux
+}
diff --git a/dev-lua/luasec/luasec-0.6.ebuild b/dev-lua/luasec/luasec-0.6.ebuild
new file mode 100644
index 000000000000..40f367fc02d4
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
+SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0[deprecated]
+	dev-lua/luasocket
+	!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	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)" \
+		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/metadata.xml b/dev-lua/luasec/metadata.xml
new file mode 100644
index 000000000000..7d74356af05a
--- /dev/null
+++ b/dev-lua/luasec/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">brunoos/luasec</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/luasocket-3.0_rc1-r3 b/dev-lua/luasocket-3.0_rc1-r3
deleted file mode 100644
index c1087bae9cb0..000000000000
--- a/dev-lua/luasocket-3.0_rc1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Networking support library for the Lua language
-EAPI=5
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0567c9c5ac99fbe9ee25fb012b7be326
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
new file mode 100644
index 000000000000..7f88682a9313
--- /dev/null
+++ b/dev-lua/luasocket/Manifest
@@ -0,0 +1,3 @@
+DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
+EBUILD luasocket-3.0_rc1-r3.ebuild 1107 BLAKE2B d7a6263f58f3db82491a132ce44e033c9db857eaedbafe3b015be1bff86073c58b932c072d2cf3c213e6a5bd003b0267cfa7ab6ef2e73c22aa402b379a20b73a SHA512 f85177c0f36e3dec2c7c2a92d0d31034877214bf4cb848901b04868321e5fed64b6b2b123dce3815be0f726975a3a074647f2fafd9dff893212bdc2a76a8f631
+MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
new file mode 100644
index 000000000000..b2b42fd1b64b
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib multilib-minimal flag-o-matic
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/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[deprecated,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S=${WORKDIR}/${PN}-${PV/_/-}
+
+RESTRICT="test"
+
+src_prepare() {
+	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
+	dohtml -r doc/.
+}
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
new file mode 100644
index 000000000000..409d430eb575
--- /dev/null
+++ b/dev-lua/luasocket/metadata.xml
@@ -0,0 +1,8 @@
+<?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">diegonehab/luasocket</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/luassert-1.7.10 b/dev-lua/luassert-1.7.10
deleted file mode 100644
index 38dfbaf741ab..000000000000
--- a/dev-lua/luassert-1.7.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig test? ( dev-lua/busted )
-DESCRIPTION=Lua Assertions Extension
-EAPI=6
-HOMEPAGE=http://olivinelabs.com/busted/
-IUSE=luajit test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) >=dev-lua/say-1.2_p1[luajit=]
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.7.10.tar.gz -> luassert-1.7.10.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43f527b9e910b7f08b4045e4f867b39f
diff --git a/dev-lua/luassert-1.7.9 b/dev-lua/luassert-1.7.9
deleted file mode 100644
index 1cac9661aad7..000000000000
--- a/dev-lua/luassert-1.7.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Lua Assertions Extension
-EAPI=5
-HOMEPAGE=http://olivinelabs.com/busted/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:= >=dev-lua/say-1.2_p1
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.7.9.tar.gz -> luassert-1.7.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=76ca498c5c793b533e3c3946dae9e4e2
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
new file mode 100644
index 000000000000..171eadddd74d
--- /dev/null
+++ b/dev-lua/luassert/Manifest
@@ -0,0 +1,5 @@
+DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05
+DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b
+EBUILD luassert-1.7.10.ebuild 855 BLAKE2B f3698708fb883e172210ff6b293536c9d9ba257a0e7434050f99550e0a8f891ba0ad697b1054ff615ec4efb30cfdf4d9c31011c631a130eedde9e3996e55dabb SHA512 effbadf9eb9db6a8dcb7390f71b430aa8f339884dc85d14d39bdf4a3600e69bd95041a4025d9581c2cd299f6ca68fad0d6633ba44f99bffdbe930d0f66b03bf4
+EBUILD luassert-1.7.9.ebuild 609 BLAKE2B bb29a2069407537bd1e0bb9dc7561951c4615c6405108d11f83fd8132d032e0696f16be288e365a0b4201a41e45dda36e8b360313d58d1b7b0b58628b0c62b59 SHA512 920ca16cdb8eb819218d6eeaf97fcfb18777f68963cc79249622e856b7ef35cc8231e7436c8cb84a673ea50ce20dd95960834be0f19d71c2041e827a3f51bd9d
+MISC metadata.xml 497 BLAKE2B 009bcaf2379e9d29771f83aba63ad50ec2e9e02a328e9605a8d2e171e43e59025aab51ba876206d58f86fd7d0e51a28e9d0d1851f0cc4d87c2cce02e11b048a6 SHA512 8bb0c5cc23259fd9e259620ecde2b377220b3d8062b5229777d811b3827a36d770c2518245009be328f932a5fe6f84ecb719d7e9ff604d7cb4524d9a59811f6b
diff --git a/dev-lua/luassert/luassert-1.7.10.ebuild b/dev-lua/luassert/luassert-1.7.10.ebuild
new file mode 100644
index 000000000000..d7254ef88e73
--- /dev/null
+++ b/dev-lua/luassert/luassert-1.7.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+CDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+RDEPEND="${CDEPEND}
+	>=dev-lua/say-1.2_p1[luajit=]"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lua/busted )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+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/*
+	einstalldocs
+}
diff --git a/dev-lua/luassert/luassert-1.7.9.ebuild b/dev-lua/luassert/luassert-1.7.9.ebuild
new file mode 100644
index 000000000000..82b2bca8d3da
--- /dev/null
+++ b/dev-lua/luassert/luassert-1.7.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-lua/say-1.2_p1"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+	doins -r src/*
+	dodoc *.md
+}
diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml
new file mode 100644
index 000000000000..0c230917f9a9
--- /dev/null
+++ b/dev-lua/luassert/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Adds a framework that allows registering new assertions
+		without compromising builtin assertion functionality.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/luassert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luasystem-0.2.0_p0 b/dev-lua/luasystem-0.2.0_p0
deleted file mode 100644
index 73bde42eb5a6..000000000000
--- a/dev-lua/luasystem-0.2.0_p0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=platform independent system calls for lua
-EAPI=6
-HOMEPAGE=https://github.com/LuaDist2/luasystem
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/LuaDist2/luasystem/archive/0.2.0-0.tar.gz -> luasystem-0.2.0_p0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5a8aa7ddc2800f0cd2e461a7293f036f
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
new file mode 100644
index 000000000000..e8f5141f0e9c
--- /dev/null
+++ b/dev-lua/luasystem/Manifest
@@ -0,0 +1,4 @@
+AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990491da070a6ff24a78c6eb1bb86ac583e93a32c4576b956fd06836e0088dafcffba155ae254eb3273230bf84cfaa90e70464d45 SHA512 7123c427527788034cd2a5f759f5924bd00dc2ca7a2071d986152f535a4da641887e75131ae7d6afe39d82b4c71c84796cf52a451603db50a21ad99f061c746e
+DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
+EBUILD luasystem-0.2.0_p0.ebuild 1051 BLAKE2B f5f30ed92fa9c16beb76f2008ddfadd90d06272596ee4db2ca9d6b50e1be186a9a5243210d78706b1f35bb3b8a00e91fc945a2dff951ec992b3ef38700712da6 SHA512 eaf185953931eb2dd82daf1dd7d89e4f52b9479fd45f25916cbb2c73520e62e839a0838e6c8bb21d5f253f401749ecfb285ec677d71541341014666eb50da136
+MISC metadata.xml 331 BLAKE2B 8878c677de3e97ca867c0acff719fa5c949149e77f09649e4792927f33abdc971156809f0f1cec4caae2e619dec8f686c92cfade7a4fc12bc5b575305533a6f0 SHA512 f597f3af9c0e0422e49e8da76ecbb645b02cf6b0dd2ff3420c8923aaa173160610a9edd8f7aa5411479e1c1c2e2805f9e5a36b637e3fc42d2b48caf9033796aa
diff --git a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch
new file mode 100644
index 000000000000..803d2835c37f
--- /dev/null
+++ b/dev-lua/luasystem/files/luasystem-0.2.0_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.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
new file mode 100644
index 000000000000..f4986115532b
--- /dev/null
+++ b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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.0-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=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
+
+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
+dodoc README.md
+}
diff --git a/dev-lua/luasystem/metadata.xml b/dev-lua/luasystem/metadata.xml
new file mode 100644
index 000000000000..8ee365e7918b
--- /dev/null
+++ b/dev-lua/luasystem/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LuaDist2/luasystem</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lutok-0.4-r1 b/dev-lua/lutok-0.4-r1
deleted file mode 100644
index 9193218d4fa1..000000000000
--- a/dev-lua/lutok-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-lang/lua:0 virtual/pkgconfig test? ( dev-libs/atf dev-util/kyua )
-DESCRIPTION=Lightweight C++ API library for Lua
-EAPI=6
-HOMEPAGE=https://github.com/jmmv/lutok
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-lang/lua:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5566091e31df971efb42908b76b6f75a
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
new file mode 100644
index 000000000000..8e3b857d2c76
--- /dev/null
+++ b/dev-lua/lutok/Manifest
@@ -0,0 +1,3 @@
+DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
+EBUILD lutok-0.4-r1.ebuild 745 BLAKE2B 56ae40a3334c79874fdddf10ceeadc5145f9ca14fc948e8b843d17d6bec3f6ef7f20e5826b8f9dd741f2c4085d857df7ee49d991ac0a5466b4f5d94f58a473e7 SHA512 87e597ed3ed9bfc1f25a9ada51eec93270129dc23d975ae2120fce76ce75c27270ef7332cf27fdc169e423e2f6ad516931dbd8db9a68194c8d37e5743e91dacc
+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
new file mode 100644
index 000000000000..f67abbf4bf10
--- /dev/null
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+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 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/lua:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+
+src_configure() {
+	econf --disable-shared --enable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-lua/lutok/metadata.xml b/dev-lua/lutok/metadata.xml
new file mode 100644
index 000000000000..de09ffd8b089
--- /dev/null
+++ b/dev-lua/lutok/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-lua/luvit-0.7.0 b/dev-lua/luvit-0.7.0
deleted file mode 100644
index 11fc0f763096..000000000000
--- a/dev-lua/luvit-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser ) virtual/pkgconfig
-DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
-EAPI=5
-HOMEPAGE=https://luvit.io/
-IUSE=bundled-libs examples
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-RDEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://luvit.io/dist/latest/luvit-0.7.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3e3b3eb39438879978d8b5c7eaf4ccb
diff --git a/dev-lua/luvit-0.8.2 b/dev-lua/luvit-0.8.2
deleted file mode 100644
index c50733843481..000000000000
--- a/dev-lua/luvit-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser ) virtual/pkgconfig
-DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
-EAPI=5
-HOMEPAGE=https://luvit.io/
-IUSE=bundled-libs examples libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 net-libs/http-parser )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://luvit.io/dist/latest/luvit-0.8.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae8e805e383456c7ee63bd558fd2b2b2
diff --git a/dev-lua/luvit-9999 b/dev-lua/luvit-9999
deleted file mode 100644
index c5b611761fe3..000000000000
--- a/dev-lua/luvit-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.4 ) virtual/pkgconfig dev-vcs/git
-DESCRIPTION=Takes node.js' architecture and dependencies and fits it in the Lua language
-EAPI=5
-HOMEPAGE=https://luvit.io/
-IUSE=bundled-libs examples libressl
-LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.4 )
-RESTRICT=test
-SLOT=0
-_eclasses_=git-2	45ff482316b52b3f96ff6b7309b77f03	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c3940fbc263c1b1eb4ee82e01e50a14f
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
new file mode 100644
index 000000000000..b45cb9215713
--- /dev/null
+++ b/dev-lua/luvit/Manifest
@@ -0,0 +1,7 @@
+AUX luvit-0.7.0-unbundle-http-parser.patch 1383 BLAKE2B 7b28d44ff91b9f599db4fc224dd471573e40c98caaa2404675d02cfc4de581457393952e4c793dd8ae55aedf133cd22e52ef6114670ae4d03ac0439dc6bab5f4 SHA512 0aefa90e3e10e557e59523f2d052aad8eb4f235471b34cf650a380f27faf97fa83cff6d1ae3c3f1e7642db839db8f0660c2ff2aa8e950041b3e1b3452d04619f
+DIST luvit-0.7.0.tar.gz 6440621 BLAKE2B 03cde753f19441bf408c3985704d9042bdbb217368d2effdb494c650038dd2f6a01acd81a73c8bd6e2ef5648d017eb27a8728f4ea568d62f9a94812cf19fe767 SHA512 9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12
+DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292 SHA512 46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
+EBUILD luvit-0.7.0.ebuild 2162 BLAKE2B f7174ac4f2ed634360cffbd0fdc982325b79faf00912a9eee0d4de22785e9f8497c87e19f79819572cf611c9c46156a2a5c56e296c149745e6e78002b0153738 SHA512 191c8af8628f3560cd05899ff89b4333005e7efca09fb9a4cabeb572773e2f941818c0c45c6e1190c6402a1b2d6053bf05d6dee1f91d24fa455423598ed062fb
+EBUILD luvit-0.8.2.ebuild 2232 BLAKE2B f1c9f8b279f34c77a6e04ed6ac3ce118dc132c6a7c255022f60acfc552ef7e75824046e998318a936cf0c742e22cea4f6985df9a41c446aee98a5dba76909b52 SHA512 4d07fcaa70a0250e7960021ea73c972ea213d0b4f73d8455660713d08e6081620e9667b6fb4b8990fa8199c856853e4eee9f68105167e3bd86a9b21b941ba375
+EBUILD luvit-9999.ebuild 2425 BLAKE2B b625935d72facd0934674d6b6b93c8588ede4ad0baa87288fddd8b73acea37add5ca008c9993995bb96c0d9a3dcb1cd5f3523b56c620b71a7c830404abbf9d5c SHA512 082c7144b04be678eecbb1424a97b182d51730c5cf293c89c36d3cc1f36a8c0558be43c19c72ad6b6090194cb393836761f6a3926003366c704b4df647835ec2
+MISC metadata.xml 256 BLAKE2B 4770083294f5244f4cbac3512b31f2842b85efbe2d31a801f8937e0f0e616e8940c5f3c32836ab5404a29d4c07cb048a871360487d308eb68d01b7d97970ada6 SHA512 a8a13bfb63fbe12ba3f7753aff5fcd7711dcc1e5918d17fa67d0a9daaead72657f180538137148dfa70319ca0bb852c9c24416f9248564611caf75f68fa6f1eb
diff --git a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
new file mode 100644
index 000000000000..d9ae8568c140
--- /dev/null
+++ b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
@@ -0,0 +1,54 @@
+commit b34b7b0474878d1951637b762c68694c16c1c574
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sun Jun 30 22:37:10 2013 +0200
+
+    unbundle http-parser
+
+diff --git a/Makefile b/Makefile
+index a0e9277..99535ca 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,7 @@ USE_SYSTEM_SSL?=0
+ USE_SYSTEM_LUAJIT?=0
+ USE_SYSTEM_ZLIB?=0
+ USE_SYSTEM_YAJL?=0
++USE_SYSTEM_HTTPPARSER?=0
+ 
+ DEBUG ?= 1
+ ifeq (${DEBUG},1)
+@@ -95,6 +96,10 @@ endif
+ LIBS += ${UVDIR}/libuv.a
+ LIBS += ${CARESDIR}/libcares.a
+ 
++ifeq (${USE_SYSTEM_HTTPPARSER},1)
++LIBS += -lhttp_parser
++endif
++
+ ifeq (${USE_SYSTEM_LUAJIT},1)
+ CPPFLAGS+=$(shell pkg-config --cflags luajit)
+ LIBS+=$(shell pkg-config --libs luajit)
+@@ -174,8 +179,11 @@ LUVLIBS=${BUILDDIR}/utils.o          \
+         ${BUILDDIR}/lhttp_parser.o
+ 
+ DEPS= ${UVDIR}/libuv.a             \
+-		${CARESDIR}/libcares.a \
+-		${HTTPDIR}/http_parser.o
++		${CARESDIR}/libcares.a
++
++ifeq (${USE_SYSTEM_HTTPPARSER},0)
++DEPS += ${HTTPDIR}/http_parser.o
++endif
+ 
+ ifeq (${USE_SYSTEM_LUAJIT},0)
+ DEPS+=${LUADIR}/src/libluajit.a
+@@ -290,8 +298,10 @@ install: all
+ 	install ${BUILDDIR}/luvit ${BINDIR}/luvit
+ 	mkdir -p ${LIBDIR}
+ 	cp lib/luvit/*.lua ${LIBDIR}
++ifeq (${USE_SYSTEM_HTTPPARSER},0)
+ 	mkdir -p ${INCDIR}/http_parser
+ 	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
++endif
+ 	mkdir -p ${INCDIR}/uv
+ 	cp -r ${UVDIR}/include/* ${INCDIR}/uv/
+ 	cp src/*.h ${INCDIR}/
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
new file mode 100644
index 000000000000..da21771c0b31
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.7.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+# TODO: FHS https://github.com/luvit/luvit/issues/379
+
+DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
+HOMEPAGE="https://luvit.io/"
+SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="bundled-libs examples"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/openssl:0
+	sys-libs/zlib
+	!bundled-libs? (
+		dev-lang/luajit:2[lua52compat]
+		>=dev-libs/yajl-2.0.2
+		net-libs/http-parser
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -r deps/{openssl,zlib} || die
+	epatch "${FILESDIR}"/${P}-unbundle-http-parser.patch
+	if use bundled-libs ; then
+		sed -i \
+			-e "s/-Werror//" \
+			-e "s/-O3//" \
+			deps/http-parser/Makefile || die "fixing flags failed!"
+	else
+		rm -r deps/{luajit,yajl,http-parser} || die
+		# TODO: no version detection for http-parser yet
+		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
+		sed -i \
+			-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+			-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
+			Makefile || die "setting yajl version failed"
+	fi
+
+}
+
+src_configure() {
+	# skip retarded gyp build system
+	:
+}
+
+src_compile() {
+	tc-export CC AR
+
+	emake -C deps/cares
+
+	myemakeargs=(
+		DEBUG=0
+		WERROR=0
+		USE_SYSTEM_SSL=1
+		# bundled luajit is compiled with special flags
+		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_ZLIB=1
+		PREFIX=/usr
+		LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install
+	dodoc TODO ChangeLog README.markdown errors.markdown
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
new file mode 100644
index 000000000000..9dedec697b3b
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+# TODO: FHS https://github.com/luvit/luvit/issues/379
+
+DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
+HOMEPAGE="https://luvit.io/"
+SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bundled-libs examples libressl"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	!bundled-libs? (
+		dev-lang/luajit:2[lua52compat]
+		>=dev-libs/yajl-2.0.2
+		net-libs/http-parser
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -r deps/{openssl,zlib} || die
+	epatch "${FILESDIR}"/${PN}-0.7.0-unbundle-http-parser.patch
+	if use bundled-libs ; then
+		sed -i \
+			-e "s/-Werror//" \
+			-e "s/-O3//" \
+			deps/http-parser/Makefile || die "fixing flags failed!"
+	else
+		rm -r deps/{luajit,yajl,http-parser} || die
+		# TODO: no version detection for http-parser yet
+		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
+		sed -i \
+			-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+			-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
+			Makefile || die "setting yajl version failed"
+	fi
+
+}
+
+src_configure() {
+	# skip retarded gyp build system
+	:
+}
+
+src_compile() {
+	tc-export CC AR
+
+	emake -C deps/cares
+
+	myemakeargs=(
+		DEBUG=0
+		WERROR=0
+		USE_SYSTEM_SSL=1
+		# bundled luajit is compiled with special flags
+		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_ZLIB=1
+		PREFIX=/usr
+		LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install
+	dodoc TODO ChangeLog README.markdown errors.markdown
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-lua/luvit/luvit-9999.ebuild b/dev-lua/luvit/luvit-9999.ebuild
new file mode 100644
index 000000000000..5718d425719e
--- /dev/null
+++ b/dev-lua/luvit/luvit-9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs multilib git-2
+
+# TODO: FHS https://github.com/luvit/luvit/issues/379
+
+DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
+HOMEPAGE="https://luvit.io/"
+EGIT_REPO_URI="https://github.com/luvit/luvit.git"
+
+KEYWORDS=""
+SLOT="0"
+IUSE="bundled-libs examples libressl"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	!bundled-libs? (
+		dev-lang/luajit:2[lua52compat]
+		>=dev-libs/yajl-2.0.4
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+EGIT_HAS_SUBMODULES=1
+
+src_prepare() {
+	rm -r deps/{openssl,zlib} || die
+
+	if use bundled-libs ; then
+		MY_YAJL_VERSION=$(git --git-dir deps/yajl/.git describe --tags)
+		MY_LUAJIT_VERSION=$(git --git-dir deps/luajit/.git describe --tags)
+	else
+		rm -r deps/{luajit,yajl} || die
+		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
+	fi
+
+	MY_HTTP_VERSION=$(git --git-dir deps/http-parser/.git describe --tags)
+	MY_UV_VERSION=$(git --git-dir deps/uv/.git describe --all --long | cut -f 3 -d -)
+
+	sed \
+		-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+		-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
+		-e "s:^HTTP_VERSION=.*:HTTP_VERSION=${MY_HTTP_VERSION}:" \
+		-e "s:^UV_VERSION.*:UV_VERSION=${MY_UV_VERSION}:" \
+		-i Makefile || die "sed failed"
+
+	sed -i \
+		-e "s/-Werror//" \
+		-e "s/-O3//" \
+		deps/http-parser/Makefile || die "fixing flags failed!"
+}
+
+src_configure() {
+	# skip retarded gyp build system
+	:
+}
+
+src_compile() {
+	tc-export CC AR
+
+	emake -C deps/cares
+
+	myemakeargs=(
+		DEBUG=0
+		WERROR=0
+		USE_SYSTEM_SSL=1
+		USE_SYSTEM_ZLIB=1
+		# bundled luajit is compiled with special flags
+		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
+		PREFIX=/usr
+		LIBDIR="${D}"/usr/$(get_libdir)/${PN}
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install
+	dodoc TODO ChangeLog README.markdown errors.markdown
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml
new file mode 100644
index 000000000000..dc16404b528a
--- /dev/null
+++ b/dev-lua/luvit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<use>
+		<flag name="bundled-libs">Use bundled versions of some libraries.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-lua/mediator_lua-1.1.2_p0 b/dev-lua/mediator_lua-1.1.2_p0
deleted file mode 100644
index c2c25cfd6b8b..000000000000
--- a/dev-lua/mediator_lua-1.1.2_p0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Event handling through channels
-EAPI=5
-HOMEPAGE=http://olivinelabs.com/mediator_lua/,
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b3dc8a458cae0a7f81a4b0be8bd97093
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
new file mode 100644
index 000000000000..ea607538dccb
--- /dev/null
+++ b/dev-lua/mediator_lua/Manifest
@@ -0,0 +1,3 @@
+DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
+EBUILD mediator_lua-1.1.2_p0.ebuild 795 BLAKE2B f7f56f1073d45ac16be965a51b81b9d6f907140cb7ae0208830c899805219517939431254234bbcb278779b1bb0094c395a03dcfa27631f91e75cdeee5f69fdd SHA512 658567105f41c183a35388bac0340d751ecd4d89b32e68fcc34c6729fa275a418515a8a171065162e9cb6d2e6f237949e61ab7612d25ec47f0b8a5ab796983b0
+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
new file mode 100644
index 000000000000..0bdbcbcf88d5
--- /dev/null
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# Below is the upstream version number. The"-0" suffix should be kept in
+# sync with the _p0 suffix of the ebuild version.
+MY_PV=1.1.2-0
+
+DESCRIPTION="Event handling through channels"
+HOMEPAGE="http://olivinelabs.com/mediator_lua/",
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins src/mediator.lua
+	dodoc README.md
+}
diff --git a/dev-lua/mediator_lua/metadata.xml b/dev-lua/mediator_lua/metadata.xml
new file mode 100644
index 000000000000..29d24e70698d
--- /dev/null
+++ b/dev-lua/mediator_lua/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		mediator_lua allows you to subscribe and publish to a central object so
+		you can decouple function calls in your application. It's as simple as
+		mediator:subscribe("channel", function). Supports namespacing, predicates,
+		and more.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/mediator_lua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/messagepack-0.3.2 b/dev-lua/messagepack-0.3.2
deleted file mode 100644
index ebb2c124c8a9..000000000000
--- a/dev-lua/messagepack-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= ) virtual/pkgconfig
-DESCRIPTION=A pure Lua implementation of the MessagePack serialization format
-EAPI=5
-HOMEPAGE=http://fperrad.github.io/lua-MessagePack/
-IUSE=+luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/lua-messagepack-0.3.2.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d4fa68c85df632243b63ddb69a90a3d5
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
new file mode 100644
index 000000000000..066fbdae52eb
--- /dev/null
+++ b/dev-lua/messagepack/Manifest
@@ -0,0 +1,3 @@
+DIST lua-messagepack-0.3.2.tar.xz 13416 BLAKE2B 03d80c3a1fc8d8bfa30821f3b83ead61bc0a8ccf565d9ac17ca0b1d97ac7c72d0550695ee13feb6ff38cd8098fa331c3acaf4b52c0f95bfc3141b70a655ba9df SHA512 d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd
+EBUILD messagepack-0.3.2.ebuild 688 BLAKE2B e4c72a03d21716dc334d6c0b6a028fe8a038d33998f75fdeaba53981632bcf611ac4e430356e9ee5c1d07c0ed5a212ad1edf8c4cb1e4700749dea4d62c90ddbc SHA512 d2eeeffe2fe4c8596924b0655108854f1798a4b0dcb5136415a6065f01da145eb1c448fd74ded4cb94e63fdbfcc7f45553191daa0d3c80f494559f7092b80772
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild b/dev-lua/messagepack/messagepack-0.3.2.ebuild
new file mode 100644
index 000000000000..db4b06987448
--- /dev/null
+++ b/dev-lua/messagepack/messagepack-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+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"
+IUSE="+luajit"
+
+RDEPEND="luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	local lua=lua
+	use luajit && lua=luajit
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+	doins src/MessagePack.lua
+	dodoc CHANGES README.md
+}
diff --git a/dev-lua/messagepack/metadata.xml b/dev-lua/messagepack/metadata.xml
new file mode 100644
index 000000000000..c1744fe7fc5b
--- /dev/null
+++ b/dev-lua/messagepack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!--maintainer-needed-->
+</pkgmetadata>
diff --git a/dev-lua/metadata.xml b/dev-lua/metadata.xml
new file mode 100644
index 000000000000..e7b1e1bc01de
--- /dev/null
+++ b/dev-lua/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-lua category contains libraries, utilities or
+		bindings written in or for the Lua programming language. 
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-lua enthält Bibliotheken und Werkzeuge für die
+		Programmiersprache Lua.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-lua contiene librerias y utilidades referentes al
+		lenguaje de programación Lua.
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-lua categorie bevat bibliotheken en hulpmiddelen voor het
+		gebruik	van de programmeertaal Lua.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-lua chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Lua.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-lua contiene librerie ed utilità per il linguaggio
+		di programmazione Lua.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-lua contém bibliotecas, utilitários e
+		bindings escritos em ou para a linguagem de programação Lua.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-lua zawiera biblioteki, narzędzia i powiązania
+		(bindings) napisane w lub stworzone do pisania w języku programowania
+		Lua.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-lua/mpack-1.0.4 b/dev-lua/mpack-1.0.4
deleted file mode 100644
index d186905243de..000000000000
--- a/dev-lua/mpack-1.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= ) virtual/pkgconfig test? ( dev-lua/busted )
-DESCRIPTION=Lua bindings for libmpack
-EAPI=6
-HOMEPAGE=https://github.com/tarruda/libmpack/
-IUSE=luajit test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= )
-SLOT=0
-SRC_URI=https://github.com/tarruda/mpack/archive/1.0.4.tar.gz -> mpack-1.0.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=45e6e63c306733201fe73c7b23098300
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
new file mode 100644
index 000000000000..317480502b1c
--- /dev/null
+++ b/dev-lua/mpack/Manifest
@@ -0,0 +1,3 @@
+DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
+EBUILD mpack-1.0.4.ebuild 1017 BLAKE2B 9ea57f9f1db116b99cdfb69fb42e9882f1aa23c2e2c750d29cd384a7942daf89fd7ceac7bfff49b48dc2ca72815c12b3df3a7c687043b778a3988b9906bba948 SHA512 0e8ff61f4b76779adb421d742c005d0b9a9ee8e723e9c94382696e0ad10c2f73f3140e4e8c38005b7ce516e3c7f1115080fdb834f5c8920a499554fac3132b03
+MISC metadata.xml 248 BLAKE2B 81385dcd4ba6430bbbdba154d5db77437f343697bf1c614bc817716830ed37e708630ca786a43618e2597fe1e5056c69b4960ad0f6264842919680d47205795f SHA512 1c1f01209afb5e2ba42c1d242940af7b846561018ad6abef9a0bc8abdab6d8ebff3e71be9e0fa783e0c7d8ae3597f56e695135f21ff631b1026bfe7d792764f8
diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml
new file mode 100644
index 000000000000..ee1dc5909516
--- /dev/null
+++ b/dev-lua/mpack/metadata.xml
@@ -0,0 +1,8 @@
+<?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">tarruda/libmpack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
new file mode 100644
index 000000000000..354d35b57794
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/tarruda/libmpack/"
+SRC_URI="https://github.com/tarruda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libmpack-${PV}/binding/lua"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="luajit test"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2= )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lua/busted )"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		USE_SYSTEM_LUA=yes \
+		LUA_INCLUDE="$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" \
+		LUA_LIB="$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
+}
+
+src_test() {
+	busted -o gtest test.lua || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		USE_SYSTEM_LUA=yes \
+		LUA_CMOD_INSTALLDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
+		install
+}
diff --git a/dev-lua/penlight-1.3.2 b/dev-lua/penlight-1.3.2
deleted file mode 100644
index cc35cdfc0ad0..000000000000
--- a/dev-lua/penlight-1.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= app-arch/unzip virtual/pkgconfig
-DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
-EAPI=5
-HOMEPAGE=http://stevedonovan.github.com/Penlight,
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:= dev-lua/luafilesystem
-SLOT=0
-SRC_URI=http://stevedonovan.github.io/files/penlight-1.3.2-core.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2a28000afeac147bfbfda2e5c5f4adb6
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
new file mode 100644
index 000000000000..eb7bb3729166
--- /dev/null
+++ b/dev-lua/penlight/Manifest
@@ -0,0 +1,3 @@
+DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02
+EBUILD penlight-1.3.2.ebuild 659 BLAKE2B 4de13b932f381af1ecbfcd54bab0f367b58b818e4f38246db383c2ad345b8b2779e777c812aa031b6264e214661ddb24cd4e7cfc2c548d40cf08f25c44745abe SHA512 e3cda7748fe8e59384e598a570516d0e865c58d67ec9856732c3db2bbe55fd81c4cd4decaf12d175d59e2edf216454dc676fdfaa044bc31396751f1340f33b79
+MISC metadata.xml 523 BLAKE2B c9b7340d34bfa27978dfedde2becbb1ea65d911986be0868c76d16796285be730c073da63cd05e46d7ec58af155a09cd6fe635360324a8e252210eb47e3097a7 SHA512 c4a0a69c82dc2dfe49d9f5145847e952f466fd6254baef24f20cd122137071c5731643202bc7bfbb20934ae955454d077fdd74eb30f9d14f67823eec8b089cbc
diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml
new file mode 100644
index 000000000000..8fc3b6a3bf44
--- /dev/null
+++ b/dev-lua/penlight/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Penlight is a set of pure Lua libraries for making it easier to work
+		with common tasks like iterating over directories, reading
+		configuration files and the like. Provides functional operations
+		on tables and sequences.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild
new file mode 100644
index 000000000000..9f198c77414e
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="http://stevedonovan.github.com/Penlight",
+SRC_URI="http://stevedonovan.github.io/files/${PN}-1.3.2-core.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+app-arch/unzip
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	dev-lua/luafilesystem"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r lua/pl
+}
diff --git a/dev-lua/say-1.3_p1 b/dev-lua/say-1.3_p1
deleted file mode 100644
index df79a9cc7b09..000000000000
--- a/dev-lua/say-1.3_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
-DESCRIPTION=Lua String Hashing/Indexing Library
-EAPI=5
-HOMEPAGE=http://olivinelabs.com/busted/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1:=
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=75725853d09504d648dad05db95fa315
diff --git a/dev-lua/say-1.3_p1-r1 b/dev-lua/say-1.3_p1-r1
deleted file mode 100644
index e4048cf2d88b..000000000000
--- a/dev-lua/say-1.3_p1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig test? ( dev-lua/busted )
-DESCRIPTION=Lua String Hashing/Indexing Library
-EAPI=6
-HOMEPAGE=http://olivinelabs.com/busted/
-IUSE=luajit test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f3c34440f9fa5dfb497b2aa11884762d
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
new file mode 100644
index 000000000000..20d37950250e
--- /dev/null
+++ b/dev-lua/say/Manifest
@@ -0,0 +1,4 @@
+DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
+EBUILD say-1.3_p1-r1.ebuild 861 BLAKE2B 605eda1809eaf8313da50001d3dff8bbc75668ef0b8db6c0c831282297c68cf51134f209f1c77e02de930c6f4575d02b81155f5f2b243bf7de9e927d553b7bb6 SHA512 6ca9cafba5250179d8f61ac48293642cbc8b3a91ec52ed5787dec10af6ffd7c1fdb5564de4d0a16664c8b282b3afcec95b27e31d861b41d8f835b74e189f0a9e
+EBUILD say-1.3_p1.ebuild 664 BLAKE2B 23a1ec3ce6ae91d6ee0a79f2b882e49c75b25ac2b6dd45cbbe6c46a44e088f9050120cd21e90b0222e6f7029521a79a3040b4500687fe6aca625cfc0abd287f0 SHA512 348ac3a993aeee0c570dabdf7fc632c8532801620ce384f1b1b8f18b75ee20b6894f0ac1fc0a4d646e6be38df6136f88631f37e26a79275c6f27d8314a486ba8
+MISC metadata.xml 413 BLAKE2B 3d56347a7a9b9dd6d404078d70b4f775c982f957a53f6b49f03392bf814a08ff91b8b2ac8409bdb56b1a343f2bc04eb81578b0297eab33f37459430f2fe37bbb SHA512 c0cd2d55a07c8d7338a274a3a8204bf2c63ad46b4d9b78f720766120af4b28482c3c68df18c1e7dacfe99d3898b4bf680b9692097939cdc820ee5aa9fc11a928
diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml
new file mode 100644
index 000000000000..3f45427ec3a2
--- /dev/null
+++ b/dev-lua/say/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Useful for internationalization.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/say</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
new file mode 100644
index 000000000000..ddf48b681c1e
--- /dev/null
+++ b/dev-lua/say/say-1.3_p1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PV=1.3-1
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua String Hashing/Indexing Library"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="luajit test"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lua/busted )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+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 src/init.lua
+	einstalldocs
+}
diff --git a/dev-lua/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild
new file mode 100644
index 000000000000..edf21e39b467
--- /dev/null
+++ b/dev-lua/say/say-1.3_p1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_PV=1.3-1
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua String Hashing/Indexing Library"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+doins src/init.lua
+dodoc CONTRIBUTING.md README.md
+}
diff --git a/dev-lua/toluapp-1.0.93 b/dev-lua/toluapp-1.0.93
deleted file mode 100644
index 08c0198456ad..000000000000
--- a/dev-lua/toluapp-1.0.93
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/lua-5.1.1[deprecated] dev-util/scons
-DESCRIPTION=A tool to integrate C/C++ code with Lua
-EAPI=2
-HOMEPAGE=http://www.codenix.com/~tolua/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.1[deprecated]
-SLOT=0
-SRC_URI=http://www.codenix.com/~tolua/tolua++-1.0.93.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5f86c5c3e664644e64c16aadfeb43c3a
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
new file mode 100644
index 000000000000..1ddb739a4754
--- /dev/null
+++ b/dev-lua/toluapp/Manifest
@@ -0,0 +1,3 @@
+DIST tolua++-1.0.93.tar.bz2 163956 BLAKE2B e4ff54ec130036654446a6e1f5d487d40af9ebbf2fdb3a8ae055fd20768fad6434fdfd4f359369dbc3669565f54dad3d6957da06c6e029e6abe6a529861ff96e SHA512 d1ae56b2dd38437e0aef81d5230d1a954b8f914133cfa199a18193d05ecfd188ec2bbeec76e63846ef673dc89c12e47bfd9727c227b71833d622cc441c071013
+EBUILD toluapp-1.0.93.ebuild 1090 BLAKE2B 0d63d5898ff64f87f639ca7cda694858d18849577c53cb126487da3b9365dc8e30b821e3a710c0e299c18ce7397cd139f5476e27d4606a533f7b56064c3a5a96 SHA512 c1ce00a29c5ca0217a423167de7c9f35a1070d6ba008bc0bae6268e3d34b1480dab561d0253c4817b6350b16a6ce213db3126db615d373748e31871baba4128d
+MISC metadata.xml 228 BLAKE2B 6647e8693ddcece1ed5d215bc3502e0a16df0f2fedbf03c0dedac5b669bf0ca178284c69eae29b933f94ec58543c951e7d207d0d8a774fc7e4bfd64f3371ae74 SHA512 27499f64eb2cb593e91dd72dc5498d5df3ea7c4402e86897f79ef6fc7f040c6c09be497959af35ee54943f36ac228a6b92302b5d85763e4d0e96398670e81f45
diff --git a/dev-lua/toluapp/metadata.xml b/dev-lua/toluapp/metadata.xml
new file mode 100644
index 000000000000..379d1734e2d3
--- /dev/null
+++ b/dev-lua/toluapp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-lua/toluapp/toluapp-1.0.93.ebuild b/dev-lua/toluapp/toluapp-1.0.93.ebuild
new file mode 100644
index 000000000000..408e6ace008f
--- /dev/null
+++ b/dev-lua/toluapp/toluapp-1.0.93.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+MY_P=${P/pp/++}
+
+DESCRIPTION="A tool to integrate C/C++ code with Lua"
+HOMEPAGE="http://www.codenix.com/~tolua/"
+SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1.1[deprecated]"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	echo "## BEGIN gentoo.py
+
+LIBS = ['lua', 'dl', 'm']
+
+## END gentoo.py" > ${S}/custom.py
+
+	scons \
+		CC="$(tc-getCC)" \
+		CCFLAGS="${CFLAGS} -ansi -Wall" \
+		CXX="$(tc-getCXX)" \
+		LINK="$(tc-getCC)" \
+		LINKFLAGS="${LDFLAGS}" \
+		shared=1 || die "scons failed"
+}
+
+src_install() {
+	dobin bin/tolua++ || die "dobin failed"
+#	dobin bin/tolua++_bootstrap || die "dobin failed"
+#	dolib.a lib/libtolua++_static.a || die "dolib.a failed"
+	dolib.so lib/libtolua++.so || die "dolib.so failed"
+	insinto /usr/include
+	doins include/tolua++.h || die "doins failed"
+	dodoc README
+	dohtml doc/*
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-lua
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)