From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 25 Dec 2020 23:06:25 +0000
Subject: gentoo christmass resync : 25.12.2020

---
 dev-lua/Manifest.gz                                | Bin 6989 -> 6992 bytes
 dev-lua/lua-openssl/Manifest                       |   4 +-
 .../lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild   | 117 -------------------
 .../lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild   | 126 +++++++++++++++++++++
 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild |  90 ---------------
 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild |  99 ++++++++++++++++
 dev-lua/luadbi/Manifest                            |   2 +-
 dev-lua/luadbi/luadbi-0.7.2-r101.ebuild            |  90 ---------------
 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild            |  91 +++++++++++++++
 dev-lua/luv/Manifest                               |   2 +-
 dev-lua/luv/luv-1.32.0.0-r101.ebuild               | 113 ------------------
 dev-lua/luv/luv-1.32.0.0-r102.ebuild               |  82 ++++++++++++++
 12 files changed, 402 insertions(+), 414 deletions(-)
 delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
 create mode 100644 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
 delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
 create mode 100644 dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
 delete mode 100644 dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
 create mode 100644 dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
 delete mode 100644 dev-lua/luv/luv-1.32.0.0-r101.ebuild
 create mode 100644 dev-lua/luv/luv-1.32.0.0-r102.ebuild

(limited to 'dev-lua')

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b431b8317fa0..7075b47ad33a 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index b4ef7a6e5fd0..c07258a805d4 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,6 +1,6 @@
 DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
-EBUILD lua-openssl-0.7.8_p0-r100.ebuild 2449 BLAKE2B b7469b721fbc35db1e2bc9bccfa4f92e4b6b6b3ba18af5821e1ff973d5b550538f90a381a79bc0b07345e691e497f9f33dfc67cea36df85577856f32e41fb9db SHA512 20d039165bc638f24ab7275a02cfbb64f887fdf25a05613094450e27cc122e3dffb2238766ffadd98e2d65d041cae20fff1ac5c4a1798f50c57330772e2fdd3a
-EBUILD lua-openssl-0.7.8_p0-r2.ebuild 2510 BLAKE2B baf5e8d6b7015c761ada5e63a4c219b7efdb6b09012b298edab2db61f9c855c72147a4863bb9ae43feab4718b837b780dd2c50dd59c32949fc0fa56e5bdb8241 SHA512 c8bf27ce0796c1ddfb59c78308713865913a49c4f87ca7776541112aea85a6973292959944de034eeec2e122b0f3e07435a5fd29cb6976be4db70ac76a13b185
+EBUILD lua-openssl-0.7.8_p0-r101.ebuild 2638 BLAKE2B 462c64e0d256afcf119406a7a64e9acf0dccf84b933469a683633d850cc685f08ae299bc46b42477a1714eb76129996262ca0229562192d892280784690f35bb SHA512 2d9153f2a0edac78c06a40e60212c1828547df2cd446a0befad8d3fcd44e751ae4173b963cf5ef7b1326c9764e513f8973c31f5f020271e53369723a47f56d0c
+EBUILD lua-openssl-0.7.8_p0-r3.ebuild 2699 BLAKE2B 6493cd72c0100cf0d398c830fdf267eea082c255e43b8ffcd857c052ace9862755c1b8545c1b1a8cfbb8f69573aa3789f363cd54711e7472458055b8ff70bf60 SHA512 83db54985fb38adfde94305bcfea5a7f3c717c150fb42b86316652f8de75268d0cb8c8ed7b38e03f76dc44575748c770327f4876da50686936be3abdbfaf96f8
 MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
