gentoo resync : 14.12.2020

3 files changed, 58 insertions, 0 deletions

diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index d674a9cce648..033ca44ae979 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,4 +1,6 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
+AUX ldoc-1.4.6-slotted_lua.patch 732 BLAKE2B 52bfd5770b47a082d8f4d0706050bc75766af92d120ab1b95c5359e13c85fe9a0131a40b20cbebe318b0eab42c6f7877749248687c3bc8570c81df08c5af8f51 SHA512 5b226521e5c3af4b23e6f0ffd74cd332a214f1d4bfcef14c1fab170149b669045ec1439d6f2a3bfd40ff3699cbdfb3981e9641d6a44a88d2210f83fa2c5a2cba
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
+EBUILD ldoc-1.4.6-r100.ebuild 805 BLAKE2B 07ed739e790470030de9de95adc29263beedd1447d6e22859d8a6c4c705d6953d78a469204a6c99622bac432177c19e656a9b1fba0201b0b3341d4ccb5770d45 SHA512 1b98caa30dd79bae63662983c7541b74f509a3f257337a71a9cf1a545d048bde695eafb61b9429bffe7768b7c66b564ab0816c22430fe89eb892f5b4c434d2a1
 EBUILD ldoc-1.4.6.ebuild 519 BLAKE2B ec1a59beaba803f512cc892c6856dc5b09c71ab48ebd9c093f8592bf3822e3ee16836db7abc6dac67360171b4d4ee56727c482fe0398621d61b95c7a6e296e13 SHA512 1638c24f53578d1bca5253a32e8f761b4a1cebf2297495568349e5f95b459b680a2896e9c390259a52738f9c81361de69c971a4d2335d871412e35b0c4c02df6
 MISC metadata.xml 247 BLAKE2B b8d9d5b8d0cd042320e566bfe90f610a133b5c5ebd712026f81661caccfb4bffea14e1d1256b363c9ab422404a65bac2ef9b265f7489129d0bca46067022e73e SHA512 4dd0700f6354ffd28980a6782be85efd6d47a505029f6a781d7679ec2bad2bfe86e218a48ae8e197c3db00dc6d5b222d08197d35ddc7271752510b61cb3dc959
diff --git a/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
new file mode 100644
index 000000000000..08776c560a09
--- /dev/null
+++ b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
@@ -0,0 +1,21 @@
+Do not try to auto-guess Lua directories from the path to the interpreter,
+it does not work with the wrapper set up by lua-single.eclass. Use the
+values of LUA, LUA_BINDIR and LUA_SHAREDIR provided by the ebuild instead.
+
+--- a/makefile
++++ b/makefile
+@@ -1,13 +1,9 @@
+-LUA= $(shell echo `which lua`)
+-LUA_BINDIR= $(shell echo `dirname $(LUA)`)
+-LUA_PREFIX= $(shell echo `dirname $(LUA_BINDIR)`)
+-LUA_SHAREDIR=$(LUA_PREFIX)/share/lua/5.1
+ 
+ ldoc:
+ 
+ install: install_parts
+ 	mkdir -p $(DESTDIR)$(LUA_BINDIR)
+-	echo "lua $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
++	echo "$(LUA) $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 	chmod +x $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 
+ install_luajit: install_parts
diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
new file mode 100644
index 000000000000..5486df73038a
--- /dev/null
+++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single
+
+DESCRIPTION="A LuaDoc-compatible documentation generation system"
+HOMEPAGE="https://stevedonovan.github.io/ldoc/"
+SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="$(lua_gen_cond_dep '
+	dev-lua/penlight[${LUA_USEDEP}]
+')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.6-mkdir.patch"
+	"${FILESDIR}/${PN}-1.4.6-slotted_lua.patch"
+)
+
+S="${WORKDIR}/LDoc-${PV}"
+RESTRICT="test"
+
+src_install() {
+	emake DESTDIR="${ED}" LUA_BINDIR="${EPREFIX}/usr/bin" LUA_SHAREDIR="$(lua_get_lmod_dir)" install
+}