commit: e9471abbb2e5ed99bfa5eccba303b663f455bfca Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> AuthorDate: Thu Feb 15 13:32:31 2018 +0000 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> CommitDate: Thu Feb 15 13:32:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=e9471abb
all: fixes dev-lua/argparse/argparse-9999.ebuild | 24 +++++++++ dev-lua/argparse/metadata.xml | 14 +++++ dev-lua/lpeg/lpeg-1.0.1.ebuild | 6 ++- dev-lua/lua-argon2-ffi/lua-argon2-ffi-9999.ebuild | 2 +- .../files/patches/99999/0001_lua52+_support.patch | 21 ++++++++ dev-lua/lua-discount/lua-discount-9999.ebuild | 29 +++++++++++ dev-lua/lua-discount/metadata.xml | 14 +++++ dev-lua/lua-stdlib/lua-stdlib-9999.ebuild | 1 + dev-lua/luadoc/luadoc-3.0.1.ebuild | 1 + dev-lua/luadoc/luadoc-9999.ebuild | 1 + .../files/patches/99999999/compat52-luajit.patch | 59 ---------------------- .../files/patches/99999999/makefile.oscp.patch | 13 ----- dev-lua/luaossl/luaossl-99999999.ebuild | 2 - dev-lua/moonscript/moonscript-9999.ebuild | 2 +- dev-lua/mpack/mpack-1.0.4.ebuild | 4 ++ 15 files changed, 115 insertions(+), 78 deletions(-) diff --git a/dev-lua/argparse/argparse-9999.ebuild b/dev-lua/argparse/argparse-9999.ebuild new file mode 100644 index 0000000..781d001 --- /dev/null +++ b/dev-lua/argparse/argparse-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VCS="git" +LUA_COMPAT="lua51 lua52 lua53 luajit2" +GITHUB_A="mpeterv" + +inherit lua + +DESCRIPTION="Feature-rich command line parser for Lua " +HOMEPAGE="https://github.com/mpeterv/argparse"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="" +IUSE="doc" + +DOCS=(README.md) + +each_lua_install() { + dolua "src/${PN}.lua" +} diff --git a/dev-lua/argparse/metadata.xml b/dev-lua/argparse/metadata.xml new file mode 100644 index 0000000..23da526 --- /dev/null +++ b/dev-lua/argparse/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>[email protected]</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/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild index c64c8c0..bef220a 100644 --- a/dev-lua/lpeg/lpeg-1.0.1.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild @@ -13,8 +13,10 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"; LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~mips x86" -IUSE="debug doc" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86" +IUSE="debug doc luajit" + +REQUIRED_USE="luajit? ( lua_targets_luajit2 )" PATCHES=("${FILESDIR}/${P}-makefile.patch") DOCS=(HISTORY) diff --git a/dev-lua/lua-argon2-ffi/lua-argon2-ffi-9999.ebuild b/dev-lua/lua-argon2-ffi/lua-argon2-ffi-9999.ebuild index ad52d48..c4fdcc3 100644 --- a/dev-lua/lua-argon2-ffi/lua-argon2-ffi-9999.ebuild +++ b/dev-lua/lua-argon2-ffi/lua-argon2-ffi-9999.ebuild @@ -33,5 +33,5 @@ each_lua_test() { src_compile() { :; } each_lua_install() { - dolua_jit "src/${PN%%-ffi}.lua" + dolua_jit "src/argon2.lua" } diff --git a/dev-lua/lua-discount/files/patches/99999/0001_lua52+_support.patch b/dev-lua/lua-discount/files/patches/99999/0001_lua52+_support.patch new file mode 100644 index 0000000..0c33143 --- /dev/null +++ b/dev-lua/lua-discount/files/patches/99999/0001_lua52+_support.patch @@ -0,0 +1,21 @@ +diff --git a/ldiscount.c b/ldiscount.c +index 063ae55..5e45198 100644 +--- a/ldiscount.c 2017-11-19 01:35:45.812631259 +0700 ++++ b/ldiscount.c 2017-11-19 01:35:38.342881222 +0700 +@@ -6,6 +6,15 @@ + + #include "mkdio.h" + ++#ifndef luaL_reg ++/* Taken from Lua5.1's lauxlib.h */ ++#define luaL_reg luaL_Reg ++#endif ++ ++#if LUA_VERSION_NUM > 501 ++#define luaL_register(L,n,f) luaL_setfuncs(L,f,0) ++#endif ++ + static const char *const discount_opts[] = { + "nolinks", + "noimages", + diff --git a/dev-lua/lua-discount/lua-discount-9999.ebuild b/dev-lua/lua-discount/lua-discount-9999.ebuild new file mode 100644 index 0000000..bfcca08 --- /dev/null +++ b/dev-lua/lua-discount/lua-discount-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VCS="git" +#IS_MULTILIB=true +GITHUB_A="craigbarnes" + +inherit lua + +DESCRIPTION="Lua binding to app-text/discount" +HOMEPAGE="https://github.com/asb/lua-discount"; + +LICENSE="ISC" +SLOT="0" +KEYWORDS="" +IUSE="doc" + +RDEPEND=" + app-text/discount +" +DEPEND="${RDEPEND}" + +DOCS=(README.md) + +each_lua_install() { + dolua discount.so +} diff --git a/dev-lua/lua-discount/metadata.xml b/dev-lua/lua-discount/metadata.xml new file mode 100644 index 0000000..23da526 --- /dev/null +++ b/dev-lua/lua-discount/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>[email protected]</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/lua-stdlib/lua-stdlib-9999.ebuild b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild index 0788ac1..0cfe7b0 100644 --- a/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild +++ b/dev-lua/lua-stdlib/lua-stdlib-9999.ebuild @@ -19,6 +19,7 @@ IUSE="doc" DOCS=(README.md NEWS.md STYLE.md) all_lua_prepare() { + lua_default mkdir -p html sed \ -e '/^dir/s@"."@"../html"@' \ diff --git a/dev-lua/luadoc/luadoc-3.0.1.ebuild b/dev-lua/luadoc/luadoc-3.0.1.ebuild index 8fa3fec..4d7f5d0 100644 --- a/dev-lua/luadoc/luadoc-3.0.1.ebuild +++ b/dev-lua/luadoc/luadoc-3.0.1.ebuild @@ -26,6 +26,7 @@ HTML_DOCS=(doc/us/.) all_lua_prepare() { # >=lua-5.1.3 find . -name '*.lua' | xargs sed -e "s/gfind/gmatch/g" -i || die + default } each_lua_install() { diff --git a/dev-lua/luadoc/luadoc-9999.ebuild b/dev-lua/luadoc/luadoc-9999.ebuild index 7c8b203..ec577d9 100644 --- a/dev-lua/luadoc/luadoc-9999.ebuild +++ b/dev-lua/luadoc/luadoc-9999.ebuild @@ -27,6 +27,7 @@ HTML_DOCS=( doc/us/. ) all_lua_prepare() { # >=lua-5.1.3 find . -name '*.lua' | xargs sed -e "s/gfind/gmatch/g" -i || die + default } each_lua_install() { diff --git a/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch b/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch deleted file mode 100644 index 1da7c7a..0000000 --- a/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -NaurBwd a/compat52.h b/compat52.h ---- a/src/compat52.h 2017-05-10 02:07:08.039072892 +0700 -+++ b/src/compat52.h 2017-05-10 02:06:55.224543285 +0700 -@@ -32,20 +32,19 @@ - - #if LUA_VERSION_NUM < 502 - --#define LUA_OK 0 - -- -+#ifndef LUA_OK - static void luaL_setmetatable(lua_State *L, const char *tname) { - luaL_getmetatable(L, tname); - lua_setmetatable(L, -2); - } /* luaL_setmetatable() */ -- -+#endif - - static int lua_absindex(lua_State *L, int idx) { - return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1; - } /* lua_absindex() */ -- - -+#ifndef LUA_OK - static void *luaL_testudata(lua_State *L, int arg, const char *tname) { - void *p = lua_touserdata(L, arg); - int eq; -@@ -70,8 +69,10 @@ - - return (eq)? p : 0; - } /* luaL_testudate() */ -+#endif - - -+#ifndef LUA_OK - static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) { - int i, t = lua_absindex(L, -1 - nup); - -@@ -84,13 +85,18 @@ - - lua_pop(L, nup); - } /* luaL_setfuncs() */ -+#endif - -- -+#ifndef LUA_OK - #define luaL_newlibtable(L, l) \ - lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1) -+#endif - -+#ifndef LUA_OK - #define luaL_newlib(L, l) \ - (luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0)) -+#endif -+#define LUA_OK 0 - - - static void luaL_requiref(lua_State *L, const char *modname, lua_CFunction openf, int glb) { - diff --git a/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch b/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch deleted file mode 100644 index 9b0e008..0000000 --- a/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -NaurBwd a/src/GNUmakefile b/src/GNUmakefile ---- a/src/GNUmakefile 2017-05-10 15:08:48.672212014 +0700 -+++ b/src/GNUmakefile 2017-05-10 15:10:23.462693220 +0700 -@@ -150,7 +150,7 @@ - $$(MKDIR) -p $$(@D) - $$(CP) -p $$< $$@ - --$$(DESTDIR)$(3)/openssl/ssl/%.lua: $$(d)/openssl.ssl.%.lua -+$$(DESTDIR)$(3)/openssl/ocsp/%.lua: $$(d)/openssl.ocsp.%.lua - $$(LUAC$(1)_$(d)) -p $$< - $$(MKDIR) -p $$(@D) - $$(CP) -p $$< $$@ - diff --git a/dev-lua/luaossl/luaossl-99999999.ebuild b/dev-lua/luaossl/luaossl-99999999.ebuild index 1a65994..70d04fd 100644 --- a/dev-lua/luaossl/luaossl-99999999.ebuild +++ b/dev-lua/luaossl/luaossl-99999999.ebuild @@ -25,8 +25,6 @@ RDEPEND="${DEPEND}" DOCS=(doc/.) EXAMPLES=(examples/.) -PATCHES=("${FILESDIR}/patches/${PV}") - all_lua_prepare() { sed -r \ -e "s@(^prefix ).*@\1=/usr@" \ diff --git a/dev-lua/moonscript/moonscript-9999.ebuild b/dev-lua/moonscript/moonscript-9999.ebuild index bbb9a33..cc3598e 100644 --- a/dev-lua/moonscript/moonscript-9999.ebuild +++ b/dev-lua/moonscript/moonscript-9999.ebuild @@ -22,7 +22,7 @@ RDEPEND=" dev-lua/lulpeg[lpeg_replace] ) dev-lua/luafilesystem - dev-lua/alt-getopt + dev-lua/argparse inotify? ( dev-lua/linotify ) " DEPEND="${RDEPEND}" diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild index c6ba6f3..f192064 100644 --- a/dev-lua/mpack/mpack-1.0.4.ebuild +++ b/dev-lua/mpack/mpack-1.0.4.ebuild @@ -48,6 +48,10 @@ each_lua_prepare() { -e '/^LUA_/d' \ -i Makefile + sed \ + -e '692i /* fallthrough */' \ + -i "${S}/lmpack.c" + if lua_is_jit; then # fixed in git HEAD sed \
