Updating liguros repo

3 files changed, 129 insertions, 66 deletions

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..a1dd2af7610c
--- /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/luafilesystem-1.8.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0.ebuild
deleted file mode 100644
index 0fa2387e4829..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.8.0.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="$($(tc-getPKG_CONFIG) --variable exec_prefix $(usex luajit 'luajit' 'lua'))"
-
-		# System's libraries directory (where binary libraries are installed)
-		LUA_LIBDIR="$($(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
-}