Updating liguros repo

9 files changed, 225 insertions, 3 deletions

diff --git a/dev-lua/busted-htest/Manifest b/dev-lua/busted-htest/Manifest
new file mode 100644
index 000000000000..2c720b589812
--- /dev/null
+++ b/dev-lua/busted-htest/Manifest
@@ -0,0 +1 @@
+DIST busted-htest-1.0.0.tar.gz 4347 BLAKE2B f1d30a305cb9691588b18f67842b536d3de9430d22c51ec292202e5aca5784447cd525ae8b1f1da42a3d3792344419efbfe1d03fe29823b445a7c1ead0fe577f SHA512 001f494949c04445004e8b06fde62727cab85a320673748d18714b82d7b2b9aea43316f6119e669c569f31578b787f4e5ca5d19da3f33fe28df572aaa41c75bd
diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
new file mode 100644
index 000000000000..8cd1f8a95c7b
--- /dev/null
+++ b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Pretty output handler for Busted"
+HOMEPAGE="https://github.com/hishamhm/busted-htest"
+SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+	${LUA_DEPS}
+"
+
+BDEPEND="virtual/pkgconfig"
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins src/busted/outputHandlers/htest.lua
+
+	einstalldocs
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/busted-htest/busted-htest-1.0.0.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0.ebuild
new file mode 100644
index 000000000000..7007e6d3c37a
--- /dev/null
+++ b/dev-lua/busted-htest/busted-htest-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Pretty output handler for Busted"
+HOMEPAGE="https://github.com/hishamhm/busted-htest"
+SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	dev-lua/busted
+"
+
+BDEPEND="virtual/pkgconfig"
+
+src_install() {
+	insinto $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))
+	doins src/busted/outputHandlers/htest.lua
+
+	einstalldocs
+}
diff --git a/dev-lua/busted-htest/metadata.xml b/dev-lua/busted-htest/metadata.xml
new file mode 100644
index 000000000000..1323d91541c2
--- /dev/null
+++ b/dev-lua/busted-htest/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hishamhm/busted-htest</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index dd6984a12195..6bc9964136da 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1 +1,2 @@
 DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
+DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151
diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild
index f56c7fdd9398..a96257187730 100644
--- a/dev-lua/luarocks/luarocks-3.3.1.ebuild
+++ b/dev-lua/luarocks/luarocks-3.3.1.ebuild
@@ -24,9 +24,9 @@ src_configure() {
 	# econf doesn't work b/c it passes variables the custom configure can't
 	# handle
 	./configure \
-			--prefix="${EPRIFIX}/usr" \
-			--with-lua-lib="${EPRIFIX}/usr/$(get_libdir)" \
-			--rocks-tree="${EPRIFIX}/usr/$(get_libdir)/lua/luarocks" \
+			--prefix="${EPREFIX}/usr" \
+			--with-lua-lib="${EPREFIX}/usr/$(get_libdir)" \
+			--rocks-tree="${EPREFIX}/usr/$(get_libdir)/lua/luarocks" \
 			|| die "configure failed"
 }
 
diff --git a/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
new file mode 100644
index 000000000000..4a4286ebda05
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
@@ -0,0 +1,78 @@
+# 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-single
+
+DESCRIPTION="A package manager for the Lua programming language"
+HOMEPAGE="https://luarocks.org"
+SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="libressl test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+
+DEPEND="
+	net-misc/curl
+	libressl? ( dev-libs/libressl:0 )
+	!libressl? ( dev-libs/openssl:0 )
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+		$(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]')
+		${RDEPEND}
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		"--prefix=${EPREFIX}/usr"
+		"--rocks-tree=$(lua_get_lmod_dir)"
+		"--with-lua-include=$(lua_get_include_dir)"
+		"--with-lua-interpreter=${ELUA}"
+		"--with-lua-lib=$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+}
+
+src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_install() {
+	default
+
+	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
+}
+
+pkg_postinst() {
+	local lua_abi_ver
+	if use lua_single_target_luajit; then
+		lua_abi_ver="5.1"
+	else
+		lua_abi_ver=${ELUA#lua}
+	fi
+	elog
+	elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})"
+	elog "you can use the command-line option --lua-version, e.g."
+	elog
+	elog "    luarocks --lua-version 5.3 install luasocket"
+	elog
+	elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system."
+	elog
+}
diff --git a/dev-lua/luarocks/luarocks-3.4.0.ebuild b/dev-lua/luarocks/luarocks-3.4.0.ebuild
new file mode 100644
index 000000000000..1740df35645a
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A package manager for the Lua programming language"
+HOMEPAGE="https://luarocks.org"
+SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="luajit libressl test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+"
+
+DEPEND="
+	net-misc/curl
+	libressl? ( dev-libs/libressl:0 )
+	!libressl? ( dev-libs/openssl:0 )
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted
+		dev-lua/busted-htest
+		${RDEPEND}
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		"--prefix=${EPREFIX}/usr"
+		"--rocks-tree=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+		"--with-lua-include=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
+		"--with-lua-interpreter=$(usex luajit 'luajit' 'lua')"
+		"--with-lua-lib=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+}
+
+src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_install() {
+	default
+
+	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
+}
diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
index 4a114b9a2afa..8f4983b1a141 100644
--- a/dev-lua/luarocks/metadata.xml
+++ b/dev-lua/luarocks/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>