5 files changed, 178 insertions, 3 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 619a4a267141..11bcdb422dd5 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -14,9 +14,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
-IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
 
 RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
new file mode 100644
index 000000000000..8f4afd170344
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+PATCHES=( "${FILESDIR}/${P}-support-lua5-3+.patch" )
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CCOPT="
+		"INCLUDES=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	popd
+}
+
+src_compile() {
+	if [[ $CHOST == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+
+	local mytests=(
+		"bitbench.lua"
+		"bittest.lua"
+		"md5test.lua"
+		"nsievebits.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="./?.so" ${ELUA} ${mytest}
+	done
+
+	popd
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	mycmoddir="$(lua_get_cmod_dir)"
+	exeinto "${mycmoddir#$EPREFIX}"
+	doexe bit.so
+
+	popd
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local luav=$(lua_get_version)
+		# we only want the major version (e.g. 5.1)
+		local luamv=${luav:0:3}
+		local file="lua/${luamv}/bit.so"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 3f993995bd24..e41e519b7004 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,3 +1,5 @@
+AUX LuaBitOp-1.0.2-support-lua5-3+.patch 2747 BLAKE2B 1e00ea3f2b8c99b49bff1b0ed43e3bea370646a2a9c80856bafdcb58f2fc68ed3050ee980546ec75996608f7e97c3201f3b9240a13941edb43f7ef883c261ec0 SHA512 2b6a247b4fe18a87b7b3114d7b01dfbd36e2acd2c937661e1224f2828f610150022949f8b4b8a2d07f21bb1c79a1113b6d78436a284b4552b3ebf9f72184be82
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r102.ebuild 1785 BLAKE2B 4e2d852b18ed472808846b8e7392f090b1b74e629dd50b7122ab394e55f0a565b479a0ce90952ed4ff8078948c108dba79d0af67f4def1bfcc1a83854c301224 SHA512 a230a5ceb08d96d2071a292174c4e8c4111b9d14b4e3c2b81b8dbfd26da1ace348888467f5a11ebeaaafb27672254278e9ed9e05f0e4c1d2c39eeba7f4af4897
+EBUILD LuaBitOp-1.0.2-r102.ebuild 1746 BLAKE2B a065378b441af4f0ce0c571f17a1942d631e263fab06348ddd9409ac36eef4eded9a213413da3e98ea6e035a1d5b90a21137e4ff10c087409d3c2098c47bafc0 SHA512 3cdf405feb439e55fd2060c337e34ba23b79a5c8a2664771cfd0da378afd9f46bb58d904eca96792d7a73e6ae325f194e17124fb2f0d8bf3a07443740b3ab89a
+EBUILD LuaBitOp-1.0.2-r103.ebuild 1808 BLAKE2B 357fc5f6fdff428cbec6d0ed77e05ab8c2f0ecae5d3a68bcdb0df47e285b4bff23623e2e324fc60dfaf21598e0fb01a2688af878eb4dbe76e1442866db6667fc SHA512 d62b70b849d29d33631a8addaed4f7cd39b23c7efa00548d50a1bdd7f3ef081b099421415204fb7e7e494018c905cfe895112f4afb2ea47d86d9d08624904e82
 MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch b/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch
new file mode 100644
index 000000000000..23c0d23a2150
--- /dev/null
+++ b/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch
@@ -0,0 +1,78 @@
+This patch is a result of diff between upstream and bundled library in rspamd
+
+https://github.com/rspamd/rspamd/blob/30298909543453ebe969878f1406ee76ad148494/contrib/lua-bit/bit.c
+
+diff --git a/bit.c b/bit.c
+index 690df7d3c..01326c99a 100644
+--- a/bit.c
++++ b/bit.c
+@@ -46,7 +46,7 @@ typedef uint32_t UBits;
+ 
+ typedef union {
+   lua_Number n;
+-#ifdef LUA_NUMBER_DOUBLE
++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE)
+   uint64_t b;
+ #else
+   UBits b;
+@@ -63,24 +63,25 @@ static UBits barg(lua_State *L, int idx)
+ #else
+   bn.n = luaL_checknumber(L, idx);
+ #endif
+-#if defined(LUA_NUMBER_DOUBLE)
++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE)
+   bn.n += 6755399441055744.0;  /* 2^52+2^51 */
+ #ifdef SWAPPED_DOUBLE
+   b = (UBits)(bn.b >> 32);
+ #else
+   b = (UBits)bn.b;
+ #endif
+-#elif defined(LUA_NUMBER_INT) || defined(LUA_NUMBER_LONG) || \
+-      defined(LUA_NUMBER_LONGLONG) || defined(LUA_NUMBER_LONG_LONG) || \
+-      defined(LUA_NUMBER_LLONG)
++#elif defined(LUA_NUMBER_INT)       || defined(LUA_INT_INT) || \
++      defined(LUA_NUMBER_LONG)      || defined(LUA_INT_LONG) || \
++      defined(LUA_NUMBER_LONGLONG)  || defined(LUA_INT_LONGLONG) || \
++      defined(LUA_NUMBER_LONG_LONG) || defined(LUA_NUMBER_LLONG)
+   if (sizeof(UBits) == sizeof(lua_Number))
+     b = bn.b;
+   else
+     b = (UBits)(SBits)bn.n;
+-#elif defined(LUA_NUMBER_FLOAT)
++#elif defined(LUA_NUMBER_FLOAT) || defined(LUA_FLOAT_FLOAT)
+ #error "A 'float' lua_Number type is incompatible with this library"
+ #else
+-#error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
++#error "Unknown number type, check LUA_NUMBER_*, LUA_FLOAT_*, LUA_INT_* in luaconf.h"
+ #endif
+ #if LUA_VERSION_NUM < 502
+   if (b == 0 && !lua_isnumber(L, idx)) {
+@@ -91,7 +92,11 @@ static UBits barg(lua_State *L, int idx)
+ }
+ 
+ /* Return bit type. */
++#if LUA_VERSION_NUM < 503
+ #define BRET(b)  lua_pushnumber(L, (lua_Number)(SBits)(b)); return 1;
++#else
++#define BRET(b)  lua_pushinteger(L, (lua_Integer)(SBits)(b)); return 1;
++#endif
+ 
+ static int bit_tobit(lua_State *L) { BRET(barg(L, 1)) }
+ static int bit_bnot(lua_State *L) { BRET(~barg(L, 1)) }
+@@ -163,11 +168,15 @@ static const struct luaL_Reg bit_funcs[] = {
+ LUALIB_API int luaopen_bit(lua_State *L)
+ {
+   UBits b;
++#if LUA_VERSION_NUM < 503
+   lua_pushnumber(L, (lua_Number)1437217655L);
++#else
++  lua_pushinteger(L, (lua_Integer)1437217655L);
++#endif
+   b = barg(L, -1);
+   if (b != (UBits)1437217655L || BAD_SAR) {  /* Perform a simple self-test. */
+     const char *msg = "compiled with incompatible luaconf.h";
+-#ifdef LUA_NUMBER_DOUBLE
++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE)
+ #ifdef _WIN32
+     if (b == (UBits)1610612736L)
+       msg = "use D3DCREATE_FPU_PRESERVE with DirectX";
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 5b224928a4d5..2370bc57d2aa 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz