diff options
45 files changed, 376 insertions, 496 deletions
diff --git a/dev-lang/lua/lua-5.3.1.ebuild b/dev-lang/lua/lua-5.3.1.ebuild index 04f3437..08aae94 100644 --- a/dev-lang/lua/lua-5.3.1.ebuild +++ b/dev-lang/lua/lua-5.3.1.ebuild @@ -83,7 +83,7 @@ multilib_src_compile() { cd src - local myCFLAGS="" + local myCFLAGS; use deprecated && myCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" # -DLUA_COMPAT_FLOATSTRING" diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild index 0cc551d..97c8f57 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild @@ -5,7 +5,7 @@ EAPI="5" IS_MULTILIB=true -#LUA_COMPAT="lua51" #actually. But lj, l52 and l53 can load it too +LUA_COMPAT="lua51 lua52 lua53" inherit lua @@ -19,7 +19,13 @@ KEYWORDS="~amd64 ~x86" IUSE="doc" READMES=( README ) -HTML_DOCS=( doc/ ) +HTML_DOCS=( doc/. ) + +each_lua_configure() { + # Lua5.3 compilation hack + myeconfargs=( 'CFLAGS+=-DLUA_NUMBER_DOUBLE' ) + lua_default +} each_lua_test() { emake LUA=${LUA} test diff --git a/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild b/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild index d63617f..1491ea1 100644 --- a/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild +++ b/dev-lua/alt-getopt/alt-getopt-0.7.0.ebuild @@ -21,6 +21,8 @@ READMES=( README ) S="${WORKDIR}/all/${MY_P}" LUA_S="${MY_P}" +each_lua_compile() { :; } + each_lua_install() { dolua alt_getopt.lua } diff --git a/dev-lua/bit32/bit32-9999.ebuild b/dev-lua/bit32/bit32-9999.ebuild new file mode 100644 index 0000000..d21da92 --- /dev/null +++ b/dev-lua/bit32/bit32-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: This ebuild is from Lua overlay; Bumped by mva; $ + +EAPI="5" + +# building fine, but not needed for Lua5.2 and Lua5.3 +LUA_COMPAT="lua51 luajit2" + +IS_MULTILIB=true +VCS="git-r3" + +inherit lua + +DESCRIPTION="A Lua5.2+ bit manipulation library" +HOMEPAGE="https://github.com/keplerproject/lua-compat-5.2" + +EGIT_REPO_URI="https://github.com/keplerproject/lua-compat-5.2" +KEYWORDS="" +READMES=( README.md ) + +LICENSE="MIT" +SLOT="0" +IUSE="" + +each_lua_compile() { + _lua_setFLAGS + local MY_PN="lbitlib" + + ${CC} ${CFLAGS} -Ic-api -c -o ${MY_PN}.o ${MY_PN}.c || die + ${CC} ${LDFLAGS} -o ${PN}.so ${MY_PN}.o || die +} + +each_lua_install() { + dolua "${PN}.so" +} diff --git a/dev-lua/cmsgpack/cmsgpack-9999.ebuild b/dev-lua/cmsgpack/cmsgpack-9999.ebuild index 1c53394..34d2f1c 100644 --- a/dev-lua/cmsgpack/cmsgpack-9999.ebuild +++ b/dev-lua/cmsgpack/cmsgpack-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0" IUSE="test" each_lua_compile() { - _lua_setCFLAGS + _lua_setFLAGS local MY_PN="lua_${PN}" ${CC} ${CFLAGS} -c -o ${MY_PN}.o ${MY_PN}.c || die diff --git a/dev-lua/lapis/lapis-9999.ebuild b/dev-lua/lapis/lapis-9999.ebuild index 8e465c0..3e86587 100644 --- a/dev-lua/lapis/lapis-9999.ebuild +++ b/dev-lua/lapis/lapis-9999.ebuild @@ -32,7 +32,7 @@ DEPEND=" ${RDEPEND} " -DOCS=( docs/ README.md ) +DOCS=( docs/. README.md ) all_lua_prepare() { use moonscript || find "${S}" -type -name '*.moon' -delete diff --git a/dev-lua/lua-cjson/lua-cjson-9999.ebuild b/dev-lua/lua-cjson/lua-cjson-9999.ebuild index ea2698d..10dc017 100644 --- a/dev-lua/lua-cjson/lua-cjson-9999.ebuild +++ b/dev-lua/lua-cjson/lua-cjson-9999.ebuild @@ -6,14 +6,15 @@ EAPI="5" VCS="git-r3" IS_MULTILIB=true -LUA_COMPAT="lua51 luajit2" -inherit cmake-utils lua +#LUA_COMPAT="lua51 luajit2" +#inherit cmake-utils lua +inherit lua DESCRIPTION="Lua JSON Library, written in C" HOMEPAGE="http://www.kyne.com.au/~mark/software/lua-cjson.php" SRC_URI="" -EGIT_REPO_URI="https://github.com/openresty/lua-cjson" +EGIT_REPO_URI="https://github.com/msva/lua-cjson" LICENSE="MIT" SLOT="0" @@ -22,12 +23,19 @@ IUSE="+examples" EXAMPLES=( tests/ lua/{json2lua,lua2json}.lua ) -each_lua_configure() { - mycmakeargs=( - -DUSE_INTERNAL_FPCONV=ON - ) - cmake-utils_src_configure -} +#each_lua_configure() { +# mycmakeargs=( +# -DUSE_INTERNAL_FPCONV=ON +# ) +# cmake-utils_src_configure +#} + +#each_lua_configure() { +# mycmakeargs=( +# -DUSE_INTERNAL_FPCONV=ON +# ) +# cmake-utils_src_configure +#} each_lua_install() { dolua lua/cjson cjson.so diff --git a/dev-lua/lua-fann/lua-fann-9999.ebuild b/dev-lua/lua-fann/lua-fann-9999.ebuild index 7396b7c..42b32d7 100644 --- a/dev-lua/lua-fann/lua-fann-9999.ebuild +++ b/dev-lua/lua-fann/lua-fann-9999.ebuild @@ -28,25 +28,21 @@ DEPEND=" READMES=( README.md TODO ) HTML_DOCS=( doc/luafann.html ) -EXAMPLES=( examples/* ) +EXAMPLES=( test/. ) all_lua_compile() { + touch .lua_eclass_config use doc && ( emake docs ) } -each_lua_compile() { - _lua_setCFLAGS - - emake \ - CC="${CC}" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PKG_CONFIG="${PKG_CONFIG}" \ - LUA_IMPL="$(lua_get_lua)" \ - LUA_BIN="${LUA}" \ - LUA_INC="." +each_lua_configure() { + myeconfargs=( + LUA_IMPL="$(lua_get_lua)" + LUA_BIN="${LUA}" + ) + lua_default } each_lua_test() { diff --git a/dev-lua/lua-gd/lua-gd-9999.ebuild b/dev-lua/lua-gd/lua-gd-9999.ebuild index 9fb8cdf..0233901 100644 --- a/dev-lua/lua-gd/lua-gd-9999.ebuild +++ b/dev-lua/lua-gd/lua-gd-9999.ebuild @@ -26,25 +26,30 @@ DEPEND=" " READMES=( README ) -EXAMPLES=( demos/* ) -HTML_DOCS=( doc/ ) - -all_lua_prepare() { - sed -r \ - -e 's#CFLAGS#CF#g' \ - -e 's#LFLAGS#LF#g' \ - -e 's/^(CF=.*)/\1 $(CFLAGS)/' \ - -e 's/^(LF=.*)/\1 $(LDFLAGS)/' \ - -e 's/`pkg-config/`$(PKG_CONFIG)/' \ - -i Makefile +EXAMPLES=( demos/. ) +HTML_DOCS=( doc/. ) + +#all_lua_prepare() { +# sed -r \ +# -e 's#CFLAGS#CF#g' \ +# -e 's#LFLAGS#LF#g' \ +# -e 's/^(CF=.*)/\1 $(CFLAGS)/' \ +# -e 's/^(LF=.*)/\1 $(LDFLAGS)/' \ +# -e 's/`pkg-config/`$(PKG_CONFIG)/' \ +# -i Makefile +#} + +each_lua_configure() { + local lua=$(lua_get_lua) + myeconfargs=( + LUAPKG="${lua}" + LUABIN="${lua}" + ) + lua_default } each_lua_compile() { - local lua=$(lua_get_lua) - lua_default \ - LUAPKG="${lua}" \ - LUABIN="${lua}" \ - gd.so + lua_default gd.so } each_lua_install() { diff --git a/dev-lua/luaevent/files/lua5.3.patch b/dev-lua/luaevent/files/lua5.3.patch deleted file mode 100644 index a098601..0000000 --- a/dev-lua/luaevent/files/lua5.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/luaevent.h 2015-09-26 13:26:21.928996805 +0600 -+++ include/luaevent.h.new 2015-09-26 13:26:18.427133021 +0600 -@@ -26,7 +26,7 @@ - #include <lua.h> - - /* Workarounds for Lua 5.2 */ --#if (LUA_VERSION_NUM == 502) -+#if (LUA_VERSION_NUM >= 502) - - #undef lua_equal - #define lua_equal(L,idx1,idx2) lua_compare(L, (idx1), (idx2), LUA_OPEQ) diff --git a/dev-lua/luaevent/luaevent-9999.ebuild b/dev-lua/luaevent/luaevent-9999.ebuild index 7d18b55..6776b6d 100644 --- a/dev-lua/luaevent/luaevent-9999.ebuild +++ b/dev-lua/luaevent/luaevent-9999.ebuild @@ -27,7 +27,7 @@ DEPEND=" READMES=( README ) -PATCHES=( ${FILESDIR}/{gc-anchoring,lua5.3}.patch ) +PATCHES=( ${FILESDIR}/gc-anchoring.patch ) each_lua_install() { dolua lua/* diff --git a/dev-lua/luafilesystem/luafilesystem-9999.ebuild b/dev-lua/luafilesystem/luafilesystem-9999.ebuild index 17d9d11..238c930 100644 --- a/dev-lua/luafilesystem/luafilesystem-9999.ebuild +++ b/dev-lua/luafilesystem/luafilesystem-9999.ebuild @@ -19,14 +19,19 @@ SLOT="0" KEYWORDS="" IUSE="doc" -HTML_DOCS=( doc/us/ ) +HTML_DOCS=( doc/us/. ) READMES=( README ) all_lua_prepare() { - sed \ - -e 's|-O2|${CFLAGS}|' \ - -e '/^LIB_OPTION/s|= |= ${LDFLAGS} |' \ - -i config || die "config fix failed" + sed -e 'd' config + lua_default +} + +each_lua_configure() { + myeconfargs=( + LIB_OPTION='$(LDFLAGS)' + ) + lua_default } each_lua_install() { diff --git a/dev-lua/luaposix/luaposix-9999.ebuild b/dev-lua/luaposix/luaposix-9999.ebuild index 44ab46d..ace9a9c 100644 --- a/dev-lua/luaposix/luaposix-9999.ebuild +++ b/dev-lua/luaposix/luaposix-9999.ebuild @@ -22,15 +22,15 @@ KEYWORDS="" IUSE="doc +examples ncurses" RDEPEND=" - virtual/lua[bit] + virtual/lua[bit32] ncurses? ( sys-libs/ncurses ) " DEPEND=" ${RDEPEND} doc? ( dev-lua/ldoc ) - dev-libs/gnulib " +# dev-libs/gnulib # dev-lua/specl # dev-lua/lyaml @@ -96,6 +96,6 @@ each_lua_configure() { ax_cv_lua_luaexecdir="$(lua_get_pkgvar INSTALL_CMOD)" ) - base_src_configure + econf ${myeconfargs[@]} } diff --git a/dev-lua/profi/Manifest b/dev-lua/profi/Manifest index 426c1de..7faa12f 100644 --- a/dev-lua/profi/Manifest +++ b/dev-lua/profi/Manifest @@ -1 +1 @@ -DIST profi-12.tar.gz 3909 SHA256 a90e19e6f626514d2b3da5ff3bfde6370e48ec6d264b965ab704ddb92fef49b8 SHA512 da555562f125322f6c20bbb182c1dd893b9e7eee3bb448b856d63c01eacbcb11dc5142bc77992b3d6128d4a03d8277c34d0befe755c380b75ffd290d082a0bd6 WHIRLPOOL 314ccefcfdbdb5856e654505d1d1898bc26b6483e86ec4c339c521f116ea979e70d0c1029e33790c528cad8c8db758f8d9c0ade1066e21fc3cbe303d136af85e +DIST profi-12.tar.gz 3911 SHA256 3738c20a3a3d401e0fc680bf2db58eee8896a26e26686e5bfd1c8e33ad1595b2 SHA512 f5bd625dc8a828d2e1fe9763f775f13430decbdf057aa4577abd2907bb3d68d84feed74e9fa9c6b3e71e6ebf986ef56d9fa2e8deb21490851e5d875e3653a8d2 WHIRLPOOL fdc2858b5f4ee87e741bc3c775d707a9ddd5255c0573e807d2e1fb370c561deacaff0096ceced5a329e9d779704b5ae2a1d5d0617f5849d47788fc815f13f540 diff --git a/dev-lua/profi/profi-12.ebuild b/dev-lua/profi/profi-12.ebuild index a2550b6..06c9cd0 100644 --- a/dev-lua/profi/profi-12.ebuild +++ b/dev-lua/profi/profi-12.ebuild @@ -4,27 +4,20 @@ EAPI="5" -inherit eutils vcs-snapshot +inherit lua DESCRIPTION="a Lua Profiler" HOMEPAGE="https://gist.github.com/perky/2838755" -SRC_URI="https://gist.github.com/perky/2838755/download -> ${P}.tar.gz" +SRC_URI="https://gist.github.com/perky/2838755/archive/78e573ca38b859c8639427c52d2c850736969bc7.tar.gz -> ${P}.tar.gz" +#SRC_URI="https://gist.github.com/perky/2838755/download -> ${P}.zip" LICENSE="MIT" SLOT="0" KEYWORDS="x86 amd64 ppc mips arm" -IUSE="luajit" +IUSE="" -RDEPEND=" - virtual/lua[luajit=] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -src_install() { - local lua=lua; - use luajit && lua=luajit - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins ProFi.lua +LUA_S="2838755-78e573ca38b859c8639427c52d2c850736969bc7" + +each_lua_install() { + dolua ProFi.lua } diff --git a/dev-lua/raven/raven-9999.ebuild b/dev-lua/raven/raven-9999.ebuild index 80c462a..dda3409 100644 --- a/dev-lua/raven/raven-9999.ebuild +++ b/dev-lua/raven/raven-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="A small Lua interface to Sentry" -HOMEPAGE="https://github.com/cloudflare/${PN}-lua" +HOMEPAGE="https://github.com/cloudflare/raven-lua" SRC_URI="" EGIT_REPO_URI="https://github.com/cloudflare/${PN}-lua" @@ -15,27 +16,24 @@ EGIT_REPO_URI="https://github.com/cloudflare/${PN}-lua" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="doc +examples" RDEPEND=" - virtual/lua[luajit=] + dev-lua/lua-cjson dev-lua/lunit dev-lua/luaposix " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_compile() { :; } - -src_install() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.md ) +HTML_DOCS=( docs/. ) +EXAMPLES=( tests/. ) - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins -r raven.lua +# Makefile is only used to run tests +src_compile() { :; } - dodoc -r README.md - dohtml docs/* +each_lua_install() { + dolua raven.lua } diff --git a/dev-lua/rds-parser/rds-parser-9999.ebuild b/dev-lua/rds-parser/rds-parser-9999.ebuild index 37af489..70b57c6 100644 --- a/dev-lua/rds-parser/rds-parser-9999.ebuild +++ b/dev-lua/rds-parser/rds-parser-9999.ebuild @@ -4,10 +4,13 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="lua51 luajit2" +IS_MULTILIB=true +inherit lua DESCRIPTION="Resty-DBD-Stream (RDS) parser for Lua written in C" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-rds-parser" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,23 +18,14 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" - -RDEPEND=" - virtual/lua[luajit=] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - local lua=lua; - use luajit && lua=luajit; - - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +IUSE="" + +each_lua_configure() { + myeconfargs=( + "PREFIX=/usr" + "LUA_LIB_DIR=$(lua_get_pkgvar INSTALL_CMOD)" + "LUA_INCLUDE_DIR=$(lua_get_pkgvar includedir)" + ) + lua_default } + diff --git a/dev-lua/redis-parser/redis-parser-9999.ebuild b/dev-lua/redis-parser/redis-parser-9999.ebuild index 51429d6..7e952f5 100644 --- a/dev-lua/redis-parser/redis-parser-9999.ebuild +++ b/dev-lua/redis-parser/redis-parser-9999.ebuild @@ -4,10 +4,13 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="lua51 luajit2" +IS_MULTILIB=true +inherit lua DESCRIPTION="Redis reply parser and request constructor library for Lua" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-redis-parser" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,23 +18,13 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" - -RDEPEND=" - virtual/lua[luajit=] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - local lua=lua; - use luajit && lua=luajit; - - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +IUSE="" + +each_lua_configure() { + myeconfargs=( + "PREFIX=/usr" + "LUA_LIB_DIR=$(lua_get_pkgvar INSTALL_CMOD)" + "LUA_INCLUDE_DIR=$(lua_get_pkgvar includedir)" + ) + lua_default } diff --git a/dev-lua/resty-cookie/resty-cookie-9999.ebuild b/dev-lua/resty-cookie/resty-cookie-9999.ebuild index 13ee2dc..418d01d 100644 --- a/dev-lua/resty-cookie/resty-cookie-9999.ebuild +++ b/dev-lua/resty-cookie/resty-cookie-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit base eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Library for parsing HTTP Cookie header for Nginx" -HOMEPAGE="https://github.com/cloudflare/lua-${PN}" +HOMEPAGE="https://github.com/cloudflare/lua-resty-cookie" SRC_URI="" EGIT_REPO_URI="https://github.com/cloudflare/lua-${PN}" @@ -15,27 +16,18 @@ EGIT_REPO_URI="https://github.com/cloudflare/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " +READMES=( README.md ) -DOCS=( "README.md" ) - -src_install() { - local lua=lua; - use luajit && lua=luajit; - - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins -r lib/resty - - base_src_install_docs +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-core/resty-core-9999.ebuild b/dev-lua/resty-core/resty-core-9999.ebuild index 7942fc2..6c94f46 100644 --- a/dev-lua/resty-core/resty-core-9999.ebuild +++ b/dev-lua/resty-core/resty-core-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +LUA_COMPAT="luajit2" +VCS="git-r3" +inherit lua DESCRIPTION="New LuaJIT FFI based API for lua-nginx-module" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-core" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -24,15 +26,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua_jit lib/resty } diff --git a/dev-lua/resty-dns/resty-dns-9999.ebuild b/dev-lua/resty-dns/resty-dns-9999.ebuild index 8261dd6..5a7d23c 100644 --- a/dev-lua/resty-dns/resty-dns-9999.ebuild +++ b/dev-lua/resty-dns/resty-dns-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Lua DNS resolver for the ngx_lua based on the cosocket API" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-dns" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +16,18 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] + virtual/lua[bit] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-lock/resty-lock-9999.ebuild b/dev-lua/resty-lock/resty-lock-9999.ebuild index 9db35bd..0f7e708 100644 --- a/dev-lua/resty-lock/resty-lock-9999.ebuild +++ b/dev-lua/resty-lock/resty-lock-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="luajit2" +inherit lua DESCRIPTION="Simple shm-based nonblocking lock API" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-lock" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -18,20 +20,14 @@ KEYWORDS="" IUSE="" RDEPEND=" - virtual/lua[luajit] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua_jit lib/resty } diff --git a/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild b/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild index f99aa97..9b565fc 100644 --- a/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild +++ b/dev-lua/resty-lrucache/resty-lrucache-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="luajit2" +inherit lua DESCRIPTION="A simple LRU cache for OpenResty and the ngx_lua module (based on LuaJIT FFI)" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-lrucache" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,21 +17,17 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_install() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins -r lib/resty +each_lua_install() { + dolua_jit lib/resty } diff --git a/dev-lua/resty-memcached/resty-memcached-9999.ebuild b/dev-lua/resty-memcached/resty-memcached-9999.ebuild index ae0bc8e..5295af6 100644 --- a/dev-lua/resty-memcached/resty-memcached-9999.ebuild +++ b/dev-lua/resty-memcached/resty-memcached-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Lua memcached client driver for the ngx_lua based on the cosocket API" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-memcached" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +16,17 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-mysql/resty-mysql-9999.ebuild b/dev-lua/resty-mysql/resty-mysql-9999.ebuild index 620dffb..c34d934 100644 --- a/dev-lua/resty-mysql/resty-mysql-9999.ebuild +++ b/dev-lua/resty-mysql/resty-mysql-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Lua MySQL client driver for ngx_lua based on the cosocket API" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-mysql" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +16,19 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[bit,luajit=] + virtual/lua[bit] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } + diff --git a/dev-lua/resty-random/resty-random-9999.ebuild b/dev-lua/resty-random/resty-random-9999.ebuild index 94da120..d8689f9 100644 --- a/dev-lua/resty-random/resty-random-9999.ebuild +++ b/dev-lua/resty-random/resty-random-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit base eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="luajit2" +inherit lua DESCRIPTION="LuaJIT FFI-based Random Library for OpenResty" -HOMEPAGE="https://github.com/bungle/lua-${PN}" +HOMEPAGE="https://github.com/bungle/lua-resty-random" SRC_URI="" EGIT_REPO_URI="https://github.com/bungle/lua-${PN}" @@ -18,20 +20,17 @@ KEYWORDS="" IUSE="" RDEPEND=" - virtual/lua[luajit] + !dev-lua/resty-string[-ext-random(+)] www-servers/nginx[nginx_modules_http_lua,ssl] + dev-libs/openssl " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -DOCS=( "README.md" ) +READMES=( README.md ) -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD luajit)" - mv lib/resty/random.lua lib/resty/resty_random.lua - doins -r lib/resty - - base_src_install_docs +each_lua_install() { +# mv lib/resty/random.lua lib/resty/resty_random.lua + dolua_jit lib/resty } diff --git a/dev-lua/resty-redis/resty-redis-9999.ebuild b/dev-lua/resty-redis/resty-redis-9999.ebuild index 6379f79..bfd442e 100644 --- a/dev-lua/resty-redis/resty-redis-9999.ebuild +++ b/dev-lua/resty-redis/resty-redis-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Lua redis client driver for the ngx_lua based on the cosocket API" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-redis" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +16,17 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-session/resty-session-9999.ebuild b/dev-lua/resty-session/resty-session-9999.ebuild index b167150..45cf648 100644 --- a/dev-lua/resty-session/resty-session-9999.ebuild +++ b/dev-lua/resty-session/resty-session-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit base eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="luajit2" +inherit lua DESCRIPTION="Session library for OpenResty implementing Secure Cookie Protocol" -HOMEPAGE="https://github.com/bungle/lua-${PN}" +HOMEPAGE="https://github.com/bungle/lua-resty-session" SRC_URI="" EGIT_REPO_URI="https://github.com/bungle/lua-${PN}" @@ -18,21 +20,16 @@ KEYWORDS="" IUSE="" RDEPEND=" - virtual/lua[luajit] www-servers/nginx[nginx_modules_http_lua] dev-lua/lua-cjson dev-lua/resty-string " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -DOCS=( "README.md" ) +READMES=( README.md ) -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD luajit)" - doins -r lib/resty - - base_src_install_docs +each_lua_install() { + dolua_jit lib/resty } diff --git a/dev-lua/resty-string/resty-string-9999.ebuild b/dev-lua/resty-string/resty-string-9999.ebuild index 8755d66..e827b91 100644 --- a/dev-lua/resty-string/resty-string-9999.ebuild +++ b/dev-lua/resty-string/resty-string-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +LUA_COMPAT="luajit2" +inherit lua DESCRIPTION="String utilities and common hash functions for ngx_lua and LuaJIT" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-string" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +17,23 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="+ext_random" RDEPEND=" - virtual/lua[luajit] - www-servers/nginx[nginx_modules_http_lua] + ext_random? ( dev-lua/resty-random ) + www-servers/nginx[nginx_modules_http_lua,ssl] dev-libs/openssl " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +all_lua_prepare() { + use ext_random && rm lib/resty/random.lua +} + +each_lua_install() { + dolua_jit lib/resty } diff --git a/dev-lua/resty-template/resty-template-9999.ebuild b/dev-lua/resty-template/resty-template-9999.ebuild index 637a4cf..8b9f9fa 100644 --- a/dev-lua/resty-template/resty-template-9999.ebuild +++ b/dev-lua/resty-template/resty-template-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit base eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Templating Engine (HTML) for Lua and OpenResty." -HOMEPAGE="https://github.com/bungle/lua-${PN}" +HOMEPAGE="https://github.com/bungle/lua-resty-template" SRC_URI="" EGIT_REPO_URI="https://github.com/bungle/lua-${PN}" @@ -15,25 +16,17 @@ EGIT_REPO_URI="https://github.com/bungle/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -DOCS=( "README.md" ) +READMES=( "README.md" ) -src_install() { - local lua=lua; - use luajit && lua=luajit; - - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins -r lib/resty - - base_src_install_docs +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-upload/resty-upload-9999.ebuild b/dev-lua/resty-upload/resty-upload-9999.ebuild index 0c6de13..15fc303 100644 --- a/dev-lua/resty-upload/resty-upload-9999.ebuild +++ b/dev-lua/resty-upload/resty-upload-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Streaming reader and parser for HTTP file uploading based on ngx_lua cosocket" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-upload" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +16,17 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild index 3da7379..8835231 100644 --- a/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild +++ b/dev-lua/resty-upstream-healthcheck/resty-upstream-healthcheck-9999.ebuild @@ -4,10 +4,11 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 +VCS="git-r3" +inherit lua DESCRIPTION="Health Checker for Nginx Upstream Servers in Pure Lua" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-upstream-healthcheck" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -22,15 +23,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/resty-websocket/resty-websocket-9999.ebuild b/dev-lua/resty-websocket/resty-websocket-9999.ebuild index decfef4..55978aa 100644 --- a/dev-lua/resty-websocket/resty-websocket-9999.ebuild +++ b/dev-lua/resty-websocket/resty-websocket-9999.ebuild @@ -4,10 +4,12 @@ EAPI="5" -inherit eutils toolchain-funcs git-r3 + +VCS="git-r3" +inherit lua DESCRIPTION="Lua WebSocket implementation for the NginX lua module" -HOMEPAGE="https://github.com/openresty/lua-${PN}" +HOMEPAGE="https://github.com/openresty/lua-resty-websocket" SRC_URI="" EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" @@ -15,24 +17,17 @@ EGIT_REPO_URI="https://github.com/openresty/lua-${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] www-servers/nginx[nginx_modules_http_lua] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_prepare() { - local lua=lua; - use luajit && lua=luajit; +READMES=( README.markdown ) - sed -r \ - -e "s#^(PREFIX).*#\1=/usr#" \ - -e "s#^(LUA_LIB_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})#" \ - -e "s#^(LUA_INCLUDE_DIR).*#\1=$($(tc-getPKG_CONFIG) --variable includedir ${lua})#" \ - -i Makefile +each_lua_install() { + dolua lib/resty } diff --git a/dev-lua/rings/rings-9999.ebuild b/dev-lua/rings/rings-9999.ebuild index f9db462..12256dd 100644 --- a/dev-lua/rings/rings-9999.ebuild +++ b/dev-lua/rings/rings-9999.ebuild @@ -4,7 +4,9 @@ EAPI="5" -inherit multilib toolchain-funcs flag-o-matic eutils git-r3 +VCS="git-r3" +IS_MULTILIB=true +inherit lua DESCRIPTION="Lua Rings Library" HOMEPAGE="https://github.com/keplerproject/rings" @@ -16,22 +18,15 @@ EGIT_REPO_URI="git://github.com/msva/rings.git https://github.com/msva/rings.git LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="luajit" - -RDEPEND=" - virtual/lua[luajit=] -" -DEPEND="${RDEPEND}" - -src_configure() { - local lua="lua"; - use luajit && lua="luajit" - ./configure "${lua}" +IUSE="" + +each_lua_configure() { + myeconfargs=( + PREFIX=/usr + LIBNAME="${P}".so + LUA_LIBDIR="$(lua_get_pkgvar INSTALL_CMOD)" + LUA_DIR="$(lua_get_pkgvar INSTALL_LMOD)" + ) + lua_default } -src_compile() { - local lua="lua"; - use luajit && lua="luajit" - append-cflags "-I$($(tc-getPKG_CONFIG) --variable includedir ${lua})" - emake CC="$(tc-getCC) -fPIC -DPIC" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" || die "Can't copmile Rings library" -} diff --git a/dev-lua/specl/specl-9999.ebuild b/dev-lua/specl/specl-9999.ebuild index 1b80a24..43e923b 100644 --- a/dev-lua/specl/specl-9999.ebuild +++ b/dev-lua/specl/specl-9999.ebuild @@ -4,7 +4,8 @@ EAPI="5" -inherit base git-r3 toolchain-funcs eutils +VCS="git-r3" +inherit lua DESCRIPTION="a testing tool for Lua, providing a Behaviour Driven Development framework in the vein of RSpec" HOMEPAGE="https://github.com/gvvaughan/specl" @@ -15,45 +16,39 @@ EGIT_REPO_URI="https://github.com/gvvaughan/specl" LICENSE="GPL" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] dev-lua/luamacro dev-lua/lyaml " DEPEND="${RDEPEND}" -DOCS=( "README.md" "NEWS" ) +READMES=( README.md NEWS ) -src_prepare() { +all_lua_prepare() { if [[ -n ${EVCS_OFFLINE} ]]; then die "Unfortunately, upstream uses buildsystem which depends on external submodules, so you won't be able to build package in offline mode. Sorry." fi - local lua=lua; - use luajit && lua=luajit; - export LUA="${lua}" - ./bootstrap --skip-rock-checks + lua_default } -src_configure() { +each_lua_configure() { myeconfargs=( - "--datadir=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA})" \ - "--libdir=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${LUA})" \ - "LUA_INCLUDE=-I$($(tc-getPKG_CONFIG) --variable includedir ${LUA})" + "--datadir=$(lua_get_pkgvar INSTALL_LMOD)" + "--libdir=$(lua_get_pkgvar INSTALL_CMOD)" + "LUA_INCLUDE=-I$(lua_get_pkgvar includedir)" ) - base_src_configure "${myeconfargs[@]}" + lua_default } -src_compile() { - cd "${S}"; +each_lua_compile() { ./config.status --file=lib/specl/version.lua } -src_install() { +each_lua_install() { rm lib/specl/version.lua.in - insinto $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${LUA}) - doins -r lib/specl + dolua lib/specl } diff --git a/dev-lua/squish/squish-9999.ebuild b/dev-lua/squish/squish-9999.ebuild index a806b34..241c427 100644 --- a/dev-lua/squish/squish-9999.ebuild +++ b/dev-lua/squish/squish-9999.ebuild @@ -4,8 +4,7 @@ EAPI="5" -VCS="mercurial" -inherit eutils lua +inherit eutils mercurial DESCRIPTION="XMPP client library written in Lua." HOMEPAGE="http://code.matthewwild.co.uk/" @@ -14,21 +13,17 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/${PN}/" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" -READMES=( README ) +RDEPEND="virtual/lua" +DEPEND="${RDEPEND}" -all_lua_prepare() { - use luajit && sed -r \ - -e '1s:(env lua):\1jit:' \ - -i squish.lua make_squishy +src_compile() { + default } -all_lua_compile() { - emake -} - -all_lua_install() { +src_install() { dobin squish dobin make_squishy + dodoc README } diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest deleted file mode 100644 index 2684970..0000000 --- a/dev-lua/toluapp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tolua++-1.0.93.tar.bz2 163956 SHA256 90df1eeb8354941ca65663dcf28658b67d3aa41daa71133bdd20c35abb1bcaba SHA512 d1ae56b2dd38437e0aef81d5230d1a954b8f914133cfa199a18193d05ecfd188ec2bbeec76e63846ef673dc89c12e47bfd9727c227b71833d622cc441c071013 WHIRLPOOL 4d28cb4135c5d1cf33ecd3fb15a63bed2546690604b5e5312f7f70c69625ef2d2c6d7353c9f5d97d76bc827102d694132eff89eb3685c315115094aa2bb0767b diff --git a/dev-lua/toluapp/metadata.xml b/dev-lua/toluapp/metadata.xml deleted file mode 100644 index 1ab8f7c..0000000 --- a/dev-lua/toluapp/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>rafaelmartins@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/dev-lua/toluapp/toluapp-1.0.93.ebuild b/dev-lua/toluapp/toluapp-1.0.93.ebuild deleted file mode 100644 index 386c38c..0000000 --- a/dev-lua/toluapp/toluapp-1.0.93.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ - -EAPI="5" - -inherit toolchain-funcs - -MY_P=${P/pp/++} - -DESCRIPTION="A tool to integrate C/C++ code with Lua." -HOMEPAGE="http://www.codenix.com/~tolua/" -SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="luajit" - -RDEPEND=" - virtual/lua[luajit=] -" -DEPEND=" - ${RDEPEND} - dev-util/scons -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local lua=lua; - use luajit && lua=$($(tc-getPKG_CONFIG) --variable libname luajit); - echo "LIBS = ['${lua}', 'dl', 'm']" > ${S}/custom.py - sed -r \ - -e 's|(if rawtype.*arg.*)|\tlocal arg = {n=select('#', ...), ...};\n\1|' \ - -i src/bin/lua/compat.lua -} - -src_compile() { - scons \ - CC="$(tc-getCC)" \ - CCFLAGS="${CFLAGS} -ansi -Wall" \ - CXX="$(tc-getCXX)" \ - LINK="$(tc-getCC)" \ - LINKFLAGS="${LDFLAGS}" \ - shared=1 || die "scons failed" -} - -src_install() { - dobin bin/tolua++ || die "dobin failed" -# dobin bin/tolua++_bootstrap || die "dobin failed" -# dolib.a lib/libtolua++_static.a || die "dolib.a failed" - dolib.so lib/libtolua++.so || die "dolib.so failed" - insinto /usr/include - doins include/tolua++.h || die "doins failed" - dodoc README - dohtml doc/* -} diff --git a/dev-lua/verse/verse-9999.ebuild b/dev-lua/verse/verse-9999.ebuild index f0cadc6..2c31f3b 100644 --- a/dev-lua/verse/verse-9999.ebuild +++ b/dev-lua/verse/verse-9999.ebuild @@ -4,7 +4,9 @@ EAPI="5" -inherit mercurial eutils +VCS="mercurial" +LUA_COMPAT="lua51 luajit2" +inherit lua DESCRIPTION="XMPP client library written in Lua." HOMEPAGE="http://code.matthewwild.co.uk/" @@ -13,30 +15,25 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/${PN}/" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="doc luajit" +IUSE="+examples" RDEPEND=" dev-lua/squish dev-lua/luasocket dev-lua/luaexpat dev-lua/luafilesystem - virtual/lua[bit,luajit=] + virtual/lua[bit] " DEPEND=" ${RDEPEND} - virtual/pkgconfig " -src_compile() { +EXAMPLES=( doc/. ) + +each_lua_compile() { squish --use-http } -src_install() { - local lua="lua"; - use luajit && lua="luajit" - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins verse.lua || die - use doc && { - dodoc doc/* || ewarn "No documentation found! Please report it to XMPP-conference prosody@conference.prosody.org" - } +each_lua_install() { + dolua verse.lua } diff --git a/dev-lua/wsapi/wsapi-9999.ebuild b/dev-lua/wsapi/wsapi-9999.ebuild index 9ce7d83..e7fe1f5 100644 --- a/dev-lua/wsapi/wsapi-9999.ebuild +++ b/dev-lua/wsapi/wsapi-9999.ebuild @@ -4,7 +4,9 @@ EAPI="5" -inherit multilib eutils git-r3 toolchain-funcs +VCS="git-r3" +#IS_MULTILIB=true +inherit lua DESCRIPTION="Lua WSAPI Library" HOMEPAGE="https://github.com/keplerproject/wsapi" @@ -15,10 +17,9 @@ EGIT_REPO_URI="https://github.com/keplerproject/wsapi.git" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="luajit doc uwsgi +fcgi" +IUSE="doc +examples uwsgi +fcgi" #TODO: xavante" RDEPEND=" - virtual/lua[luajit=] fcgi? ( dev-libs/fcgi virtual/httpd-fastcgi @@ -32,37 +33,29 @@ RDEPEND=" #TODO: xavante? ( dev-lua/xavante )" DEPEND="${RDEPEND}" -src_prepare() { - local lua=lua - use luajit && lua=luajit +DOCS=( doc/us/{index,libraries,license,manual}.md ) +HTML_DOCS=( doc/us/{index,libraries,license,manual}.html doc/us/doc.css doc/us/${PN}.png ) +EAMPLES=( samples/. ) + +all_lua_prepare() { sed -r \ -e "s/
//g" \ - -e "1s%#!#.*lua$%#!/usr/bin/env ${lua}%g" \ -i src/launcher/wsapi{,.cgi,.fcgi} - echo " - LIB_OPTION=-shared -fPIC - BIN_DIR=/usr/bin - LUA_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua}) - LUA_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua}) - INC=-I$($(tc-getPKG_CONFIG) --variable includedir ${lua}) - CC=$(tc-getCC) -fPIC -DPIC - LDFLAGS=${LDFLAGS} - CFLAGS=${CFLAGS} - DESTDIR=${ED} - " > "${S}/config" -} - -src_configure() { - : + lua_default + rm configure } -src_install() { - docompress -x /usr/share/doc - default - use doc && ( - insinto /usr/share/doc/${PF}/examples - doins -r samples/* - insinto /usr/share/doc/${PF} - doins -r doc/* - ) +#each_lua_configure() { +# myeconfargs=( +# LUA_DIR=$(lua_get_pkgvar INSTALL_LMOD) +# LUA_LIBDIR=$(lua_get_pkgvar INSTALL_CMOD) +# INC=-I$(lua_get_pkgvar includedir) +# ) +# lua_default +#} + +each_lua_install() { + dolua src/*.lua src/${PN} + newbin src/launcher/${PN}.cgi ${PN}-${TARGET}.cgi + use fcgi && newbin src/launcher/${PN}.fcgi ${PN}-${TARGET}.fcgi } diff --git a/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild b/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild index de31051..4899f0a 100644 --- a/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild +++ b/dev-lua/yubikey-lua/yubikey-lua-9999.ebuild @@ -4,7 +4,8 @@ EAPI="5" -inherit toolchain-funcs mercurial +VCS="mercurial" +inherit lua DESCRIPTION="Lua Asynchronous HTTP Library." HOMEPAGE="http://code.matthewwild.co.uk/" @@ -13,21 +14,17 @@ EHG_REPO_URI="http://code.matthewwild.co.uk/${PN}/" LICENSE="LGPL" SLOT="0" KEYWORDS="" -IUSE="luajit" +IUSE="" RDEPEND=" - virtual/lua[luajit=] dev-lua/squish " DEPEND="${RDEPEND}" -src_compile() { +each_lua_compile() { squish } -src_install() { - local lua=lua; - use luajit && lua=luajit; - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins yubikey.lua || die +each_lua_install() { + dolua yubikey.lua } diff --git a/eclass/lua.eclass b/eclass/lua.eclass index 9328254..0a03b11 100644 --- a/eclass/lua.eclass +++ b/eclass/lua.eclass @@ -662,9 +662,9 @@ _lua_src_install_examples() { debug-print-function $FUNCNAME "$@" local x - local MY_S="${WORKDIR}/all/${P}" +# local MY_S="${LUA_S:-${WORKDIR}/all/${P}}" - pushd "${MY_S}" >/dev/null +# pushd "${MY_S}" >/dev/null if [[ "$(declare -p EXAMPLES 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${EXAMPLES[@]}"; do @@ -675,15 +675,20 @@ _lua_src_install_examples() { done fi - popd >/dev/null +# popd >/dev/null } _lua_src_install_docs() { debug-print-function $FUNCNAME "$@" local x - local MY_S="${WORKDIR}/all/${P}" - pushd "${MY_S}" >/dev/null +# local MY_S; +# if [[ -z "${LUA_S}" ]]; then +# MY_S="${WORKDIR}/all/${P}" +# else +# MY_S="${WORKDIR}/all/${LUA_S}" +# fi +# pushd "${MY_S}" >/dev/null if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${DOCS[@]}"; do @@ -700,7 +705,7 @@ _lua_src_install_docs() { done fi - popd >/dev/null +# popd >/dev/null } #### END #### @@ -775,7 +780,7 @@ _lua_install_cmod() { } _lua_jit_insopts() { - [[ "${LUA}" =~ "luajit" ]] || return 0 + [[ "${LUA}" =~ "luajit" ]] || die "Calling dolua_jit for non-jit targets isn't supported" local insdir=$(${LUA} -e 'print(package.path:match(";(/[^;]+luajit[^;]+)/%?.lua;"))') insinto ${insdir} insopts -m 0644 @@ -783,7 +788,7 @@ _lua_jit_insopts() { dolua_jit() { _lua_jit_insopts - doins "$@" + doins -r "$@" } newlua_jit() { diff --git a/profiles/package.mask b/profiles/package.mask new file mode 100644 index 0000000..67acaf0 --- /dev/null +++ b/profiles/package.mask @@ -0,0 +1,2 @@ +# Incompatible with current mongo drivers +dev-lua/luamongo diff --git a/virtual/lua/lua-5.ebuild b/virtual/lua/lua-5.ebuild index a1db06a..8ab732a 100644 --- a/virtual/lua/lua-5.ebuild +++ b/virtual/lua/lua-5.ebuild @@ -13,7 +13,7 @@ SRC_URI="" LICENSE="" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="luajit bit" +IUSE="luajit bit bit32" RDEPEND=" !luajit? ( @@ -25,12 +25,17 @@ RDEPEND=" ) bit? ( || ( - dev-lang/lua:5.2[deprecated,${MULTILIB_USEDEP}] - dev-lang/lua:5.3[deprecated,${MULTILIB_USEDEP}] dev-lang/luajit:2[${MULTILIB_USEDEP}] dev-lua/LuaBitOp[${MULTILIB_USEDEP}] ) ) + bit32? ( + || ( + dev-lang/lua:5.2[deprecated,${MULTILIB_USEDEP}] + dev-lang/lua:5.3[deprecated,${MULTILIB_USEDEP}] + dev-lua/bit32[${MULTILIB_USEDEP}] + ) + ) luajit? ( dev-lang/luajit:2[${MULTILIB_USEDEP}] app-eselect/eselect-luajit |