gentoo resync : 20.03.2022

3 files changed, 3 insertions, 118 deletions

diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index ed7e67986fb6..7d1f3251ac9a 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,3 @@
-DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.8-r100.ebuild 2300 BLAKE2B f00cb2c108e6bea4f5f69550442947189d50ff15904e07444badd9ce59698638fd357473aa16c962dce4e1e1a3bcef6aa25bd97936160ff570f1f11820b8c2be SHA512 31505f52bdb79d8165d0c622ca9d7b111d4ca72a91cca87626a06dedd27d5b89ab70c4a73b3186808074ede6dc6672f0cbde8f785a43d436b24573ab63e14de2
-EBUILD mpack-1.0.9.ebuild 2300 BLAKE2B f00cb2c108e6bea4f5f69550442947189d50ff15904e07444badd9ce59698638fd357473aa16c962dce4e1e1a3bcef6aa25bd97936160ff570f1f11820b8c2be SHA512 31505f52bdb79d8165d0c622ca9d7b111d4ca72a91cca87626a06dedd27d5b89ab70c4a73b3186808074ede6dc6672f0cbde8f785a43d436b24573ab63e14de2
+EBUILD mpack-1.0.9-r1.ebuild 2300 BLAKE2B 04ad27050bddb53e569608744ad47f2d4073e61ca19112b91acdb84ceccd40212225c7f806ffae175601bcef0a44b009d689aa40c7340f98e336e1a9375fb49c SHA512 d0f07b48984f8c1354ba646920fbd1771c96db934259e81db383d207afc7929cf3c849092564184466a09731962f9609cc8845a3961ea01199da085aaae3dece
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.9-r1.ebuild
index b403ed3deab8..de1490be4bfc 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
diff --git a/dev-lua/mpack/mpack-1.0.9.ebuild b/dev-lua/mpack/mpack-1.0.9.ebuild
deleted file mode 100644
index b403ed3deab8..000000000000
--- a/dev-lua/mpack/mpack-1.0.9.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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 lua toolchain-funcs
-
-MY_PN="lib${PN}-lua"
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack-lua/"
-SRC_URI="https://github.com/${MY_PN/-lua/}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libmpack
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA_INCLUDE=$(lua_get_CFLAGS)"
-		"LUA_LIB="
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	# "[  FAILED  ] test.lua @ 279: mpack should not leak memory"
-	# It doesn't seem upstream actually support LuaJIT so were this up to me
-	# I would drop it from LUA_COMPAT, unfortunately there are packages in the
-	# tree which currently expect it to be supported.
-	if [[ ${ELUA} == "luajit" ]]; then
-		ewarn "Not running tests under ${ELUA} because they are known to fail"
-		return
-	fi
-
-	busted --lua="${ELUA}" test.lua || die
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local installdir="$(lua_get_cmod_dir)"
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"LUA_CMOD_INSTALLDIR=${installdir#$EPREFIX}"
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	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}/mpack.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
-}