* [gentoo-commits] proj/lua:master commit in: dev-lua/luautf8/, dev-lua/randomlua/, dev-lua/lanes/, dev-lua/resty-xxhash/, ...
@ 2018-09-19 8:19 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; only message in thread
From: Vadim A. Misbakh-Soloviov @ 2018-09-19 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 3168d3e8c08a121557aca426d3d79b518f70eb0e
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Sep 19 08:19:19 2018 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Sep 19 08:19:19 2018 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=3168d3e8
luacheck: bump; *: added
dev-lua/lanes/Manifest | 1 +
.../lanes/files/lanes-3.10.0-fix-makefile.patch | 28 +++++++++++++++
dev-lua/lanes/lanes-3.11.ebuild | 31 ++++++++++++++++
dev-lua/lanes/lanes-9999.ebuild | 40 +++++++++++++++++++++
dev-lua/lanes/metadata.xml | 14 ++++++++
dev-lua/lua-xxhash/lua-xxhash-9999.ebuild | 34 ++++++++++++++++++
dev-lua/lua-xxhash/metadata.xml | 14 ++++++++
dev-lua/luacheck/Manifest | 2 +-
...acheck-0.22.0.ebuild => luacheck-0.23.0.ebuild} | 8 +++--
dev-lua/luautf8/Manifest | 1 +
dev-lua/luautf8/luautf8-9999.ebuild | 42 ++++++++++++++++++++++
dev-lua/luautf8/metadata.xml | 14 ++++++++
dev-lua/randomlua/metadata.xml | 14 ++++++++
dev-lua/randomlua/randomlua-9999.ebuild | 28 +++++++++++++++
dev-lua/resty-xxhash/metadata.xml | 14 ++++++++
dev-lua/resty-xxhash/resty-xxhash-9999.ebuild | 28 +++++++++++++++
eclass/lua.eclass | 25 +++++++------
17 files changed, 325 insertions(+), 13 deletions(-)
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
new file mode 100644
index 0000000..51778fd
--- /dev/null
+++ b/dev-lua/lanes/Manifest
@@ -0,0 +1 @@
+DIST lanes-3.11.tar.gz 233462 SHA256 0a82fadeed96099b7bf90da92ece3862507a5e41a23778a7456b8adaf36e9180 SHA512 00d84ad3d2c4e8d3e6099a68bdd8eb4714e098d5e1af479e42841d708eb4f650cd1f5f0f6ff76860ec6ccc5838225a2961477246662e701bee2587ba8de6ccc2 WHIRLPOOL 15280e988e403aa4498d0afedd27949976fba58c74364983bbc4a6b140d738e757800468c52991a82e82fb18f2b1698bdf08bd8d8db425b900cb26fccc10778a
diff --git a/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch b/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch
new file mode 100644
index 0000000..5254970
--- /dev/null
+++ b/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index fc44fac..6c87e89 100644
+--- a/Makefile
++++ b/Makefile
+@@ -202,17 +202,17 @@ _perftest:
+ #
+ # LUA_LIBDIR and LUA_SHAREDIR are used by the .rockspec (don't change the names!)
+ #
+-DESTDIR=/usr/local
+-LUA_LIBDIR=$(DESTDIR)/lib/lua/5.1
+-LUA_SHAREDIR=$(DESTDIR)/share/lua/5.1
++PREFIX=/usr/local
++LUA_LIBDIR=$(PREFIX)/lib/lua/5.1
++LUA_SHAREDIR=$(PREFIX)/share/lua/5.1
+
+ #
+ # AKa 17-Oct: changed to use 'install -m 644' and 'cp -p'
+ #
+ install: $(_TARGET_SO) src/lanes.lua
+- mkdir -p $(LUA_LIBDIR) $(LUA_LIBDIR)/lanes $(LUA_SHAREDIR)
+- install -m 644 $(_TARGET_SO) $(LUA_LIBDIR)/lanes
+- cp -p src/lanes.lua $(LUA_SHAREDIR)
++ mkdir -p $(DESTDIR)$(LUA_LIBDIR)/lanes $(DESTDIR)$(LUA_SHAREDIR)
++ install -m 644 $(_TARGET_SO) $(DESTDIR)$(LUA_LIBDIR)/lanes
++ cp -p src/lanes.lua $(DESTDIR)$(LUA_SHAREDIR)
+
+
+ #--- Packaging ---
diff --git a/dev-lua/lanes/lanes-3.11.ebuild b/dev-lua/lanes/lanes-3.11.ebuild
new file mode 100644
index 0000000..15a0860
--- /dev/null
+++ b/dev-lua/lanes/lanes-3.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils lua
+
+DESCRIPTION="lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc"
+
+DOCS=(README CHANGES)
+HTML_DOCS=(docs/.)
+
+each_lua_configure() {
+ mycmakeargs=(
+ -DINSTALL_CMOD="$(lua_get_pkgvar INSTALL_CMOD)/${PN}"
+ -DINSTALL_LMOD="$(lua_get_pkgvar INSTALL_LMOD)"
+ )
+ cmake-utils_src_configure
+}
+
+all_lua_install() {
+ lua_default
+ rm "${ED}"/usr/share/lanes -r
+}
diff --git a/dev-lua/lanes/lanes-9999.ebuild b/dev-lua/lanes/lanes-9999.ebuild
new file mode 100644
index 0000000..ef74800
--- /dev/null
+++ b/dev-lua/lanes/lanes-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="LuaLanes"
+
+inherit cmake-utils lua
+
+DESCRIPTION="lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DOCS=(README CHANGES)
+HTML_DOCS=(docs/.)
+
+all_lua_prepare() {
+ sed -r \
+ -e '/^#include "tools.h"$/{h;d};/^#include "universe.h"$/G' \
+ -i src/deep.c
+ lua_default
+}
+
+each_lua_configure() {
+ mycmakeargs=(
+ -DINSTALL_CMOD="$(lua_get_pkgvar INSTALL_CMOD)/${PN}"
+ -DINSTALL_LMOD="$(lua_get_pkgvar INSTALL_LMOD)"
+ )
+ cmake-utils_src_configure
+}
+
+all_lua_install() {
+ lua_default
+ rm "${ED}"/usr/share/lanes -r
+}
diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml
new file mode 100644
index 0000000..c1baef2
--- /dev/null
+++ b/dev-lua/lanes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <longdescription lang="en">
+ lightweight, native, lazy evaluating multithreading library for Lua-5.1 or 5.2.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">LuaLanes/lanes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild b/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild
new file mode 100644
index 0000000..002afcc
--- /dev/null
+++ b/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS="git"
+GITHUB_A="mah0x211"
+MY_PN="${PN##lua-}"
+
+inherit lua
+
+DESCRIPTION="Lua bindings for dev-libs/xxhash (XXH32 only for now)"
+HOMEPAGE="https://github.com/mah0x211/lua-xxhash"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-libs/xxhash"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+each_lua_compile() {
+ append-cflags "-I./src"
+ ${CC} ${CFLAGS} -c -o "${MY_PN}.o" "src/${MY_PN}.c"
+ ${CC} ${CFLAGS} -c -o "${MY_PN}_bind.o" "src/${MY_PN}_bind.c"
+ ${CC} ${LDFLAGS} -lxxhash -o "${MY_PN}".so "${MY_PN}.o" "${MY_PN}_bind.o"
+}
+
+each_lua_install() {
+ dolua "${MY_PN}".so
+}
diff --git a/dev-lua/lua-xxhash/metadata.xml b/dev-lua/lua-xxhash/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/lua-xxhash/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+ If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description>
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription>
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 113f882..7803633 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1 +1 @@
-DIST luacheck-0.22.0.tar.gz 150685 SHA256 a71806b8ae68f14bd7a40542623fe2377b1184d2972567180f1706254a3bcc72 SHA512 8264000711214e8451307e7f51a45b06d2fcd5da0d3cb49952d54b07a9448431ae3fd68a8cd0a27c73c3b03e6de74e8ae786c139707e16cf938921ab582d3bfd WHIRLPOOL bf00433322f9286e8cbad90606ec80541c7c21da5c2e554c7b1ae206b2ccb9f8cb8d273eaa63ebcda95b2d197f283f7b2cfe6fca98e415d8ee2e26bac1f845e1
+DIST luacheck-0.23.0.tar.gz 158201 SHA256 b4edf3a7702519502696d4ac7372ed1bd6a82ded63bf81f2b1d7e9b37711be2b SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028 WHIRLPOOL 009c9163fab48898934ad0987659c4ac106aa88e914bf1703ce00e3875e440ab4cc73d235f1307d5e9657b50d18b42307bea70e4e9f743673f02dd8bf1d0b4bc
diff --git a/dev-lua/luacheck/luacheck-0.22.0.ebuild b/dev-lua/luacheck/luacheck-0.23.0.ebuild
similarity index 88%
rename from dev-lua/luacheck/luacheck-0.22.0.ebuild
rename to dev-lua/luacheck/luacheck-0.23.0.ebuild
index 29203ab..33bc85a 100644
--- a/dev-lua/luacheck/luacheck-0.22.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-LUA_COMPAT="lua51 luajit2"
+#LUA_COMPAT="lua51 lua52 lua53 luajit2"
inherit lua
DESCRIPTION="A tool for linting and static analysis of Lua code"
@@ -16,11 +16,15 @@ IUSE="doc test"
RDEPEND="
dev-lua/luafilesystem
+ dev-lua/lanes
"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( dev-python/sphinx )
- test? ( dev-lua/busted )"
+ test? (
+ dev-lua/busted
+ dev-lua/luautf8
+ )"
DOCS=( CHANGELOG.md README.md )
diff --git a/dev-lua/luautf8/Manifest b/dev-lua/luautf8/Manifest
new file mode 100644
index 0000000..2c4ba72
--- /dev/null
+++ b/dev-lua/luautf8/Manifest
@@ -0,0 +1 @@
+DIST UCD.zip 5751718 SHA256 7a0f297f845b38454c1939ef773dbd0355ae6c00eaa34cdc84139de956a7b8a3 SHA512 954a499ff072727c8778e711fb1753834adf09277c9e9a2592c02b59971860f9a407c7e9985ed1e6bdda7a3cf3b1cd6316599c4bffe8b0625413f874486830c1 WHIRLPOOL 7c0bbd8888041bf82c7b45dac7f2c26d5a2fadbeffa688856dd7d31e053eca1a3db04d86ed134f5de45309c7a805eee48b2c08b01959e64ed19db1e5e6fc9f1e
diff --git a/dev-lua/luautf8/luautf8-9999.ebuild b/dev-lua/luautf8/luautf8-9999.ebuild
new file mode 100644
index 0000000..c39c74b
--- /dev/null
+++ b/dev-lua/luautf8/luautf8-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="starwing"
+
+inherit lua
+
+DESCRIPTION="lightweight, native, lazy evaluating multithreading library"
+HOMEPAGE="https://github.com/LuaLanes/lanes"
+
+SRC_URI="http://unicode.org/Public/UCD/latest/ucd/UCD.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples"
+
+DOCS=(README.md)
+EXAMPLES=(test{,_{compat,pm}}.lua)
+
+src_unpack() {
+ local ucd="${WORKDIR}/all/${P}/ucd";
+ lua_src_unpack
+ mkdir "${ucd}"
+ mv ${WORKDIR}/all/*.txt "${ucd}"
+}
+
+all_lua_prepare() {
+ lua_default
+ lua parseucd.lua
+}
+
+each_lua_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} lutf8lib.c -o lua-utf8.so
+}
+
+each_lua_install() {
+ dolua lua-utf8.so
+}
diff --git a/dev-lua/luautf8/metadata.xml b/dev-lua/luautf8/metadata.xml
new file mode 100644
index 0000000..c1baef2
--- /dev/null
+++ b/dev-lua/luautf8/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <longdescription lang="en">
+ lightweight, native, lazy evaluating multithreading library for Lua-5.1 or 5.2.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">LuaLanes/lanes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-lua/randomlua/metadata.xml b/dev-lua/randomlua/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/randomlua/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+ If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description>
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription>
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/randomlua/randomlua-9999.ebuild b/dev-lua/randomlua/randomlua-9999.ebuild
new file mode 100644
index 0000000..c07ded3
--- /dev/null
+++ b/dev-lua/randomlua/randomlua-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="linux-man"
+
+inherit lua
+
+DESCRIPTION="Pure Lua Random Generator"
+HOMEPAGE="https://github.com/linux-man/randomlua"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+ ${RDEPEND}
+"
+
+DOCS=(README.md)
+
+each_lua_install() {
+ dolua "${PN}.lua"
+}
diff --git a/dev-lua/resty-xxhash/metadata.xml b/dev-lua/resty-xxhash/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/resty-xxhash/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+ If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description>
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription>
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-lua/resty-xxhash/resty-xxhash-9999.ebuild b/dev-lua/resty-xxhash/resty-xxhash-9999.ebuild
new file mode 100644
index 0000000..78b7c60
--- /dev/null
+++ b/dev-lua/resty-xxhash/resty-xxhash-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT="luajit2"
+VCS="git"
+GITHUB_A="sjnam"
+GITHUB_PN="luajit-${PN##resty-}"
+
+inherit lua
+
+DESCRIPTION="LuaJIT bindings for dev-libs/xxhash"
+HOMEPAGE="https://github.com/sjnam/luajit-xxhash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-libs/xxhash"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+each_lua_install() {
+ dolua_jit lib/resty
+}
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 07b1e7a..01f74de 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -436,16 +436,21 @@ lua_src_unpack() {
# We don't support an each-unpack, it's either all or nothing!
if type all_lua_unpack &>/dev/null; then
_lua_invoke_environment all all_lua_unpack
- elif [[ -n ${VCS} ]] && declare -f ${VCS}_src_unpack >/dev/null; then
- _lua_invoke_environment all ${VCS}_src_unpack
- elif declare -f unpacker_src_unpack >/dev/null; then
- _lua_invoke_environment all unpacker_src_unpack
- elif [[ -n ${A} ]]; then
- unpack ${A}
- elif [[ -z "${GITHUB_A}" && -z "${BITBUCKET_A}" ]]; then
- eerror "Either GITHUB_A or BITBUCKET_A (author nick) should be set for magic SRC/REPO URI filling to work"
- eerror "You should either set one of them, or fill the proper URI variable manually!"
- die "See above eerror messages."
+ else
+ if [[ -n ${A} ]]; then
+ if declare -f unpacker_src_unpack >/dev/null; then
+ _lua_invoke_environment all unpacker_src_unpack
+ else
+ unpack ${A}
+ fi
+ fi
+ if [[ -n ${VCS} ]] && declare -f ${VCS}_src_unpack >/dev/null; then
+ _lua_invoke_environment all ${VCS}_src_unpack
+ elif [[ -z "${GITHUB_A}" && -z "${BITBUCKET_A}" && -z "${A}" ]]; then
+ eerror "Either GITHUB_A or BITBUCKET_A (author nick) should be set for magic SRC/REPO URI filling to work"
+ eerror "You should either set one of them, or fill the proper URI variable manually!"
+ die "See above eerror messages."
+ fi
fi
# hack for VCS-eclasses (darcs, for example) which defaults unpack dir to WD/P instead of S
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-09-19 8:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-19 8:19 [gentoo-commits] proj/lua:master commit in: dev-lua/luautf8/, dev-lua/randomlua/, dev-lua/lanes/, dev-lua/resty-xxhash/, Vadim A. Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox