gentoo resync : 25.08.2020

30 files changed, 307 insertions, 227 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1dc5f1e19ba4..7898a6f08a9f 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index b8277ce56c1b..7af9da1e51f8 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -2,5 +2,5 @@ DIST lgi-0.9.0.tar.gz 285248 BLAKE2B e5e6fe79899b70f46338827296b921c04c31ac1edc8
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
 EBUILD lgi-0.9.0-r1.ebuild 1367 BLAKE2B 1a24b782bd95f856b103b7751986aa0f92d747a05812845f4ef1c1ad3e04b4ab85c787f7d0c43274691c116d130ac118e084885daad192cda27996eb0f3f5ed7 SHA512 7f9e930a977d55175d71de4dc26792506aad6597509a76fac1146b773387a76389c4269afb0fe769e89e9375f951972e25a29b3b67d6d2ed6eddbaef04b2da96
 EBUILD lgi-0.9.0.ebuild 1309 BLAKE2B 2ed523524ae8122e087c329ea257ce482e7cc61c716c1c814d692e9b0ec3452a83cb18ee20a11a2d6d19355375b0eec5769ac57202e28aeb849a153bc8ca8bc8 SHA512 04526e050eed656971358c99bde3d5ebc79b08e586d77677a6f5715457cbcfd8572e7bf14dfd5f70fc76e05bd1daf2ed3ae26bcc2aed91db3e2227b3b3ed595c
