gentoo resync : 25.11.2020

8 files changed, 138 insertions, 195 deletions

diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 3b10740a6302..4881d745ac57 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,9 +1,4 @@
-DIST luafilesystem-1.5.0.tar.gz 26660 BLAKE2B 555a119c580a14377e0b721929d33f6e15e4b4449c061860d611a12896020959f3755bde44ba29d492e8bd10a084a6dc7cd78ed0ef67c1fad85a7acb49bcf6c2 SHA512 79e767be5b923424c2f3c0025e050b6a5b15550cf96d153072f817b0f94757032feeaa579e4d73cc009a5954d38a30079db1c1c15545a45e9f13c0c776080aac
-DIST luafilesystem-1.6.2.tar.gz 27886 BLAKE2B fa13cc529f3ff2b5c5bbf082c5071d066da2da97c066054c9c312366a43e0a2e136bf6eae139abb63e6de916ecca60421cd36bce132393cf0333f9d124027117 SHA512 75debecd3b35d43e76b51de02cface73808547be6a26e15c06c969c50bbfd7c4d0801ccb68812b7ecb99e56eaa63deeadaba6d0387748e215e5bdab784d463ff
-DIST luafilesystem-1.6.3.tar.gz 30389 BLAKE2B 412d2893a59ccde2eb8912523bea4d06d4f140dee2f47b5e8e9795d1ca950a4be93a32eb5632775277ab2c2c22a9229c9f33d062e0d1fcd5397178962b96bae9 SHA512 47a2637903c9d42ce3ab7cf3e27b6457845aeed7ce90c0fee964ba9bf9eabf6a6eea940f960713f6b982f1b64167dbd5da8f217281284143c89e3cc5488b8404
-DIST luafilesystem-1.7.0.2.tar.gz 30877 BLAKE2B c90d960b3cb28a7339e5d103a262beb76864cfd30e0502e991ae82d6fb8706da8a99d9c19d037d7c299139346a5b925e10886addce07e3755891f11b9c2ec4d9 SHA512 a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511
-EBUILD luafilesystem-1.5.0.ebuild 773 BLAKE2B 643e89ebe7fe41aea3c113c52f2456a1b298e5cc40f1a87884230bfbade8bffd899575b3169d82b2f6a1ea78fbb17877376d533c13d918afc431edcb6b8758b5 SHA512 c13733e18224c6d490ea3136e7ca8b4a85e9e5b1a8ac3cbce3807d0e64dea9768a2d8d11fe5355ea7532c7ba7eb1fb7cf6494dcb974b19e50d6a38fe3b0be4d7
-EBUILD luafilesystem-1.6.2.ebuild 771 BLAKE2B fc7c88ba0d86deed70375c3e53acf138470b270ee13025599b88eb7e9f6cc0f800d95b48eb2af8b3fbfcdaff296bda033dfeaa5663cff315e2c82f7104c9ffc2 SHA512 65f35e92c1be83462e5b14b3fb9e591de20beba32e526db06162483a4d1759ed1ede08717a43c0d3133019b3b11b05bbda25fbb215cfde00aea1baaf76ff345f
-EBUILD luafilesystem-1.6.3.ebuild 1130 BLAKE2B 5bcb69de6dc311b039196d8f82b2759882d0a818b5ba0b80a536dd41b038fac6dfae201e354a779677316d16115cbeed8c865cce563845547f57a32adb63e474 SHA512 c02e9f2acd82e3103c4c938af738cf2fb9329cbd5ed54c3c4ae6187b34b2e05a766bc86a092ff98fd8dcfd440275aad27b148fb5601343e53e53a890bb3e67ba
-EBUILD luafilesystem-1.7.0.2.ebuild 1679 BLAKE2B 4761eec2bc6e02da04a3592dde6a78e599e01c8def3bf03cdd208993da4e98a0a52593f2aef9149621d81ae68d1c97c973d4e7ad6c233dc069cec9af5989fa5c SHA512 6f62c00a21353984f6d7c390fe65a550829fd02a702ccd6163164abce97c6b90fc11743b72bf3058140e9d5bce3d2c622a5fa714ddf723ed519c6812cedb107f
-MISC metadata.xml 757 BLAKE2B 078885172ec5e45e79fecdee8232357edb9f381b990aca6d29ec54ef49bb7de2d7359399536e38195293658568dd647c0b2d1129003bb901e59708dd25d804d2 SHA512 188f7d27fad84637eac606ffe476aa605e8f7c9ceb8dcae1783547b406d97fac171de90db695ba869671dfda245a9bc3494b26d1191a5f50c3e91918b41499a9
+DIST luafilesystem-1.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247
+EBUILD luafilesystem-1.8.0-r1.ebuild 1074 BLAKE2B 5fb971448dfb2fd52e15d05dccbed4a685eee4501d23ae260ea42747dcfe8923c22153f3bc9d8cd3fca4051477d2721b8e050607c2ef287592c55f460f8f5105 SHA512 0a7636dd88865d9b0139a376e0129e48ca83f422401ac598b47c118fe3fb7eb79a87280f5f8fb8963d2fb88145155180521e0519b58fb580c0a5a8b078c1a94b
+EBUILD luafilesystem-1.8.0-r100.ebuild 1622 BLAKE2B 184a8f9b5e4c847d4b3cf9915e773b99082308e4b8d5b4659bf2c80085d0d5002f63221820d36aadfc2a6430b80eea900753c34f398691f22e1947b05cba42d5 SHA512 f28887f4a48c54bf5f6a1abe3b8e3133ac8c5b7247f0eca26d12a1ee8ebc8d4f33c601cb8f0816382cf5c32e15275a6cd716de6f0b353705c4ca52ec2c8ff26a
+MISC metadata.xml 858 BLAKE2B 6f50e96acfa2b1aa606c616eda03ac35c214902a2d39dee101ecc32a3f1fe91980d4f735e4ecf066133d573910b10dda51ca1e57421f9f5327148e74fde3212f SHA512 6816a7b67fd5c7cab8cf90b2e096877e360e482644b339214becbc47dcd6b1b6a3e49470a481493dc31fe611d8c8ff7470b7c4eb5080bcd201e6543dbf3f2a7a
diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
deleted file mode 100644
index 657786056c85..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s|gcc|$(tc-getCC)|" \
-		-e "s|/usr/local|/usr|" \
-		-e "s|/lib|/$(get_libdir)|" \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" install
-	dodoc README
-	dohtml doc/us/*
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
deleted file mode 100644
index def72540b454..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s|gcc|$(tc-getCC)|" \
-		-e "s|/usr/local|/usr|" \
-		-e "s|/lib|/$(get_libdir)|" \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" install
-	dodoc README
-	dohtml doc/us/*
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
deleted file mode 100644
index 75ab037289ac..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-SRC_URI="https://github.com/keplerproject/luafilesystem/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1 )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-HTML_DOCS=( doc/us )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|-O2|${CFLAGS}|" \
-		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		config || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		INCS="-I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	LUA_CPATH=./src/?.so $(usex luajit 'luajit' 'lua') tests/test.lua
-}
-
-src_install() {
-	emake \
-		LUA_LIBDIR="${ED%/}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
-		install
-
-	einstalldocs
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
deleted file mode 100644
index 88b4ef4b5a98..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc luajit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:*
-	luajit? ( dev-lang/luajit:2 )"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	cat > config <<-EOF
-		# Installation directories
-
-		# Default installation prefix
-		PREFIX="${ED}/$($(tc-getPKG_CONFIG) --variable exec_prefix $(usex luajit 'luajit' 'lua'))"
-
-		# System's libraries directory (where binary libraries are installed)
-		LUA_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-
-		# Lua includes directory
-		LUA_INC=-I$(pwd)/src
-		LUA_INC+=-I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))
-
-		# OS dependent
-		LIB_OPTION=\$(LDFLAGS) -shared
-
-		LIBNAME=$T.so.$V
-
-		# Compilation directives
-		WARN=-O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
-		INCS=\$(LUA_INC)
-		CFLAGS+=\$(WARN) \$(INCS)
-		CC=$(tc-getCC)
-	EOF
-}
-
-src_test() {
-	LUA_CPATH=./src/?.so $(usex luajit 'luajit' 'lua') tests/test.lua || die
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/us/. )
-	einstalldocs
-
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..0366ccae8958
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="File System Library for the Lua programming language"
+HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	luajit? ( dev-lang/luajit:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	cat > "config" <<-EOF
+		CC=$(tc-getCC)
+		CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua')) -fPIC
+		DESTDIR=${ED}
+		LIB_OPTION=${LDFLAGS} -shared
+		LUA_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))
+	EOF
+}
+
+src_test() {
+	LUA_CPATH="src/lfs.so" lua tests/test.lua || die
+}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild
new file mode 100644
index 000000000000..a1e0b4c454bd
--- /dev/null
+++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild
@@ -0,0 +1,82 @@
+# 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_PV=${PV//./_}
+
+DESCRIPTION="File System Library for the Lua programming language"
+HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+lua_src_prepare() {
+	cat > "config-${ELUA}" <<-EOF
+		CC=$(tc-getCC)
+		DESTDIR=${ED}
+		CFLAGS=${CFLAGS} $(lua_get_CFLAGS) -fPIC
+		LIB_OPTION=${LDFLAGS} -shared
+		LUA_LIBDIR=$(lua_get_cmod_dir)
+	EOF
+}
+
+src_prepare() {
+	default
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	# Clean project to compile it for every lua slot
+	emake clean
+
+	emake CONFIG="config-${ELUA}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lfs.so" "src/lfs-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	LUA_CPATH="src/lfs-${ELUA}.so" ${ELUA} tests/test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lfs-${ELUA}.so" "src/lfs.so" || die
+
+	emake CONFIG="config-${ELUA}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index 9e9cb608e469..5b577f074b21 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/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>
@@ -9,7 +13,7 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
+	<longdescription>
 		LuaFileSystem is a Lua library developed to complement the set of functions
 		related to file systems offered by the standard Lua distribution.