Updating liguros repo

5 files changed, 175 insertions, 88 deletions

diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 34119b47d3b1..8b7ebcc7d5b4 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1 +1,2 @@
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
+DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml
index 64f6f623837c..d77ed0f3e924 100644
--- a/dev-lua/mpack/metadata.xml
+++ b/dev-lua/mpack/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">libmpack/libmpack</remote-id>
+		<remote-id type="github">libmpack/libmpack-lua</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-lua/mpack/mpack-1.0.4-r100.ebuild b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
deleted file mode 100644
index 7aca1045a875..000000000000
--- a/dev-lua/mpack/mpack-1.0.4-r100.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack/"
-SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libmpack-${PV}/binding/lua"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-lua/busted[${LUA_USEDEP}]
-	)"
-
-lua_src_compile() {
-	# Make sure we have got no leftovers from other implementations.
-	# There is no 'clean' target in the makefile, though.
-	rm -f ${PN}.so
-
-	# We set LUA_LIB to an empty string while building version 1.0.4 because
-	# compiled Lua modules must not link against liblua. This has already been
-	# fixed upstream.
-	emake \
-		CC="$(tc-getCC)" \
-		USE_SYSTEM_LUA=yes \
-		LUA_INCLUDE="$(lua_get_CFLAGS)" \
-		LUA_LIB=""
-
-	# Tag the result with current implementation and move it out of the way.
-	mv ${PN}.so ${PN}-${ELUA}.so || die
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	# "[  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
-
-	# The test suite must be able to find the module under its original name.
-	rm -f ${PN}.so
-	ln -s ${PN}-${ELUA}.so ${PN}.so || die
-	busted --lua="${ELUA}" -o gtest test.lua || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	# This time we move the correct library file back in order not to risk
-	# confusing make with symlinks.
-	mv ${PN}-${ELUA}.so ${PN}.so || die
-
-	emake \
-		DESTDIR="${ED}" \
-		USE_SYSTEM_LUA=yes \
-		LUA_CMOD_INSTALLDIR="$(lua_get_cmod_dir)" \
-		install
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-	einstalldocs
-}
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
new file mode 100644
index 000000000000..d9777b4051fb
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+MY_PN="lib${PN}-lua"
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/libmpack/libmpack/"
+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 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libmpack
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted[${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() {
+	# "[  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
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CMOD_INSTALLDIR=$(lua_get_cmod_dir)"
+		"USE_SYSTEM_MPACK=yes"
+		"USE_SYSTEM_LUA=yes"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/mpack/mpack-1.0.8.ebuild b/dev-lua/mpack/mpack-1.0.8.ebuild
new file mode 100644
index 000000000000..dd44907c3fd9
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="lib${PN}-lua"
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/libmpack/libmpack/"
+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 ~x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libmpack
+	luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( dev-lang/luajit:2= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted
+		${RDEPEND}
+	)
+"
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INCLUDE=$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIB=$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
+		"USE_SYSTEM_MPACK=yes"
+		"USE_SYSTEM_LUA=yes"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	if use luajit; then
+		# "[  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.
+		ewarn "Not running tests under ${ELUA} because they are known to fail"
+		return
+	else
+		busted --lua=lua test.lua || die
+	fi
+}
+
+src_install() {
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CMOD_INSTALLDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"USE_SYSTEM_MPACK=yes"
+		"USE_SYSTEM_LUA=yes"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}