7 files changed, 90 insertions, 91 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
deleted file mode 100644
index 3369cb08754c..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="https://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-r100.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
new file mode 100644
index 000000000000..3ebc819e06aa
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="https://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="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CCOPT="
+		"INCLUDES=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	# Copy module to match the choosen LUA implementation
+	cp "bit.so" "${S}/bit-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_test() {
+	local mytests=(
+		"bitbench.lua"
+		"bittest.lua"
+		"md5test.lua"
+		"nsievebits.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="${S}/bit-${ELUA}.so" ${ELUA} ${mytest}
+	done
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "${S}/bit-${ELUA}.so" "bit.so" || die
+
+	exeinto $(lua_get_cmod_dir)
+	doexe bit.so
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
index 23369a844826..471cd3aa1434 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
deleted file mode 100644
index 7f347f59c095..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="https://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
index 3a2561aa1e73..257d385c72f7 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,2 +1 @@
-DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
deleted file mode 100644
index 2a690cdb5866..000000000000
--- a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
index 7f90cb6f614f..e3ca56d9dc00 100644
--- a/dev-lua/LuaBitOp/metadata.xml
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -5,5 +5,9 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>