-EBUILD lgi-0.9.2.ebuild 1377 BLAKE2B 0102b7f3f40401ca9339a1cde2c166c10373265ad5a0bb82864c34af3edf88d3d9003fe73a696fd542176eb863ff17907f8a624d342547972bc99d5d81acaca8 SHA512 dc2aa0d675467f7fbd7a9c448eca6de4094a8abd9b298997354ed770da95fb60896568c016aed6d058f747e0c8951e25d897753ae34b956c6f64a867d17bd9bc
+EBUILD lgi-0.9.2.ebuild 1373 BLAKE2B ac0ebc58a9189f9eee7dc8af3cec63b7bc42b6e754ed350b6ef922f97619a2448a507e6fbf8ae612d9bc14aadc2c331b777a3ec26719cb627bfe5371c98ac192 SHA512 b4b51c4c82d1f961ef4e71c7085cb0cdef935ff9033837e24b2940fa3c0144a2dd0db265bc7bf2cdde41fe664d8a56f46139ffdb650f830bb4430e864407d344
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
index c2faaf94dbc1..b3ced88be248 100644
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
new file mode 100644
index 000000000000..df8ce5212b12
--- /dev/null
+++ b/dev-lua/lua-bit32/Manifest
@@ -0,0 +1,3 @@
+DIST lua-compat53-0.9.tar.gz 53599 BLAKE2B 7d9efe0afb49c40a68b1d6c28f975080b3331e07d0aa788e0f1f77d5c360504a5cac9cca4e6074b2c64aa7ad8934df3fe2609ff8009db52b046b2f639b670213 SHA512 bec15b6e95cb5cc775785515eba1f094e453059a0ba1eefa433d328b823378b7f48d9c7a34080ad77478cffb2008bead93418f809793afa6021e6046562acc58
+EBUILD lua-bit32-5.3.5.ebuild 1270 BLAKE2B cc69c0d34763589c78e81b954b33bedad6f0d69dc030e3cf8b05b4bd72f540b9e0e6a517713af1359bda3a397e631e36595e3ff2fb50435863c628cb08a71089 SHA512 3d389fc5e116909208994e1fb9e81f25269509137bafa7de385a7054a058068c79840fa64b92747fa1da10afb56119bcf4b5a3cbca3198c14ab3107c29be36a3
+MISC metadata.xml 485 BLAKE2B a5ec0e8d9920cd1f13a9211604ae5eb25db248a81b1d9469931347b77b1c64cee0fb34e54f93ab36611d35b79025966cc0ab13606084c81d1c7959a84bda045d SHA512 d79b3496b6d54ba350161c8b0aeee317df5053d334627ee9e8cdace0a699b4c9f1d9f58e5e391327baa89d4b6aa00fbccfda5b40718f7e852d4e21dc8da3cf27
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
new file mode 100644
index 000000000000..82297b4fe6ab
--- /dev/null
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Backported Lua bit manipulation library"
+HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
+# Wierd upstream version descisions...
+# Result tarball may be reused for future lua-compat53 package
+LUA_COMPAT_V=0.9
+SRC_URI="https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_V}.tar.gz -> lua-compat53-${LUA_COMPAT_V}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+# Strictly for lua 5.1
+DEPEND="dev-lang/lua:0="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_V}"
+
+src_compile() {
+	# TODO maybe sometime there will be luarocks eclass...	
+	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
+	einfo "${compile}"
+	eval "${compile}" || die
+
+	link="$(tc-getCC) -shared ${LDFLAGS} -o bit32.so lbitlib.o"
+	einfo "${link}"
+	eval "${link}" || die
+}
+
+src_test() {
+	LUA_CPATH=./?.so lua tests/test-bit32.lua || die
+}
+
+src_install() {
+	exeinto $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)
+	doexe bit32.so
+	dodoc README.md
+}
diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml
new file mode 100644
index 000000000000..32feba463055
--- /dev/null
+++ b/dev-lua/lua-bit32/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>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 8fafdd2742db..4a3f1d6707bc 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,6 +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
+AUX luaexpat-1.3.3_makefile.patch 410 BLAKE2B 45b0c24795c679fc69c5cbf9683aa2a47da5ef1f874acb0336df014ef319566a7149c51253f843e5113263212ea585b517095423c77f3bf0580f31acee140b09 SHA512 c34f4e68d3b72b2dc5f7f09ed2f3128ec37becfbc6fa0d72d35be3374f4fc92a4159fa279d6a101a3671c05a4a1f3e248756ba1a0505f900bbece3290376c577
 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 1327 BLAKE2B 8a37db17a5c86b9ee84bc9925ac57ff332b03633ae82e3fa2870ed2d0f9207f4b7acff370b592ac7a1102953d9df06d19d925e6a55184f59d6b1768da03ca6c3 SHA512 582ee48e54d47326d9aa1f428aa3c23bcf374f96a50d0e47670f9d4693d3ea3989c1e7a2a2ecbcec352123758c9026e2d58518b204587561064d5de6b6101aba
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63
+EBUILD luaexpat-1.3.0-r1.ebuild 1330 BLAKE2B 590fc39478e83833ecd56830181a630e19da3bbfa785b724c27b41e0716f13f4200cc8198418485740b4e6a2aeedf45c3f7cfda14edcf8408f5662a227548999 SHA512 7aef89e153094caf0d3ed99ac2a226b9f00f6f252842dfdb6f4a5e3cf3b72b47f2d5de95770eb5cfe2558b9c9b1ee9fc5357d6b9071a1656c39775d6217905fd
+EBUILD luaexpat-1.3.3.ebuild 1171 BLAKE2B 762679f6a2a91e5a52d3b52c4fa9f3a9323b1766da347abe25e43d6f2bd8aad303383b438b148755f863f152b408237f5d606d0afce54cc921dd75fcdcd6dc7f SHA512 abcde4cfdf6ee944c9ce74775a8508faa81243c7eed92fa02a765245bf551eca3d7e3111b610f37f3d8e5e4d7841e99e1eed75cc66fcb9d4c5e0ab1969972eda
+MISC metadata.xml 480 BLAKE2B 2eaf94b50215f43616af6cca2a5102ea4c52ba629f54e6b32b1b9bc4a4edf601619902de285129cab26cf97dd5f847c2dad80d36d896b03a8b5e83d3cda9a4f3 SHA512 33052ffee5b4e34879461358cdd6fd553d093e03d53e13e61186ad45d5c8d1d9171c7c8d461a8d7ab40457458cdac1f7794b2c450423764a19306699a3fad0c3
diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
deleted file mode 100644
index 754fe27c8419..000000000000
--- a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
new file mode 100644
index 000000000000..95de7be60690
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 1a5a145..df09239 100644
+--- a/makefile
++++ b/makefile
+@@ -45,7 +45,7 @@ OBJS= src/lxplib.o
+ lib: src/$(LIBNAME)
+ 
+ src/$(LIBNAME) : $(OBJS)
+-	$(CC) $(CFLAGS) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
++	$(CC) $(LDFLAGS) $(CFLAGS) -fPIC -std=gnu99 -ansi -I$(LUA_INC) -I$(EXPAT_INC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
+ 
+ install:
+ 	mkdir -p $(LUA_LIBDIR)
diff --git a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
deleted file mode 100644
index 79fc45c14b42..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
index 098294058563..2cbb8f239da6 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
new file mode 100644
index 000000000000..9c6db1a5eef6
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://github.com/tomasguisasola/luaexpat"
+SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LUA_INC="$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
+}
+
+multilib_src_install() {
+	emake \
+		LUA_DIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
+		LUA_LIBDIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc -r README.md doc/*
+}
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index 1b2becffa26c..33b51fda50f9 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tomasguisasola/luaexpat</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 29297f21a286..35e97f6e7440 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +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
+DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
+EBUILD luaposix-35.0.ebuild 1059 BLAKE2B 8dea5357ede61b2859eeb93cb844b0ce3c95fce9efd2f02f5b9c9002b4a1e6cefdf45e96cc73259d4643704447e8c9c292354cfd601052f51d333469559096ef SHA512 f9ae8c1a46a5ecafee6cce50d9b029ab135abcacc9d3aedd17fd9e12d4edb5d4ec501b2f1eea1317b03802f5edc946e441e28256b79a54e35893b63d95a94e8f
+MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
diff --git a/dev-lua/luaposix/luaposix-33.4.0.ebuild b/dev-lua/luaposix/luaposix-33.4.0.ebuild
deleted file mode 100644
index ba2e3aea549f..000000000000
--- a/dev-lua/luaposix/luaposix-33.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/luaposix-35.0.ebuild b/dev-lua/luaposix/luaposix-35.0.ebuild
new file mode 100644
index 000000000000..a49f69845d1a
--- /dev/null
+++ b/dev-lua/luaposix/luaposix-35.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bindings for POSIX APIs"
+HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
+SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-lang/lua:0=
+	dev-lua/lua-bit32"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	./build-aux/luke package="${PN}" version="${PV}" \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
+		INST_LUADIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
+		CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	./build-aux/luke install \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
+		INST_LUADIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
+		|| die
+	dodoc -r doc NEWS.md README.md
+}
diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml
index 686aaf5c3d7a..142f40aa2588 100644
--- a/dev-lua/luaposix/metadata.xml
+++ b/dev-lua/luaposix/metadata.xml
@@ -1,11 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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>
+  <maintainer type="person">
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">luaposix/luaposix</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index d7eab90a1164..b94803760112 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,9 +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
 DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
-EBUILD luasec-0.5.1.ebuild 1081 BLAKE2B efb926c4f933bbddd415e583601f9b7cd8b33a6fcf377003b9390f02e853a26b937a540b97eb26969fc79ac12b96aeb929104fa7e91d882028bcd4f4fac33f71 SHA512 38eaacb4cbaa94f5549e0e6990fcc8c596428d30f901eb36b1f96bdf010a894983ad572d942d3692f131766dfb19ad99ebca289c043ddc4c1dc211ba5065b367
-EBUILD luasec-0.6.ebuild 1027 BLAKE2B d9aa030c4b22570fc58f43b1a2ccdb8efbf11d02913fe957dcb9ab65efc75f8a5909aade97b4bee5c5d3844321a28903dac4f38368eb8825869ffe28201fc2af SHA512 e8fb6764d9d480048edd2ae1ad68aa730e99c6f7b3839fd7f2dd2577bf162b194fca1093f9432657acbf5535c706b60a78cdaaf66884d30b1ee32ef09828d827
-EBUILD luasec-0.7.ebuild 1093 BLAKE2B 0061f58416b32eae8efdbea93e43304750c2be4b83e28e14fd83c51d4808c90882cd3f215db8aef9b6f1e3d84a224d7b5bc2778d2ca978335cacb178b6801058 SHA512 ff88279b832cdcec821088d173f9fea0aac8d0e2a60498c7c5cf97a4eea1d45a302d61e111b59e4b2b813a9694dc9cbb5e75ae7092bbf5b65e833f853e8c476b
+DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
+EBUILD luasec-0.7.ebuild 1110 BLAKE2B 8776d00d3c3b5e437b70f91a0785a655ec95e2981321ec4002b207da2a1e2581f27b93471d08f527a16e032424a824e613c82ffc57297f3f74a4578072977761 SHA512 3aa16b8fd2c58a95ef4e1744ca4b96ecabd5d82a34121e3dabe394548d7ee92ff0e17249cc3120c12ae093c9ebb68e8bbdb96901f9dafd0123c9a685702e43f4
+EBUILD luasec-0.9.ebuild 994 BLAKE2B 680eaffcf974bcd70d01133f95ef4df3d375effe55aef2b7756030624431c4e2c51a13ef81a5651b2430379eaddb7e6d4f05b12222807ca10a95964c538699d2 SHA512 9c8c944fabaf6053ddbe4ebe6bda040b95c4ee2093a18c344e397c642fcaa227f3eb3a5390187e3573fdeb054385be60c57af0b8dd43735e09768ee60efad7b2
 EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
-MISC metadata.xml 251 BLAKE2B 4baa47418ca09e10932c552ccd758002d2c76a0b9c5cac2a13babb2794610d1a5aa3bbdc60e58495cd5b9722a4271be2900fc19b577463431e19a96daa52faa2 SHA512 fdc3a6e4d9b393d015bb3ebcbd5d5ca9cd1b417f5e5ad51495fb7576144d29f967a686d3625e34ec5e1a15db252640ab224ae9e69d9552c4ad2e8a7794e9b297
+MISC metadata.xml 471 BLAKE2B 678f1c3e123d5690a1f7c68ee5b4c0bba74f48762692e9fc27739bdfa79e609ca9c140cb2eed1548b8c9f08f29bd828f805b28ca8b99ec51f301c77e52e41113 SHA512 8b5bd42751700ef9893f73111e8014c116b4a6e07891346602c42485c7daf4de63388936c95182bc6d2a9506353a48354e1a1e56e7ef299643206ced57d506df
diff --git a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
deleted file mode 100644
index 951b6fb11dbf..000000000000
--- a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index f8cdd3945dd0..000000000000
--- a/dev-lua/luasec/luasec-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
index d6ddcf8c569f..4dc8f5927ae9 100644
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ b/dev-lua/luasec/luasec-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-lang/lua-5.1:0[deprecated]
 	dev-lua/luasocket
 	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -36,8 +36,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
 		linux
 }
 
diff --git a/dev-lua/luasec/luasec-0.6.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
index 40f367fc02d4..013a9b13d85e 100644
--- a/dev-lua/luasec/luasec-0.6.ebuild
+++ b/dev-lua/luasec/luasec-0.9.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs
 
 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"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
 
 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}
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
 	sed -i -e "s/-O2//" src/Makefile || die
-	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
+	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
 }
 
 src_compile() {
 	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
 		linux
 }
 
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index 46794a8d4e3f..e33b533b4b13 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">brunoos/luasec</remote-id>
   </upstream>
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 88358718b567..0ca2f25f2929 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,4 +1,5 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
-EBUILD luasocket-3.0_rc1-r4.ebuild 1159 BLAKE2B e073fff21eb73b934529867a934f453b27005a581115f6447b93ad9c6be92bcf39ab9b884855afed4779258fd1743761daeacb8f04ea79ec87bccee32c297a4a SHA512 1ae21adfdfcfbf614fd8babe94151b5755ebaf053ff80730511f44a4c01cebb1ea5eb948d4ca64c80c6c67055c2249dbea5a80358b255b74a2296ea9bbc763fc
-MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
+EBUILD luasocket-3.0_rc1-r4.ebuild 1200 BLAKE2B 195a0adc1922c68d5ec34b9e918a5f95e7fda0144c2f6b67970523885e3c77375ee184421804de32b41930a7b5f7c5f70e22030362423e4f4dbcc27591239e98 SHA512 ddec5f0f99583101aa5a3524e783d3aec40522c8ab5552ff0b762e0908c19d47eaec8e7a84bee96053ab98a9b9d7d17926ff93bbb7632841545354e58fdce980
+EBUILD luasocket-3.0_rc1-r5.ebuild 1269 BLAKE2B 2d68f6772b9b9b64f6e4a7019fe0fbb0d1b06853b22dbf6b25df7e1009fc9cadf71d011ce25192533b2327e9c9a0e696922da36e37e979ebcb684c385fc38be3 SHA512 e26279b51433c160b3eeed4891684ef339c711986ffd6bce5f0b89b714bcdaac792b033cf6a28558be8c5660dd12258e513a7025465a34be53e07e4130bbae39
+MISC metadata.xml 477 BLAKE2B 52f02912583a3e2ab7d848bbfa824053e739efd616e07f73ffa49e8224f2b96da7007ee3d6e4fcbc613d9fbf92749d36f9db6f06cf2602f5df7fd6b9336fb310 SHA512 ea7c6680247c77e364316be205f5845357d940c6efd38e8f9ce2575afd02012a544cd859903f25255893653c1ab9afd3403fb67a5e9dc5469fc7bbf4b94d7677
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
index 445630ad79d5..edede5c979ef 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
@@ -6,7 +6,8 @@ EAPI=7
 inherit multilib multilib-minimal flag-o-matic toolchain-funcs
 
 DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
+HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/diegonehab/luasocket"
 SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -14,9 +15,9 @@ 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"
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${PN}-${PV/_/-}
 
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
new file mode 100644
index 000000000000..f6af809d1b98
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal flag-o-matic toolchain-funcs
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/diegonehab/luasocket"
+SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${PV/_/-}
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/proxy-fix.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC) ${CFLAGS}" \
+		LD="$(tc-getCC) ${LDFLAGS}"\
+		$(usex debug DEBUG="DEBUG" "")
+}
+
+multilib_src_install() {
+	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
+	emake \
+		DESTDIR="${D}" \
+		LUAPREFIX_linux="${EPREFIX}/usr" \
+		LUAV=${luav} \
+		CDIR_linux=$(get_libdir)/lua/${luav} \
+		install-unix
+	insinto /usr/include/lua${luav}/luasocket
+	doins src/*.h
+}
+
+multilib_src_install_all() {
+	dodoc NEW README
+	docinto html
+	dodoc -r doc/.
+}
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index 409d430eb575..2af4fc2a4ace 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">diegonehab/luasocket</remote-id>
   </upstream>
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index c8adf6c985ce..89f58f003fe3 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,3 @@
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
-EBUILD mpack-1.0.4.ebuild 1046 BLAKE2B 987d07ad1d1eaae8472ce5c6881b340cdf12df54eca2d5185f976f62ec6111622f8cb6204ca8afabe911a7a63aef8f49fdb561d56df966fb151f795477e3e467 SHA512 520687a8b3d6ab22168a6d756183b63fdca411bfda945073f218cba1a534826819ef7ef68fb78dfc46598416abcb663f0d095fc6bdff169c123fd4781ff9159c
-MISC metadata.xml 248 BLAKE2B 81385dcd4ba6430bbbdba154d5db77437f343697bf1c614bc817716830ed37e708630ca786a43618e2597fe1e5056c69b4960ad0f6264842919680d47205795f SHA512 1c1f01209afb5e2ba42c1d242940af7b846561018ad6abef9a0bc8abdab6d8ebff3e71be9e0fa783e0c7d8ae3597f56e695135f21ff631b1026bfe7d792764f8
+EBUILD mpack-1.0.4.ebuild 1058 BLAKE2B cc907ec09c79aaf12c09a39f88ad39edbb23b128ae0c0e90d83ecd862072acbb82fd5252f8188540788371d4bf231c64172dcca4a4836cb913cc4cd264cbc966 SHA512 94dff8c1f5154e50653cc58638902f716990175e2d579e4ac5aa866638f252a5b4a3f616037dc183f8592b7785d28b7b9912ded7105fabc4feeeeecb6f858d87
+MISC metadata.xml 249 BLAKE2B 2176c8add15ed2ad2e76def8911e581e40a5a8b0ced984020fa93a507a5478a3636be5b8053df59af367394611b4ab309fe966517286e43ae29963cea9726382 SHA512 1af3a96a7be80a3d2ee34216ac8b85c8965406212b1bd8bef97bb6adb8719f14c97227cfb8885e85ae0981aa93396be9049cf8640640e3669fc17be6c7c489ff
diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml
index ee1dc5909516..efac9884a41f 100644
--- a/dev-lua/mpack/metadata.xml
+++ b/dev-lua/mpack/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">tarruda/libmpack</remote-id>
+		<remote-id type="github">libmpack/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
index 06fdd92124c3..2e8a8290a194 100644
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ b/dev-lua/mpack/mpack-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ 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"
+HOMEPAGE="https://github.com/libmpack/libmpack/"
+SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/libmpack-${PV}/binding/lua"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="luajit test"
 RESTRICT="!test? ( test )"