gentoo resync : 14.12.2020

7 files changed, 97 insertions, 96 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 e09c02489414..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="http://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-r101.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild
new file mode 100644
index 000000000000..66c4e3131492
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild
@@ -0,0 +1,88 @@
+# 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="http://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
+
+	lua_copy_sources
+	lua_foreach_impl multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CCOPT="
+		"INCLUDES=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	popd
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_test() {
+	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+
+	local mytests=(
+		"bitbench.lua"
+		"bittest.lua"
+		"md5test.lua"
+		"nsievebits.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="./?.so" ${ELUA} ${mytest}
+	done
+
+	popd
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+}
+
+lua_multilib_src_install() {
+	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+
+	exeinto $(lua_get_cmod_dir)
+	doexe bit.so
+
+	popd
+}
+
+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 e56c2587e41d..67165da21a3c 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 66d3e88a1af1..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="http://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 135066755046..42ba42d60215 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,7 +1,4 @@
-AUX LuaBitOp-ldflags.patch 376 BLAKE2B f1681d7c9b403a31bc687d93e700ec160cc474064da6cfbc33b4aaccbec3856dfa1b4103d32253a54c6a379676d9f4a79a24225dfe8c602e0614cab1d518e42f SHA512 14b779c738dff2413d3b658c6861de02afd4cf577e7fd95b72af4d58240ed406d9727e1fb47d2ccce4d783fd2aeb576770790c85625935723da15d5c18a486c1
-DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.1-r1.ebuild 754 BLAKE2B 83c18f6c8acb421813ad3487442d7ef0b773ec2f49f6f3c624ab18083945edbcb9c04841a22bb301585713876384f39d86a56977ea409d5bcd9c9ed9cd0ad25a SHA512 8b697c84786862079205663adcc07b2c259090cfd90424bd833aefada2ae88e19da59d817db6ee1c55f9ca374c9d06d71054a3ad6bdb35e62ba6a4edab9ea473
-EBUILD LuaBitOp-1.0.2-r1.ebuild 917 BLAKE2B cab5c4db544326ce4cbfa5cb924b086a5c7593b5e28cc3f0c54e08061a3cfc60f5afb07647e53146924591be17434df7df226d29b86631ae378fcd40b8d07576 SHA512 c227476db749b85cd61bf77c9012ed4807ec1ba5221994b12a7fc1534f9e24b7c255067cb4e8bcb85800d01fa4237f6ced15cdea65ab8db4d86fe5505e99184c
-EBUILD LuaBitOp-1.0.2.ebuild 612 BLAKE2B 2c019f29af3ae8fd6048a733c48fc768990943b7d1b923c4c2f616a3bb702c24b20d837edf9c52285e76500c0584eecaa6794ef06cb7a7cdac22e1e788c9784f SHA512 12b76d07cb530a957097c3683d30344b657a85855968116af9be39b0317f41e2165d70b399a5eb0dba6fae2a6347043ac8775ee3bd20798c640176a5cf252078
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD LuaBitOp-1.0.2-r101.ebuild 1631 BLAKE2B 2c52919195e7da8c81e2b6427fbb693af05318f8077f0272d12589d40bd806ef02e113d708df689c7bab9aa2aca036a6bfe8ed6006c40d203605a3ed31a4648c SHA512 f073997ad8187b8ae4594a12c37475d0923dec5b497354065648ef0ab35fef39f7b94945642224686f8b2974fbec72e349bb9be55a449cec0716e8b9170d94cc
+EBUILD LuaBitOp-1.0.2-r2.ebuild 917 BLAKE2B 704b906d79e32b01ec82e5fddeb95cabd2edddc1fcb9069f893a34a088bb198c8b277b42e748bfcf5893f5cf6c8b39662b5548f5c0b01807e7c331dca74a6ed3 SHA512 b1cb3b831bc3a60f5dbb840158100c97b91c0cc9fc0f902f60921852c93296116b3977f1d197fa61aac0f562cc4c76f1290ba711e2ef03dadde8eef2336197fb
+MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
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 c36c37139fad..8105c04d111a 100644
--- a/dev-lua/LuaBitOp/metadata.xml
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 </pkgmetadata>