deleted file mode 100644
index f8e40f03140f..000000000000
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
-LUA_COMPAT=( lua5-{1..3} luajit )
-MY_PN_AUX="lua-auxiliar"
-MY_PN_COMPAT="lua-compat-5.3"
-MY_PV="${PV//_p/-}"
-MY_PV_COMPAT="0.10"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-SRC_URI="
-	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
-	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-lua/luaossl
-	!dev-lua/luasec
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( "README.md" "samples/." )
-
-src_prepare() {
-	default
-
-	# Prepare needed dependencies (source code files only)
-	rm -r deps/{auxiliar,lua-compat} || die
-	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
-	mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"AR=$(tc-getAR)"
-		"CC=$(tc-getCC)"
-		"LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
-		"LUA_LIBS=${LDFLAGS}"
-		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"LUA=${ELUA}"
-		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" test
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
-		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	insinto "$(lua_get_lmod_dir)"
-	doins -r "lib/."
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
new file mode 100644
index 000000000000..812eb60b0a60
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PN_AUX="lua-auxiliar"
+MY_PN_COMPAT="lua-compat-5.3"
+MY_PV="${PV//_p/-}"
+MY_PV_COMPAT="0.10"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="
+	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
+	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-lua/luaossl
+	!dev-lua/luasec
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( "README.md" "samples/." )
+
+src_prepare() {
+	default
+
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
+	# Prepare needed dependencies (source code files only)
+	rm -r deps/{auxiliar,lua-compat} || die
+	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
+	mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"AR=$(tc-getAR)"
+		"CC=$(tc-getCC)"
+		"LUA="
+		"LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
+		"LUA_LIBS=${LDFLAGS}"
+		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"LUA=${ELUA}"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
+		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" test
+
+	popd
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
+		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+		"LUA_LIBS="
+		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	insinto "$(lua_get_lmod_dir)"
+	doins -r "lib/."
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
deleted file mode 100644
index c8c126b8cb44..000000000000
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
-MY_PN_AUX="lua-auxiliar"
-MY_PN_COMPAT="lua-compat-5.3"
-MY_PV="${PV//_p/-}"
-MY_PV_COMPAT="0.10"
-
-inherit toolchain-funcs
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-SRC_URI="
-	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
-	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-lua/luaossl
-	!dev-lua/luasec
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( "README.md" "samples/." )
-
-src_prepare() {
-	default
-
-	# Prepare needed dependencies (source code files only)
-	rm -r deps/{auxiliar,lua-compat} || die
-	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
-	mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
-}
-
-src_compile() {
-	local myemakeargs=(
-		"AR=$(tc-getAR)"
-		"CC=$(tc-getCC)"
-		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIBS=${LDFLAGS}"
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	local myemakeargs=(
-		"LUA=$(usex luajit 'luajit' 'lua')"
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" test
-}
-
-src_install() {
-	local myemakeargs=(
-		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	doins -r "lib/."
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
new file mode 100644
index 000000000000..88652952c1f3
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
+MY_PN_AUX="lua-auxiliar"
+MY_PN_COMPAT="lua-compat-5.3"
+MY_PV="${PV//_p/-}"
+MY_PV_COMPAT="0.10"
+
+inherit toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="
+	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
+	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-lua/luaossl
+	!dev-lua/luasec
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( "README.md" "samples/." )
+
+src_prepare() {
+	default
+
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
+	# Prepare needed dependencies (source code files only)
+	rm -r deps/{auxiliar,lua-compat} || die
+	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
+	mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
+}
+
+src_compile() {
+	local myemakeargs=(
+		"AR=$(tc-getAR)"
+		"CC=$(tc-getCC)"
+		"LUA="
+		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS=${LDFLAGS}"
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	local myemakeargs=(
+		"LUA=$(usex luajit 'luajit' 'lua')"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" test
+}
+
+src_install() {
+	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
+		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS="
+		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
+		"TARGET_SYS=${CTARGET:-${CHOST}}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	doins -r "lib/."
+
+	einstalldocs
+}
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 6a86b46dee61..a6b08d26a6d0 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,5 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r101.ebuild 1784 BLAKE2B 363d75d53e1ccd55d89ecf9f1961957c2bb8b7ff2d3b54dc886dec1b0cca608ca5a2414b08f77c6f0932c63f86a0641ab7aa0b905ac133e9ba2f93ef48c29ebb SHA512 4d5c703f8b7268ee0304736af83ae2fc8d5ab30c3e2a5d5bec7a4a0a65d877a09cbc8b1e5ca60e2901f375047cae092554c60d6cbfd09bcc1b819d834e6679c7
+EBUILD luadbi-0.7.2-r102.ebuild 1814 BLAKE2B c84609d6d3948eed4f5f90685fdd7f04f740fd24e8f3217c24e559209292f6d639eed9dc5399ca3cddc13b8ea8f28689c3e6787d3ba74b7757272d50ec1c6359 SHA512 05cc330aab3d196130f87730d10d1c79199953ee7a1f1b5071d9a087232e0d89cab3bc2b99dfabf7c4b8c95fd62f1b9080abf0efccdb8315ba0673905ac0bea6
 EBUILD luadbi-0.7.2.ebuild 1580 BLAKE2B c496005647a4783c57f2a7cd7482a46dc92e5efbc8e1760e26255270f04d2bfa5947b8d7792bc8a8d3f6ac75d2db89ce36841e3f5a8094670f95a31da60ec513 SHA512 135ad359cf5c5e4a3ad2cec2c436f624d52e49954f6fd44f2b28a58733c14a63eb145574f1a5677cf3063c737a21cb25648fcfe32a01e2ca7ca6707b89b65eba
 MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
deleted file mode 100644
index 03742f998777..000000000000
--- a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="A database interface library for Lua"
-HOMEPAGE="https://github.com/mwild1/luadbi"
-SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql postgres +sqlite test"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	|| ( mysql postgres sqlite )
-"
-RESTRICT="test"
-
-RDEPEND="
-	${LUA_DEPS}
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/luarocks
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
-}
-
-lua_src_compile() {
-	tc-export AR CC
-
-	local myemakeargs=(
-		"LUA_INC=$(lua_get_CFLAGS)"
-	)
-
-	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
-	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
-	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	cd "${S}"/tests && ${ELUA} run_tests.lua || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	local myemakeargs=(
-		DESTDIR="${ED}"
-		LUA_CDIR="$(lua_get_cmod_dir)"
-		LUA_LDIR="$(lua_get_lmod_dir)"
-	)
-
-	use mysql && emake ${myemakeargs[@]} install_mysql
-	use postgres && emake ${myemakeargs[@]} install_psql
-	use sqlite && emake ${myemakeargs[@]} install_sqlite3
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
new file mode 100644
index 000000000000..8958edd4d2c1
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A database interface library for Lua"
+HOMEPAGE="https://github.com/mwild1/luadbi"
+SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql postgres +sqlite test"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	|| ( mysql postgres sqlite )
+"
+RESTRICT="test"
+
+RDEPEND="
+	${LUA_DEPS}
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted[${LUA_USEDEP}]
+		dev-lua/luarocks
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+}
+
+lua_src_compile() {
+	tc-export AR CC
+
+	local myemakeargs=(
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
+	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
+	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}"/tests && ${ELUA} run_tests.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		LUA_CDIR="$(lua_get_cmod_dir)"
+		LUA_INC="$(lua_get_CFLAGS)"
+		LUA_LDIR="$(lua_get_lmod_dir)"
+	)
+
+	use mysql && emake ${myemakeargs[@]} install_mysql
+	use postgres && emake ${myemakeargs[@]} install_psql
+	use sqlite && emake ${myemakeargs[@]} install_sqlite3
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 7d8ff92ef925..54722912720a 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -2,6 +2,6 @@ AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60
 DIST luv-1.32.0.0.tar.gz 91349 BLAKE2B e4a90b3241e2fe650f62e34439ed75f9ba53168d6bd96b8685fc5600d6f9cbb1bb598a7d40d918ab9123cf4bad99f872a79d0664056d35caba52d1eda9046020 SHA512 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST luv-lua-compat-0.7.tar.gz 51383 BLAKE2B ae86f314de971fcd7d8706009d59d684c035fb661ecf392c581a3c317cc1a396321ef7af0418d8f23151c52c66613a0749e8fa9ac889a183c2ffe749091dae35 SHA512 665ece98422a105b818cffd96eea5788696fbb854d2ba41d2d387e8bd25c1fa9de601468e55e22e9e749979a66d4d2e0f7dfd656e5bf27b489d37bb07c96f48d
-EBUILD luv-1.32.0.0-r101.ebuild 2973 BLAKE2B 0735044bb0363923faa5e61f6d479194ff1e658086bbeb48cb7272aa24ddebc91a968ffa26d6d841dbb64e562556df3680a00c63eb02594be823891ab09b99c3 SHA512 7304ea117511225fb0d7bc7b1fd47edb7df9c44c999091f6f5ca7238fd3b31f06d4e396e2a96d51b273051e6ca52b4b0622e4705dd61937463e2ed6a18cd512e
+EBUILD luv-1.32.0.0-r102.ebuild 2185 BLAKE2B d1b5b1ee9148f625cbc2f6fff926c530768ec1f9e6fec78250f98ea8638804a3f26ba1914717cc95b73c5f61e0b1dd5f25070ccd8af6651374924a2f246ba95d SHA512 727d7d98a012b6510005a633661672640eda2e0ce381e74621615114e5d6386761a3e2b00e6b9df87d1bb633b1c296a0226c310cf39c2b55bd535aafe9987c5e
 EBUILD luv-1.32.0.0.ebuild 1565 BLAKE2B b3cb0bc8ef2eb95e6b78ef0203feaa19b825b21f323599039da197715d829f3af596fa0489051a43c4d84ed62744e4cfef44ab7f2989494124a28f8ac05d522c SHA512 91bfaef1b5efb7bbb38707dff7a81baa620dad9d7d97c787adb233387e225f9b193ecc9419e5eaa6b0e02e0cbf5e9a225e8e01dcddc6869ddeae2bfe193c3716
 MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
diff --git a/dev-lua/luv/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r101.ebuild
deleted file mode 100644
index f45e0eee2820..000000000000
--- a/dev-lua/luv/luv-1.32.0.0-r101.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.10"
-SRC_URI="
-	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${LUA_DEPS}
-	>=dev-libs/libuv-1.32.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix libdir
-	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
-	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-	cmake_src_prepare
-}
-
-lua_src_configure() {
-	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="$(lua_get_cmod_dir)"
-		-DBUILD_MODULE=OFF
-		-DLUA_BUILD_TYPE=System
-		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
-		-DWITH_SHARED_LIBUV=ON
-	)
-	if [[ ${ELUA} == luajit ]]; then
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=LuaJIT
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=Lua
-			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-lua_src_test() {
-	# We need to copy the implementation-specific library back so that the tests see it
-	rm -f ./luv.so
-	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
-	${ELUA} "tests/run.lua" || die "Tests failed"
-}
-
-lua_src_install() {
-	cmake_src_install
-	mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig && \
-	mv "${ED}$(lua_get_cmod_dir)"/pkgconfig/libluv.pc \
-		"${ED}"/usr/$(get_libdir)/pkgconfig/libluv-${ELUA}.pc || \
-	die "Failed make pkgconfig file for ${ELUA} implementation-specific"
-	rmdir "${ED}$(lua_get_cmod_dir)"/pkgconfig || die
-}
-
-src_configure() {
-	lua_foreach_impl lua_src_configure
-}
-
-src_compile() {
-	lua_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-}
-
-pkg_postinst() {
-	ewarn "Please note that in order to properly support multiple Lua implementations,"
-	ewarn "this ebuild of ${PN} installs its library files into implementation-specific"
-	ewarn "module directories, as well as multiple .pc files named after implementations"
-	ewarn "(e.g. 'libluv-lua5.3.pc'). Since upstream by default only supports a single"
-	ewarn "Lua implementation at a time and thus only provides a single, unversioned"
-	ewarn ".pc file, projects depending on ${PN} might require changes in order to"
-	ewarn "support the multi-implementation approach."
-}
diff --git a/dev-lua/luv/luv-1.32.0.0-r102.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
new file mode 100644
index 000000000000..7b4e0feb5b76
--- /dev/null
+++ b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.10"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+	>=dev-libs/libuv-1.32.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake_src_prepare
+}
+
+# This could in theory be multi-impl (and we have an ebuild in git history,
+# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
+# app-editors/neovim, actually links against luv instead of trying to load it
+# as a module. We could probably implement some sort of a hack for this
+# - but given how messy it would be, don't bother unless someone actually requests
+# luv multi-impl support.
+src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_SHARED_LIBUV=ON
+	)
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=LuaJIT
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=Lua
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# We need to copy the library back so that the tests see it
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
-- 
cgit v1.2.3