gentoo resync : 14.12.2020

5 files changed, 171 insertions, 6 deletions

diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 377b6593b586..6093be70eb1e 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,3 +1,6 @@
 DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
-EBUILD luarocks-3.3.1.ebuild 896 BLAKE2B cbaa03508dbb342ffbe968324c70dc4ecf6b4d2fd066056fab35298cd82b4b35a1fcfde8a5fed332c5e405d902f362c442c23e3253913bdcd2dc1f83a812c84c SHA512 c5755a63fa1ccadef34163b130613dff03194a59021193268c0212ed15d6da7c5ebe041ab5667380f59afa5b3f9aedd3443d885f21ed5d4ae64e9f88a7e51a6c
-MISC metadata.xml 613 BLAKE2B cc10d869cc70c325d22bb6bb9717a86a80d4d29b9340bf18057ab92759c4f96e06d4c114749e73c97c6d61404c7d50c2a054cf10d9a4f5e289ebfc5c3df073bf SHA512 3701e2b1691444a8f709573104f3e70524bd631e0f4ee233b141ad1e2763578bc511140118acebc9ccbf0b540769de56174f97267de67571a4ad12b864e6edb3
+DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151
+EBUILD luarocks-3.3.1.ebuild 897 BLAKE2B 11b7a1565b1dc071de54d8f8e0756b754ec65404db51c384e5b60ec506145bbf7cb69314ac04bd5ae83df25b169275a83ffefb627044a44da876144b4652c7ea SHA512 9de5f55078432880ad6e749bf50f150588ae322a1fed21c66bc5c331d1f9dcec85fb6f62ec48c11ec982c232b5beba7039e7e0473825f3871530f82ec58abb5e
+EBUILD luarocks-3.4.0-r100.ebuild 2076 BLAKE2B 342b6a19174d1bdebcd91b27fb6db6ac9c7b606181b4d821057e843711923d9ad731cb2fd696c36a6e74ab1a1ea1134b7ec216ccdc0bbb6647e06437cbd2068b SHA512 d5bae0105cd8ad25330cbfa6333a412dda924ea423c342a4e285f47789cdf23b4edfb387965b34d778b38d99239b681f64af788554549e821d351eee625e0eb9
+EBUILD luarocks-3.4.0.ebuild 1763 BLAKE2B 269eb6987e0089696b0546b6a3ca8092d30dd40486c5affe3ee3b9a07e0cde71da1d6b4b9e900e1b5a1dbccc4fb8e856315c169c0f7475cb5b023d6d22b7293b SHA512 a801da10bd0ee9e37c162c682b72708ce5489ff790500260a86339b72ea57e8cc4e8a25a20e0020558c21c4c0618957da0c0f5e5efa84a112f7a7ab22b6fddaa
+MISC metadata.xml 724 BLAKE2B 690486dab66b070c7ec5f7e71db2cced3d1c191acbbcc3d86bc7b4dcb90796c5b1cb712a4cad42462dc9bedecfd5de330b02447bd7ccf89b89b57905871a555f SHA512 7d8d58c931e5134bd261a05539d3d2e54648fe538a4c65397b78be325feeb4da04d93fc1ff81e2d3b6fd062cc2d94f8cf9958865ca968c1805fc915bcf287edb
diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild
index 59de0b8da8e0..921f56440198 100644
--- a/dev-lua/luarocks/luarocks-3.3.1.ebuild
+++ b/dev-lua/luarocks/luarocks-3.3.1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="libressl"
 
-DEPEND="dev-lang/lua:="
+DEPEND="dev-lang/lua:0="
 RDEPEND="${DEPEND}
 	net-misc/curl
 	!libressl? ( dev-libs/openssl:0 )
@@ -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..8075c2212cfd
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
@@ -0,0 +1,87 @@
+# 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_prepare() {
+	default
+
+	# If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists,
+	# as no compiled modules are installed on a new, fresh installation,
+	# so this check must be disabled, otherwise 'configure' will fail.
+	sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die
+}
+
+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..52063734ca52
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.4.0.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
+
+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_prepare() {
+	default
+
+	# If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists,
+	# as no compiled modules are installed on a new, fresh installation,
+	# so this check must be disabled, otherwise 'configure' will fail.
+	sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die
+}
+
+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 da7ced9078f6..e3ced5af4244 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>