gentoo resync : 25.11.2020

4 files changed, 104 insertions, 23 deletions

diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index df8ce5212b12..86395c21f024 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,3 +1,4 @@
-DIST lua-compat53-0.9.tar.gz 53599 BLAKE2B 7d9efe0afb49c40a68b1d6c28f975080b3331e07d0aa788e0f1f77d5c360504a5cac9cca4e6074b2c64aa7ad8934df3fe2609ff8009db52b046b2f639b670213 SHA512 bec15b6e95cb5cc775785515eba1f094e453059a0ba1eefa433d328b823378b7f48d9c7a34080ad77478cffb2008bead93418f809793afa6021e6046562acc58
-EBUILD lua-bit32-5.3.5.ebuild 1270 BLAKE2B cc69c0d34763589c78e81b954b33bedad6f0d69dc030e3cf8b05b4bd72f540b9e0e6a517713af1359bda3a397e631e36595e3ff2fb50435863c628cb08a71089 SHA512 3d389fc5e116909208994e1fb9e81f25269509137bafa7de385a7054a058068c79840fa64b92747fa1da10afb56119bcf4b5a3cbca3198c14ab3107c29be36a3
-MISC metadata.xml 485 BLAKE2B a5ec0e8d9920cd1f13a9211604ae5eb25db248a81b1d9469931347b77b1c64cee0fb34e54f93ab36611d35b79025966cc0ab13606084c81d1c7959a84bda045d SHA512 d79b3496b6d54ba350161c8b0aeee317df5053d334627ee9e8cdace0a699b4c9f1d9f58e5e391327baa89d4b6aa00fbccfda5b40718f7e852d4e21dc8da3cf27
+DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
+EBUILD lua-bit32-5.3.5-r101.ebuild 1408 BLAKE2B 309e52e5d3486baf442d6a28dab9ba44a89e4d31ae21625482adaa68c5bc501e1d2dc0e9bfbc995baadf9b6e6681314bdbd53d61b926c01b1481a84ebf8b89d8 SHA512 91e678e50e096ed9d2c5695acc1295faa5b96446b72ca405ec820279666539455020c6ad81ede6059ca7ce4372d54a41f8adb156cf90db7f5fbd91acdd4ffd44
+EBUILD lua-bit32-5.3.5-r2.ebuild 1297 BLAKE2B 3ea7275a36d083f34af99f3f6f6b885e0bf71c7d57e1546d668b774fb834f7d33f291aae3a223f871d79996a624128da4e7a8830af43f3393967e0852ba20869 SHA512 6e0e3a642662e49f5af9f2c01a47c4eccc7a019ed3633ff3976484f6afeae683e90f9ec4ab0c9f5381aacddf27fa69be3c2f0a9b98ab46a2d5a556ba15f67ed8
+MISC metadata.xml 580 BLAKE2B 4499d47fae3cbc26be9bbaf4cf8db719b6ec28989fb4c583e6c16006378b6161a6a32062638df6bc41743e271bf395abf5e348e39a9419b496ba6b834ed71a95 SHA512 eefe4c553c1dc03173b7662969c8bc56cc6be18b879d199c20ade33b4043fe71cec065e71fbc2bdba9a35ea88eab6f8a41b834d433159fbced2e743e663d6974
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
new file mode 100644
index 000000000000..6bb9594da9cc
--- /dev/null
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+MY_PN="lua-compat-5.3"
+MY_PV="0.10"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Backported Lua bit manipulation library"
+HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
+SRC_URI="https://github.com/keplerproject/${MY_PN}/archive/v${MY_PV}.tar.gz -> lua-compat53-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+lua_src_compile() {
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"${LDFLAGS}"
+		"-DLUA_COMPAT_BITLIB"
+		"-Ic-api"
+		"$(lua_get_CFLAGS)"
+		"-c lbitlib.c"
+		"-o lbitlib-${ELUA}.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"-o bit32-${ELUA}.so"
+		"lbitlib-${ELUA}.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	LUA_CPATH="./bit32-${ELUA}.so" "${ELUA}" "tests/test-bit32.lua" || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	exeinto "$(lua_get_cmod_dir)"
+	newexe "bit32-${ELUA}.so" "bit32.so"
+}
+
+src_install() {
+	default
+
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
index 82297b4fe6ab..63a13ff6ed83 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
@@ -5,29 +5,30 @@ EAPI=7
 
 inherit toolchain-funcs
 
+# Weird upstream version descisions...
+# Result tarball may be reused for future lua-compat53 package
+LUA_COMPAT_PN="lua-compat-5.3"
+LUA_COMPAT_PV="0.10"
+
 DESCRIPTION="Backported Lua bit manipulation library"
 HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
-# Wierd upstream version descisions...
-# Result tarball may be reused for future lua-compat53 package
-LUA_COMPAT_V=0.9
-SRC_URI="https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_V}.tar.gz -> lua-compat53-${LUA_COMPAT_V}.tar.gz"
+SRC_URI="https://github.com/keplerproject/${LUA_COMPAT_PN}/archive/v${LUA_COMPAT_PV}.tar.gz -> lua-compat53-${LUA_COMPAT_PV}.tar.gz"
+
+S="${WORKDIR}/${LUA_COMPAT_PN}-${LUA_COMPAT_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-# Strictly for lua 5.1
 DEPEND="dev-lang/lua:0="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_V}"
-
 src_compile() {
-	# TODO maybe sometime there will be luarocks eclass...	
+	# TODO maybe sometime there will be luarocks eclass...
 	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
 	einfo "${compile}"
 	eval "${compile}" || die
diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml
index 32feba463055..5ff7bd4eab78 100644
--- a/dev-lua/lua-bit32/metadata.xml
+++ b/dev-lua/lua-bit32/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
+	</upstream>
 </pkgmetadata>