diff options
Diffstat (limited to 'dev-lua')
228 files changed, 5457 insertions, 3457 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild deleted file mode 100644 index 78892a01833e..000000000000 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit eutils multilib - -DESCRIPTION="Bit Operations Library for the Lua Programming Language" -HOMEPAGE="http://bitop.luajit.org" -SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="=dev-lang/lua-5.1*" -RDEPEND="${DEPEND}" - -src_prepare() -{ - sed -i \ - -e '/^CFLAGS.*=/s/=/ +=/' \ - -e '/^CFLAGS/s/-O2 -fomit-frame-pointer //' \ - Makefile || die "sed failed" - epatch "${FILESDIR}/${PN}-ldflags.patch" -} - -src_compile() -{ - emake CC="$(tc-getCC)" -} - -src_test() -{ - make test -} - -src_install() -{ - exeinto /usr/$(get_libdir)/lua/5.1 -doexe bit.so - dohtml -r doc/* -} diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild index ae60dda591b6..0eb8c54f9112 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -inherit toolchain-funcs multilib-minimal +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit flag-o-matic lua toolchain-funcs DESCRIPTION="Bit Operations Library for the Lua Programming Language" HOMEPAGE="http://bitop.luajit.org" @@ -10,35 +13,88 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +HTML_DOCS=( "doc/." ) + +PATCHES=( "${FILESDIR}/${P}-support-lua5-3+.patch" ) src_prepare() { - multilib_copy_sources + default + + lua_copy_sources } -multilib_src_compile() -{ - emake CC="$(tc-getCC)" INCLUDES= CCOPT= +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CCOPT=" + "INCLUDES=$(lua_get_CFLAGS)" + ) + + emake "${myemakeargs[@]}" all + + popd } -multilib_src_test() { - # tests use native lua interpreter - multilib_is_native_abi && default +src_compile() { + if [[ $CHOST == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi + lua_foreach_impl lua_src_compile } -multilib_src_install() -{ - local instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" - exeinto "${instdir#${EPREFIX}}" +lua_src_test() { + pushd "${BUILD_DIR}" || die + + local mytests=( + "bitbench.lua" + "bittest.lua" + "md5test.lua" + "nsievebits.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="./?.so" ${ELUA} ${mytest} + done + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + mycmoddir="$(lua_get_cmod_dir)" + exeinto "${mycmoddir#$EPREFIX}" doexe bit.so + + popd + + if [[ ${CHOST} == *-darwin* ]] ; then + local luav=$(lua_get_version) + # we only want the major version (e.g. 5.1) + local luamv=${luav:0:3} + local file="lua/${luamv}/bit.so" + install_name_tool \ + -id "${EPREFIX}/usr/$(get_libdir)/${file}" \ + "${ED}/usr/$(get_libdir)/${file}" \ + || die "Failed to adjust install_name" + fi } -multilib_src_install_all() { - dodoc README - dohtml -r doc/. +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs } diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild deleted file mode 100644 index 66d3e88a1af1..000000000000 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit toolchain-funcs - -DESCRIPTION="Bit Operations Library for the Lua Programming Language" -HOMEPAGE="http://bitop.luajit.org" -SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ~mips x86" -IUSE="" - -RDEPEND="dev-lang/lua" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_compile() -{ - emake CC="$(tc-getCC)" INCLUDES= CCOPT= -} - -src_install() -{ - exeinto "$(pkg-config --variable INSTALL_CMOD lua)" - doexe bit.so - - dodoc README - dohtml -r doc/* -} diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest index 3a2561aa1e73..257d385c72f7 100644 --- a/dev-lua/LuaBitOp/Manifest +++ b/dev-lua/LuaBitOp/Manifest @@ -1,2 +1 @@ -DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch b/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch new file mode 100644 index 000000000000..23c0d23a2150 --- /dev/null +++ b/dev-lua/LuaBitOp/files/LuaBitOp-1.0.2-support-lua5-3+.patch @@ -0,0 +1,78 @@ +This patch is a result of diff between upstream and bundled library in rspamd + +https://github.com/rspamd/rspamd/blob/30298909543453ebe969878f1406ee76ad148494/contrib/lua-bit/bit.c + +diff --git a/bit.c b/bit.c +index 690df7d3c..01326c99a 100644 +--- a/bit.c ++++ b/bit.c +@@ -46,7 +46,7 @@ typedef uint32_t UBits; + + typedef union { + lua_Number n; +-#ifdef LUA_NUMBER_DOUBLE ++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE) + uint64_t b; + #else + UBits b; +@@ -63,24 +63,25 @@ static UBits barg(lua_State *L, int idx) + #else + bn.n = luaL_checknumber(L, idx); + #endif +-#if defined(LUA_NUMBER_DOUBLE) ++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE) + bn.n += 6755399441055744.0; /* 2^52+2^51 */ + #ifdef SWAPPED_DOUBLE + b = (UBits)(bn.b >> 32); + #else + b = (UBits)bn.b; + #endif +-#elif defined(LUA_NUMBER_INT) || defined(LUA_NUMBER_LONG) || \ +- defined(LUA_NUMBER_LONGLONG) || defined(LUA_NUMBER_LONG_LONG) || \ +- defined(LUA_NUMBER_LLONG) ++#elif defined(LUA_NUMBER_INT) || defined(LUA_INT_INT) || \ ++ defined(LUA_NUMBER_LONG) || defined(LUA_INT_LONG) || \ ++ defined(LUA_NUMBER_LONGLONG) || defined(LUA_INT_LONGLONG) || \ ++ defined(LUA_NUMBER_LONG_LONG) || defined(LUA_NUMBER_LLONG) + if (sizeof(UBits) == sizeof(lua_Number)) + b = bn.b; + else + b = (UBits)(SBits)bn.n; +-#elif defined(LUA_NUMBER_FLOAT) ++#elif defined(LUA_NUMBER_FLOAT) || defined(LUA_FLOAT_FLOAT) + #error "A 'float' lua_Number type is incompatible with this library" + #else +-#error "Unknown number type, check LUA_NUMBER_* in luaconf.h" ++#error "Unknown number type, check LUA_NUMBER_*, LUA_FLOAT_*, LUA_INT_* in luaconf.h" + #endif + #if LUA_VERSION_NUM < 502 + if (b == 0 && !lua_isnumber(L, idx)) { +@@ -91,7 +92,11 @@ static UBits barg(lua_State *L, int idx) + } + + /* Return bit type. */ ++#if LUA_VERSION_NUM < 503 + #define BRET(b) lua_pushnumber(L, (lua_Number)(SBits)(b)); return 1; ++#else ++#define BRET(b) lua_pushinteger(L, (lua_Integer)(SBits)(b)); return 1; ++#endif + + static int bit_tobit(lua_State *L) { BRET(barg(L, 1)) } + static int bit_bnot(lua_State *L) { BRET(~barg(L, 1)) } +@@ -163,11 +168,15 @@ static const struct luaL_Reg bit_funcs[] = { + LUALIB_API int luaopen_bit(lua_State *L) + { + UBits b; ++#if LUA_VERSION_NUM < 503 + lua_pushnumber(L, (lua_Number)1437217655L); ++#else ++ lua_pushinteger(L, (lua_Integer)1437217655L); ++#endif + b = barg(L, -1); + if (b != (UBits)1437217655L || BAD_SAR) { /* Perform a simple self-test. */ + const char *msg = "compiled with incompatible luaconf.h"; +-#ifdef LUA_NUMBER_DOUBLE ++#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_FLOAT_DOUBLE) + #ifdef _WIN32 + if (b == (UBits)1610612736L) + msg = "use D3DCREATE_FPU_PRESERVE with DirectX"; diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch deleted file mode 100644 index 2a690cdb5866..000000000000 --- a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: LuaBitOp-1.0.1/Makefile -=================================================================== ---- LuaBitOp-1.0.1.orig/Makefile -+++ LuaBitOp-1.0.1/Makefile -@@ -14,7 +14,7 @@ LUA= lua - - CC= gcc - SOCFLAGS= -fPIC --SOCC= $(CC) -shared $(SOCFLAGS) -+SOCC= $(CC) -shared $(SOCFLAGS) $(LDFLAGS) - CFLAGS += -Wall $(SOCFLAGS) $(DEFINES) $(INCLUDES) - RM= rm -f - INSTALL= install -p diff --git a/dev-lua/LuaBitOp/metadata.xml b/dev-lua/LuaBitOp/metadata.xml index e4f0a6dd481d..6fbb36c0c5f2 100644 --- a/dev-lua/LuaBitOp/metadata.xml +++ b/dev-lua/LuaBitOp/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - This is a library for the Lua programming language which performs bit - operations. - </longdescription> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> </pkgmetadata> diff --git a/dev-lua/busted-htest/Manifest b/dev-lua/busted-htest/Manifest new file mode 100644 index 000000000000..2c720b589812 --- /dev/null +++ b/dev-lua/busted-htest/Manifest @@ -0,0 +1 @@ +DIST busted-htest-1.0.0.tar.gz 4347 BLAKE2B f1d30a305cb9691588b18f67842b536d3de9430d22c51ec292202e5aca5784447cd525ae8b1f1da42a3d3792344419efbfe1d03fe29823b445a7c1ead0fe577f SHA512 001f494949c04445004e8b06fde62727cab85a320673748d18714b82d7b2b9aea43316f6119e669c569f31578b787f4e5ca5d19da3f33fe28df572aaa41c75bd diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r1.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r1.ebuild new file mode 100644 index 000000000000..69cd12b55e7b --- /dev/null +++ b/dev-lua/busted-htest/busted-htest-1.0.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="Pretty output handler for Busted" +HOMEPAGE="https://github.com/hishamhm/busted-htest" +SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + dev-lua/busted[${LUA_USEDEP}] + ${LUA_DEPS} +" + +BDEPEND="virtual/pkgconfig" + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins src/busted/outputHandlers/htest.lua + + einstalldocs +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/busted-htest/metadata.xml b/dev-lua/busted-htest/metadata.xml new file mode 100644 index 000000000000..09c0d9b0b261 --- /dev/null +++ b/dev-lua/busted-htest/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">hishamhm/busted-htest</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest index b3553ff7375f..e7df3655ee0e 100644 --- a/dev-lua/busted/Manifest +++ b/dev-lua/busted/Manifest @@ -1,2 +1 @@ -DIST busted-2.0_rc11_p0.tar.gz 48368 BLAKE2B 3e4534795a4d6bd816b9879d447b82e144f738f3601856e5c9fc5419a6b8f3cb57a78a9ce6ad90990c1abe9fe0974b809d10a942b5f4930b4120f98d34de0dbe SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8 -DIST busted-2.0_rc12_p1.tar.gz 52404 BLAKE2B 51f12aea26d6b0909fdbf8953b316814ff8cd76d39358a26eb785ac7541acddbfde1b19d2e41c9e966a604f8f00b9517181f87264a76a4ac7f9f8d6008c87692 SHA512 0cb1f6a66110514dc3675b2e667cca676e6672e895b57ffba438e89a1e0a7f4f8f941cab54ead905758987be15e9885e1eeb82baabc9d18bf29ea56b832b89b1 +DIST busted-2.2.0.tar.gz 65027 BLAKE2B c04d3cc3782b9ac5af42b0cc2619b0265230f0313791d6f06d73998b98440ae0aa3618efdeca055022e4685ee53320513cb39c7dbbd66a546f203525440eac87 SHA512 86789ddb93e1b7958a0a6f447ce17532a60d0af27df21159100d3ee8a98496ae30d5a22939e91cbbfac805df118be1ed571360f90a3b31b81d654e493e77b0b7 diff --git a/dev-lua/busted/busted-2.0_rc11_p0.ebuild b/dev-lua/busted/busted-2.0_rc11_p0.ebuild deleted file mode 100644 index 7ad217bf0d5b..000000000000 --- a/dev-lua/busted/busted-2.0_rc11_p0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -# The below is the upstream version number. The -x suffix should be kept -# in sync with the _px suffix in the ebuild version. -MY_PV="2.0.rc11-0" - -DESCRIPTION="Elegant Lua unit testing" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - ~dev-lua/lua_cliargs-2.5_p5 - >=dev-lua/luafilesystem-1.5.0 - >=dev-lua/dkjson-2.1.0 - >=dev-lua/say-1.3 - >=dev-lua/luassert-1.7.8 - >=dev-lua/lua-term-0.1_p1 - >=dev-lua/penlight-1.3.2 - >=dev-lua/mediator_lua-1.1.1_p0 - >=dev-lua/luasocket-2.0.1 -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { -dobin bin/busted -insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN} -doins -r busted/* -dodoc *.md -} diff --git a/dev-lua/busted/busted-2.0_rc12_p1.ebuild b/dev-lua/busted/busted-2.0_rc12_p1.ebuild deleted file mode 100644 index baef07948bfe..000000000000 --- a/dev-lua/busted/busted-2.0_rc12_p1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -# The below is the upstream version number. The -x suffix should be kept -# in sync with the _px suffix in the ebuild version. -MY_PV="2.0.rc12-1" - -DESCRIPTION="Elegant Lua unit testing" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - >=dev-lua/lua_cliargs-3.0 - >=dev-lua/luafilesystem-1.5.0 - >=dev-lua/luasystem-0.2.0 - >=dev-lua/dkjson-2.1.0 - >=dev-lua/say-1.3 - >=dev-lua/luassert-1.7.8 - >=dev-lua/lua-term-0.1_p1 - >=dev-lua/penlight-1.3.2 - >=dev-lua/mediator_lua-1.1.1_p0 -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { - dobin bin/busted - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN} - doins -r busted/* - dodoc *.md -} diff --git a/dev-lua/busted/busted-2.2.0.ebuild b/dev-lua/busted/busted-2.2.0.ebuild new file mode 100644 index 000000000000..11ab5afb1292 --- /dev/null +++ b/dev-lua/busted/busted-2.2.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="Elegant Lua unit testing" +HOMEPAGE="https://lunarmodules.github.io/busted/" +SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND=" + dev-lua/lua_cliargs[${LUA_USEDEP}] + dev-lua/luafilesystem[${LUA_USEDEP}] + dev-lua/luasystem[${LUA_USEDEP}] + dev-lua/dkjson[${LUA_USEDEP}] + dev-lua/say[${LUA_USEDEP}] + dev-lua/luassert[${LUA_USEDEP}] + dev-lua/lua-term[${LUA_USEDEP}] + dev-lua/penlight[${LUA_USEDEP}] + dev-lua/mediator_lua[${LUA_USEDEP}] + ${LUA_DEPS} +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted + ${RDEPEND} + ) +" + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins -r busted +} + +src_install() { + dobin bin/busted + + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/busted/metadata.xml b/dev-lua/busted/metadata.xml index e8e32b1eb332..b540da052ca9 100644 --- a/dev-lua/busted/metadata.xml +++ b/dev-lua/busted/metadata.xml @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription> An elegant, extensible, testing framework. Ships with a large amount of useful asserts, plus the ability to write your own. Output @@ -14,6 +19,6 @@ and unit, integration, and functional tests. </longdescription> <upstream> - <remote-id type="github">Olivine-Labs/busted</remote-id> + <remote-id type="github">lunarmodules/busted</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest index ef726ea7303f..fa97a6196c9d 100644 --- a/dev-lua/dkjson/Manifest +++ b/dev-lua/dkjson/Manifest @@ -1 +1 @@ -DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af +DIST dkjson-2.7.tar.gz 17292 BLAKE2B e3ac57edb6333dee8eeeba9d844ddc9f3fb3d35c6bd61a896ffff928e2d5c4d17be8a0c01c36d83fb0e4694ad38f3233a92f093cf85dc4b7375a72a224f7e0a8 SHA512 8e0cfb27fb2721c57b4fa0e104edc5e3b1f2b375e6ddde486be44f2bd574c19fccbc7c6f629f3d04b16cf652effd0894cb38edf405395488d33577420692246e diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild deleted file mode 100644 index 84633d383c15..000000000000 --- a/dev-lua/dkjson/dkjson-2.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="David Kolf's JSON module for Lua" -HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/" -SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:= - !>=dev-lang/lua-5.4" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" -doins dkjson.lua -dodoc readme.txt -} diff --git a/dev-lua/dkjson/dkjson-2.7.ebuild b/dev-lua/dkjson/dkjson-2.7.ebuild new file mode 100644 index 000000000000..75f1f2875c76 --- /dev/null +++ b/dev-lua/dkjson/dkjson-2.7.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="David Kolf's JSON module for Lua" +HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/" +SRC_URI="http://dkolf.de/dkjson-lua/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +DOCS=( "readme.txt" ) + +lua_src_test() { + ${ELUA} jsontest.lua || die + ${ELUA} speedtest.lua ${PN} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins dkjson.lua +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/dkjson/metadata.xml b/dev-lua/dkjson/metadata.xml index dda2ed524394..baf4063a1348 100644 --- a/dev-lua/dkjson/metadata.xml +++ b/dev-lua/dkjson/metadata.xml @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription> dkjson is a module for encoding and decoding JSON data. It supports UTF-8. diff --git a/dev-lua/inifile/Manifest b/dev-lua/inifile/Manifest new file mode 100644 index 000000000000..206152e9682e --- /dev/null +++ b/dev-lua/inifile/Manifest @@ -0,0 +1 @@ +DIST inifile-1.1.tar.gz 4448 BLAKE2B 53536d4f40f4906b33b00692090be3da7701ddcea5facf8a34cd3c61a77092280315188faa133265f1d425a6d0997682871c4df6b133de55f94114c1f4e3a9a5 SHA512 039126031272301ae825bdfa5c4db94cba96a3cee6a6e3326941af471e177bdd2a0e51176ff992932203ec99900d90abc36b6380c9fecc482af517231d504f61 diff --git a/dev-lua/inifile/inifile-1.1.ebuild b/dev-lua/inifile/inifile-1.1.ebuild new file mode 100644 index 000000000000..8e3abb13bd5f --- /dev/null +++ b/dev-lua/inifile/inifile-1.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="A simple and complete ini parser for Lua" +HOMEPAGE="https://github.com/bartbes/inifile/" +SRC_URI="https://github.com/bartbes/inifile/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +BDEPEND="virtual/pkgconfig" + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins inifile.lua +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/inifile/metadata.xml b/dev-lua/inifile/metadata.xml new file mode 100644 index 000000000000..1dd257dc1e2b --- /dev/null +++ b/dev-lua/inifile/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">bartbes/inifile</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest index 017386fd955f..f6c85e118470 100644 --- a/dev-lua/lanes/Manifest +++ b/dev-lua/lanes/Manifest @@ -1 +1,2 @@ -DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b +DIST lanes-3.16.3.tar.gz 446289 BLAKE2B 018f470209b534bb84f69f8a38c7decd8011a13926bf7c82a4fc4b0d3f2892562a69c3116dd6fce5d37d9d2b5057ed661cc22bdbfcfac4e267a32dd5f64a47dc SHA512 a3037c0df27e8172ce9ff896079eb4a5ee3a35dc507a8b809c151de21e7600ffd0fccc12113fb64dc3c709e1eff99da350576aef41ac20493ea933fb7dc4c381 +DIST lanes-3.17.0.tar.gz 449193 BLAKE2B 110c05bdf46b9e5faf7e4ebf52992799fc2d1a993411a9488c75fc8134a267650348152299e91f94d1af8378a0e8a06c5485a364aad3cf246d7339006c89a924 SHA512 b9866cf1af54c758c840d2f6df3e14e6231f952b651d1196262a4b14d1361dd55697cba467998e90a69d876bcde5beffd25f3f8b53c387534b292650c25c357d 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 deleted file mode 100644 index 52549704248e..000000000000 --- a/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/lanes-3.13.0-makefile.patch b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch new file mode 100644 index 000000000000..18d26d95e345 --- /dev/null +++ b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch @@ -0,0 +1,93 @@ +--- a/Makefile ++++ b/Makefile +@@ -33,7 +33,7 @@ + + # Autodetect LUA + # +-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT)) ++LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT)) + + _TARGET_SO=$(_TARGET_DIR)/core.$(_SO) + +--- a/src/Makefile ++++ b/src/Makefile +@@ -15,7 +15,7 @@ + # + LIBFLAG=-shared + +-OPT_FLAGS=-O2 ++OPT_FLAGS ?= + # -O0 -g + + _SO=so +@@ -38,50 +38,8 @@ + LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc + LIBFLAG=-shared -Wl,-Map,lanes.map + else +- # Autodetect LUA_FLAGS and/or LUA_LIBS +- # +- ifneq "$(shell which pkg-config)" "" +- ifeq "$(shell pkg-config --exists luajit && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags luajit) +- LUA_LIBS:=$(shell pkg-config --libs luajit) +- # +- # Debian: -I/usr/include/luajit-2.0 +- # -lluajit-5.1 +- else +- ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags lua5.1) +- LUA_LIBS:=$(shell pkg-config --libs lua5.1) +- # +- # Ubuntu: -I/usr/include/lua5.1 +- # -llua5.1 +- else +- ifeq "$(shell pkg-config --exists lua && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags lua) +- LUA_LIBS:=$(shell pkg-config --libs lua) +- # +- # OS X fink with pkg-config: +- # -I/sw/include +- # -L/sw/lib -llua -lm +- else +- $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!) +- LUA_FLAGS:= +- LUA_LIBS:=-llua +- endif +- endif +- endif +- else +- # No 'pkg-config'; try defaults +- # +- ifeq "$(shell uname -s)" "Darwin" +- $(warning *** Assuming 'fink' at default path) +- LUA_FLAGS:=-I/sw/include +- LUA_LIBS:=-L/sw/lib -llua +- else +- $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config') +- LUA_FLAGS:= +- LUA_LIBS:=-llua +- endif +- endif ++ LUA_FLAGS ?= $(shell ${PKG_CONFIG} --cflags lua) ++ LUA_LIBS ?= $(shell ${PKG_CONFIG} --libs lua) + endif + + ifeq "$(shell uname -s)" "Darwin" +@@ -92,7 +50,7 @@ + LIBFLAG = -bundle -undefined dynamic_lookup + endif + +- CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS) ++ CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS) + LIBS=$(LUA_LIBS) + endif + +@@ -125,7 +83,7 @@ + # + $(MODULE_DIR)/core.$(_SO): $(OBJ) + mkdir -p $(MODULE_DIR) +- $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ ++ $(CC) $(LDFLAGS) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ + + clean: + -rm -rf $(MODULE)/core.$(_SO) *.o *.map diff --git a/dev-lua/lanes/lanes-3.10.0.ebuild b/dev-lua/lanes/lanes-3.10.0.ebuild deleted file mode 100644 index 0db398773e8e..000000000000 --- a/dev-lua/lanes/lanes-3.10.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -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="" - -COMMON_DEPEND=">=dev-lang/lua-5.1" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - tc-export CC - epatch "${FILESDIR}"/${P}-fix-makefile.patch - sed -i -e "s#/lib#/$(get_libdir)#" Makefile || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - dodoc ABOUT BUGS CHANGES README TODO -dohtml -r docs/* -} diff --git a/dev-lua/lanes/lanes-3.16.3.ebuild b/dev-lua/lanes/lanes-3.16.3.ebuild new file mode 100644 index 000000000000..c0d7990b7ae3 --- /dev/null +++ b/dev-lua/lanes/lanes-3.16.3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Tests are currently somehow problematic. +# https://github.com/LuaLanes/lanes/issues/197 +# https://github.com/LuaLanes/lanes/issues/198 +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +PATCHES=( + "${FILESDIR}/${PN}-3.13.0-makefile.patch" +) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA=${ELUA}" + "LUA_FLAGS=$(lua_get_CFLAGS)" + "LUA_LIBS=" + "OPT_FLAGS=${CFLAGS}" + ) + + tc-export PKG_CONFIG + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + emake LUA="${ELUA}" test + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lanes/lanes-3.17.0.ebuild b/dev-lua/lanes/lanes-3.17.0.ebuild new file mode 100644 index 000000000000..8baab79dd024 --- /dev/null +++ b/dev-lua/lanes/lanes-3.17.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Tests are currently somehow problematic. +# https://github.com/LuaLanes/lanes/issues/197 +# https://github.com/LuaLanes/lanes/issues/198 +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +PATCHES=( + "${FILESDIR}/${PN}-3.13.0-makefile.patch" +) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA=${ELUA}" + "LUA_FLAGS=$(lua_get_CFLAGS)" + "LUA_LIBS=" + "OPT_FLAGS=${CFLAGS}" + ) + + tc-export PKG_CONFIG + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + emake LUA="${ELUA}" test + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml index c1baef2d9b21..061036804f35 100644 --- a/dev-lua/lanes/metadata.xml +++ b/dev-lua/lanes/metadata.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> <remote-id type="github">LuaLanes/lanes</remote-id> </upstream> diff --git a/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch new file mode 100644 index 000000000000..08776c560a09 --- /dev/null +++ b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch @@ -0,0 +1,21 @@ +Do not try to auto-guess Lua directories from the path to the interpreter, +it does not work with the wrapper set up by lua-single.eclass. Use the +values of LUA, LUA_BINDIR and LUA_SHAREDIR provided by the ebuild instead. + +--- a/makefile ++++ b/makefile +@@ -1,13 +1,9 @@ +-LUA= $(shell echo `which lua`) +-LUA_BINDIR= $(shell echo `dirname $(LUA)`) +-LUA_PREFIX= $(shell echo `dirname $(LUA_BINDIR)`) +-LUA_SHAREDIR=$(LUA_PREFIX)/share/lua/5.1 + + ldoc: + + install: install_parts + mkdir -p $(DESTDIR)$(LUA_BINDIR) +- echo "lua $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc ++ echo "$(LUA) $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc + chmod +x $(DESTDIR)$(LUA_BINDIR)/ldoc + + install_luajit: install_parts diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild new file mode 100644 index 000000000000..ce9c78636578 --- /dev/null +++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 luajit ) + +inherit lua-single + +DESCRIPTION="A LuaDoc-compatible documentation generation system" +HOMEPAGE="https://stevedonovan.github.io/ldoc/" +SRC_URI="https://github.com/lunarmodules/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 ~riscv x86" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="$(lua_gen_cond_dep ' + dev-lua/penlight[${LUA_USEDEP}] +')" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.6-mkdir.patch" + "${FILESDIR}/${PN}-1.4.6-slotted_lua.patch" +) + +S="${WORKDIR}/LDoc-${PV}" +RESTRICT="test" + +src_install() { + emake DESTDIR="${ED}" LUA_BINDIR="${EPREFIX}/usr/bin" LUA_SHAREDIR="$(lua_get_lmod_dir)" install +} diff --git a/dev-lua/ldoc/ldoc-1.4.6.ebuild b/dev-lua/ldoc/ldoc-1.4.6.ebuild deleted file mode 100644 index 3dae07be9ce8..000000000000 --- a/dev-lua/ldoc/ldoc-1.4.6.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A LuaDoc-compatible documentation generation system" -HOMEPAGE="https://stevedonovan.github.io/ldoc/" -SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="" - -RDEPEND="dev-lua/penlight" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-1.4.6-mkdir.patch" ) - -S="${WORKDIR}/LDoc-${PV}" -RESTRICT="test" diff --git a/dev-lua/ldoc/metadata.xml b/dev-lua/ldoc/metadata.xml index dd178f974d1d..c1081af2656f 100644 --- a/dev-lua/ldoc/metadata.xml +++ b/dev-lua/ldoc/metadata.xml @@ -1,11 +1,8 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> - <longdescription lang="en"> - LDoc is a LuaDoc-compatible documentation generation system. - </longdescription> <upstream> - <remote-id type="github">stevedonovan/LDoc</remote-id> + <remote-id type="github">lunarmodules/LDoc</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest index 6b2058d953c3..efb51f2dc859 100644 --- a/dev-lua/lgi/Manifest +++ b/dev-lua/lgi/Manifest @@ -1,3 +1 @@ -DIST lgi-0.6.2.tar.gz 257541 BLAKE2B 61d58b1b03fe01d43384693b21336149b06a04e638a32f46e685e0f6f1e7ad693ec3074af3ffcc789f053a2a085a58b41b81023f3b023625309f0f4ed6ae6cff SHA512 02b75f17f98d7f7240c335384a85cdb0bb1c1b117b4ea8baa065715c4e5ecac946618ef83f92ef476a87db3a17a29a0e21d71f4f79db3bc4e519cf795ae181f5 -DIST lgi-0.7.2.tar.gz 270767 BLAKE2B 491fafccbf4d8c5086b48baad0022a76a1f829e0c9a55acbfbd4eaa283c2713ef3f4863a2abf12d24bae0ccb2284506da66578c2d26ab6bda3f6d891c39a8ff4 SHA512 e661e13d6f539c2c434a6b0db9e622ee4af3c039a6488617954643f0b46a908068a14e6d37ff44437fbe5b4cb62863699107ab533aca121d4b8d584ca83c35fc -DIST lgi-0.9.0.tar.gz 285248 BLAKE2B e5e6fe79899b70f46338827296b921c04c31ac1edc82e5c7a1d443c54c409aea65a766f3666b0ff9fca63a17cb50fe9727d0722007b16a1d4a6c77c48b9f3828 SHA512 1a486a40f504740224b1d277368df65e0a30708c02422390517c2fbf961b5fec264bdbc695d306e2f5fb2aa8ad4539212ef5314b18f45e3b488fd5f492a19f9e +DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335 diff --git a/dev-lua/lgi/files/lgi-0.9.2-lua54.patch b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch new file mode 100644 index 000000000000..b1451a7566d7 --- /dev/null +++ b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch @@ -0,0 +1,29 @@ +From 5cfd42c386d3adae6d211fbb4011179c3c141b04 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter <psychon@znc.in> +Date: Sun, 2 Aug 2020 16:14:27 +0200 +Subject: [PATCH] Fix the build with Lua 5.4 + +Lua 5.4 changed the API to lua_resume(). This commit changes the code to +cope with that. + +Signed-off-by: Uli Schlachter <psychon@znc.in> +--- + lgi/callable.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lgi/callable.c b/lgi/callable.c +index e96d3af..3234b64 100644 +--- a/lgi/callable.c ++++ b/lgi/callable.c +@@ -1355,7 +1355,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg) + } + else + { +-#if LUA_VERSION_NUM >= 502 ++#if LUA_VERSION_NUM >= 504 ++ int nresults; ++ res = lua_resume (L, NULL, npos, &nresults); ++#elif LUA_VERSION_NUM >= 502 + res = lua_resume (L, NULL, npos); + #else + res = lua_resume (L, npos); diff --git a/dev-lua/lgi/lgi-0.6.2-r1.ebuild b/dev-lua/lgi/lgi-0.6.2-r1.ebuild deleted file mode 100644 index 3128ed21037b..000000000000 --- a/dev-lua/lgi/lgi-0.6.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -VIRTUALX_REQUIRED="manual" - -inherit eutils toolchain-funcs flag-o-matic virtualx - -DESCRIPTION="Lua bindings using gobject-introspection" -HOMEPAGE="https://github.com/pavouk/lgi" -SRC_URI="https://github.com/downloads/pavouk/lgi/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="examples test" - -RDEPEND=">=dev-lang/lua-5.1 - dev-libs/gobject-introspection - dev-libs/glib - virtual/libffi" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - x11-libs/cairo[glib] - x11-libs/gtk+[introspection] - ${VIRTUALX_DEPEND} - )" - -src_prepare() { - sed -i \ - -e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \ - -e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \ - "${S}"/lgi/Makefile || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" -} - -src_test() { - Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check -} - -src_install() { - emake DESTDIR="${D}" install - dohtml -r docs/* - dodoc README.md - if use examples; then - dodoc -r samples - fi -} diff --git a/dev-lua/lgi/lgi-0.6.2.ebuild b/dev-lua/lgi/lgi-0.6.2.ebuild deleted file mode 100644 index aa861d1a7abb..000000000000 --- a/dev-lua/lgi/lgi-0.6.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="Lua bindings using gobject-introspection" -HOMEPAGE="https://github.com/pavouk/lgi" -SRC_URI="https://github.com/downloads/pavouk/lgi/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-lang/lua-5.1 - x11-libs/gtk+[introspection]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i \ - -e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \ - -e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \ - "${S}"/lgi/Makefile || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" install - dohtml -r docs/* - dodoc README.md -} diff --git a/dev-lua/lgi/lgi-0.7.2.ebuild b/dev-lua/lgi/lgi-0.7.2.ebuild deleted file mode 100644 index bd19c1f04850..000000000000 --- a/dev-lua/lgi/lgi-0.7.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -VIRTUALX_REQUIRED="manual" - -inherit eutils toolchain-funcs flag-o-matic virtualx - -DESCRIPTION="Lua bindings using gobject-introspection" -HOMEPAGE="https://github.com/pavouk/lgi" -SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="examples test" - -RDEPEND=">=dev-lang/lua-5.1 - dev-libs/gobject-introspection - dev-libs/glib - virtual/libffi" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - x11-libs/cairo[glib] - x11-libs/gtk+[introspection] - ${VIRTUALX_DEPEND} - )" - -src_prepare() { - sed -i \ - -e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \ - -e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \ - "${S}"/lgi/Makefile || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" -} - -src_test() { - Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check -} - -src_install() { - emake DESTDIR="${D}" install - dohtml -r docs/* - dodoc README.md - if use examples; then - dodoc -r samples - fi -} diff --git a/dev-lua/lgi/lgi-0.9.0.ebuild b/dev-lua/lgi/lgi-0.9.0.ebuild deleted file mode 100644 index bd19c1f04850..000000000000 --- a/dev-lua/lgi/lgi-0.9.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -VIRTUALX_REQUIRED="manual" - -inherit eutils toolchain-funcs flag-o-matic virtualx - -DESCRIPTION="Lua bindings using gobject-introspection" -HOMEPAGE="https://github.com/pavouk/lgi" -SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="examples test" - -RDEPEND=">=dev-lang/lua-5.1 - dev-libs/gobject-introspection - dev-libs/glib - virtual/libffi" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - x11-libs/cairo[glib] - x11-libs/gtk+[introspection] - ${VIRTUALX_DEPEND} - )" - -src_prepare() { - sed -i \ - -e "s:^LUA_LIBDIR.*$:LUA_LIBDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" \ - -e "s:^LUA_SHAREDIR.*$:LUA_SHAREDIR = $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" \ - "${S}"/lgi/Makefile || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" -} - -src_test() { - Xemake CC="$(tc-getCC)" COPTFLAGS="-Wall -Wextra ${CFLAGS}" LIBFLAG="-shared ${LDFLAGS}" check -} - -src_install() { - emake DESTDIR="${D}" install - dohtml -r docs/* - dodoc README.md - if use examples; then - dodoc -r samples - fi -} diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild new file mode 100644 index 000000000000..f60aeae86b61 --- /dev/null +++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VIRTUALX_REQUIRED="manual" +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs virtualx + +DESCRIPTION="Lua bindings using gobject-introspection" +HOMEPAGE="https://github.com/pavouk/lgi" +SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm ~loong ppc ppc64 ~riscv x86" +IUSE="examples test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +BDEPEND="${LUA_DEPS}" +RDEPEND="${LUA_DEPS} + dev-libs/gobject-introspection + dev-libs/glib + dev-libs/libffi:0=" +DEPEND="${RDEPEND} + test? ( + x11-libs/cairo[glib] + x11-libs/gtk+[introspection] + ${VIRTUALX_DEPEND} + )" + +PATCHES=( "${FILESDIR}/${P}-lua54.patch" ) + +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + # The Makefile & several source files use the LUA version as part of the + # direct filename, dynamically created, and we respect that. + _slug=${ELUA} + _slug=${_slug/.} + _slug=${_slug/-} + _slug=${_slug/_} + + # Makefile: CORE = corelgilua51.so (and similar lines) + sed -r -i \ + -e "/^CORE\>/s,lua5.,${_slug},g" \ + lgi/Makefile \ + || die "sed failed" + + # ./lgi/core.lua:local core = require 'lgi.corelgilua51' + # ./lgi/core.c:luaopen_lgi_corelgilua51 (lua_State* L) + sed -r -i \ + -e "/lgi.corelgilua5./s,lua5.,${_slug},g" \ + lgi/core.lua \ + lgi/core.c \ + || die "sed failed" + + # Verify the change as it's important! + for f in lgi/core.lua lgi/core.c lgi/Makefile ; do + grep -sq "corelgi${_slug}" "${f}" || die "Failed to sed .lua & .c for corelgi${_slug}: ${f}" + done + + # Cleanup + unset _slug + popd +} + +src_prepare() { + default + lua_copy_sources + lua_foreach_impl lua_src_prepare +} + +lgi_emake_wrapper() { + emake \ + CC="$(tc-getCC)" \ + COPTFLAGS="-Wall -Wextra ${CFLAGS}" \ + LIBFLAG="-shared ${LDFLAGS}" \ + LUA_CFLAGS="$(lua_get_CFLAGS)" \ + LUA="${LUA}" \ + LUA_VERSION="${ELUA#lua}" \ + LUA_LIBDIR="$(lua_get_cmod_dir)" \ + LUA_SHAREDIR="$(lua_get_lmod_dir)" \ + "$@" +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + lgi_emake_wrapper all + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} == luajit ]]; then + einfo "Tests are currently not supported on LuaJIT" + else + virtx \ + lgi_emake_wrapper \ + check + fi + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + lgi_emake_wrapper \ + DESTDIR="${D}" \ + install + popd +} + +src_install() { + lua_foreach_impl lua_src_install + docompress -x /usr/share/doc/${PF} + dodoc README.md + dodoc -r docs/* + if use examples; then + dodoc -r samples + fi +} diff --git a/dev-lua/lgi/metadata.xml b/dev-lua/lgi/metadata.xml index 8eed56640dac..7ba0b6fbaa30 100644 --- a/dev-lua/lgi/metadata.xml +++ b/dev-lua/lgi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest index 6addf6c1ed10..ef58ad92dd6f 100644 --- a/dev-lua/lpeg/Manifest +++ b/dev-lua/lpeg/Manifest @@ -1,2 +1 @@ -DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch deleted file mode 100644 index a0be0558aa97..000000000000 --- a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- lpeg-0.12.1/makefile -+++ lpeg-0.12.1/makefile -@@ -1,7 +1,7 @@ - LIBNAME = lpeg - LUADIR = ../lua/ - --COPT = -O2 -+#COPT = -O2 - # COPT = -DLPEG_DEBUG -g - - CWARNS = -Wall -Wextra -pedantic \ -@@ -22,21 +22,21 @@ - # -Wunreachable-code \ - - --CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC -+CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC - CC = gcc - - FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o - - # For Linux - linux: -- make lpeg.so "DLLFLAGS = -shared -fPIC" -+ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC" - - # For Mac OS - macosx: -- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup" -+ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup" - - lpeg.so: $(FILES) -- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so -+ env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so - - $(FILES): makefile - diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild deleted file mode 100644 index 1578b536ade8..000000000000 --- a/dev-lua/lpeg/lpeg-1.0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Parsing Expression Grammars for Lua" -HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/" -SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86" -IUSE="debug doc luajit" - -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2= )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -DOCS=( "HISTORY" ) -HTML_DOCS=( "lpeg.html" "re.html" ) -PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch ) - -src_prepare() { - default - use debug && append-cflags -DLPEG_DEBUG -} - -src_compile() { - emake CC="$(tc-getCC)" \ - LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" -} - -src_test() { - $(usex luajit 'luajit' 'lua') test.lua || die -} - -src_install() { - local instdir - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" - exeinto "${instdir#${EPREFIX}}" - doexe lpeg.so - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" - insinto "${instdir#${EPREFIX}}" - doins re.lua - - use doc && einstalldocs -} diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild new file mode 100644 index 000000000000..cb9aa50746f3 --- /dev/null +++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua flag-o-matic toolchain-funcs + +DESCRIPTION="Parsing Expression Grammars for Lua" +HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/" +SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" +IUSE="test debug doc" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +DOCS=( HISTORY ) +HTML_DOCS=( lpeg.html re.html ) +PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch ) + +lua_src_prepare() { + if ! test -d "${S}.${ELUA}/" ; then + cp -ral "${S}/" "${S}.${ELUA}/" || die + fi +} + +src_prepare() { + default + use debug && append-cflags -DLPEG_DEBUG + + if [[ ${CHOST} == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi + + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + cd "${S}.${ELUA}/" || die + emake CC="$(tc-getCC)" \ + LUADIR="${EPREFIX}/$(lua_get_include_dir)" +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + cd "${S}.${ELUA}/" || die + ${ELUA} test.lua || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + cd "${S}.${ELUA}/" || die + local instdir + instdir="$(lua_get_cmod_dir)" + exeinto "${instdir#${EPREFIX}}" + doexe lpeg.so + instdir="$(lua_get_lmod_dir)" + insinto "${instdir#${EPREFIX}}" + doins re.lua + + if [[ ${CHOST} == *-darwin* ]] ; then + local luav=$(lua_get_version) + # we only want the major version (e.g. 5.1) + local luamv=${luav:0:3} + local file="lua/${luamv}/lpeg.so" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name" + fi +} + +src_install() { + lua_foreach_impl lua_src_install + cd "${S}" || die + use doc && einstalldocs +} diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild deleted file mode 100644 index 5596fb03b62e..000000000000 --- a/dev-lua/lpeg/lpeg-1.0.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Parsing Expression Grammars for Lua" -HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/" -SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" -IUSE="debug doc luajit" - -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2= )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -DOCS=( HISTORY ) -HTML_DOCS=( lpeg.html re.html ) -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch ) - -src_prepare() { - default - use debug && append-cflags -DLPEG_DEBUG -} - -src_compile() { - emake CC="$(tc-getCC)" \ - LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" -} - -src_test() { - $(usex luajit 'luajit' 'lua') test.lua || die -} - -src_install() { - local instdir - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" - exeinto "${instdir#${EPREFIX}}" - doexe lpeg.so - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" - insinto "${instdir#${EPREFIX}}" - doins re.lua - - use doc && einstalldocs -} diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml index 3601f139104d..7eb210840cd1 100644 --- a/dev-lua/lpeg/metadata.xml +++ b/dev-lua/lpeg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>vim@gentoo.org</email> diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest new file mode 100644 index 000000000000..a1d43f077e56 --- /dev/null +++ b/dev-lua/lua-argparse/Manifest @@ -0,0 +1 @@ +DIST lua-argparse-0.7.1.tar.gz 43778 BLAKE2B 6bc6a3dee3fd98cb8c00fa3ccb3ae9ffdb9f2707d80dd7f5717e1265430731957b756672ed4acd9222c686108f8a8b8c71c71285c2540e818396faf302c1d287 SHA512 f192d0c591516a74408a19c0bbf34233be180f63794211a951d19fc8d981749bc71eace16a4680c8f2bb302ab48958c6a9ffc84022a1754275fc1f9113ae32b0 diff --git a/dev-lua/lua-argparse/lua-argparse-0.7.1-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.7.1-r1.ebuild new file mode 100644 index 000000000000..703b8c139847 --- /dev/null +++ b/dev-lua/lua-argparse/lua-argparse-0.7.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="Feature-rich command line parser for Lua" +HOMEPAGE="https://github.com/luarocks/argparse" +SRC_URI="https://github.com/luarocks/${PN/lua-/}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN//lua-/}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_install() { + insinto "$(lua_get_lmod_dir)" + doins src/argparse.lua +} + +src_install() { + default + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-argparse/metadata.xml b/dev-lua/lua-argparse/metadata.xml new file mode 100644 index 000000000000..372b08a58350 --- /dev/null +++ b/dev-lua/lua-argparse/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription lang="en"> + Argparse is a feature-rich command line parser for Lua inspired by argparse for Python. + + Argparse supports positional arguments, options, flags, optional arguments, subcommands + and more. Argparse automatically generates usage, help and error messages. + </longdescription> + <upstream> + <remote-id type="github">luarocks/argparse</remote-id> + <remote-id type="github">mpeterv/argparse</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest new file mode 100644 index 000000000000..ef9392daadfa --- /dev/null +++ b/dev-lua/lua-bit32/Manifest @@ -0,0 +1 @@ +DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild new file mode 100644 index 000000000000..114e3b47f3e0 --- /dev/null +++ b/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 luajit ) + +MY_PN="lua-compat-5.3" +MY_PV="0.10" + +inherit lua toolchain-funcs + +DESCRIPTION="Backported Lua bit manipulation library" +HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3" +SRC_URI="https://github.com/keplerproject/${MY_PN}/archive/v${MY_PV}.tar.gz -> lua-compat53-${MY_PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND="${LUA_DEPS}" +RDEPEND="${DEPEND}" + +lua_src_compile() { + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "${LDFLAGS}" + "-DLUA_COMPAT_BITLIB" + "-Ic-api" + "$(lua_get_CFLAGS)" + "-c lbitlib.c" + "-o lbitlib-${ELUA}.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "-o bit32-${ELUA}.so" + "lbitlib-${ELUA}.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + LUA_CPATH="./bit32-${ELUA}.so" "${ELUA}" "tests/test-bit32.lua" || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + exeinto "$(lua_get_cmod_dir)" + newexe "bit32-${ELUA}.so" "bit32.so" +} + +src_install() { + default + + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml new file mode 100644 index 000000000000..01c3067e69fc --- /dev/null +++ b/dev-lua/lua-bit32/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">keplerproject/lua-compat-5.3</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest index 5543b65fbe32..d07c1321b4b4 100644 --- a/dev-lua/lua-cjson/Manifest +++ b/dev-lua/lua-cjson/Manifest @@ -1,2 +1 @@ -DIST lua-cjson-2.1.0.6.tar.gz 76820 BLAKE2B 1056fefc8d9c802e068e1e7801cc1eb3a0279371ab72e4e8517e22ad68224dd4892f4e4cbfe0a407af71f1008affded41d7bcc05d89c4ddb0c437d93d67708a7 SHA512 71d25f4ec82641d56e33e13c0ecd8c60186b3c4faf3d30de81706d1305d4e61691a1e84210462942674e50ca2ff19e126cb04025d9645d5d26ef3b3b0e46f64b -DIST lua-cjson-2.1.0.7.tar.gz 76949 BLAKE2B 9189890f24885191001e79cf0f48aaee74026572eda3e767b0e5e63d44634156fd2b972287cb23e243b3fd0f44f8e87a1fcb0c0b8e26197c63e5e0ff30cb3a94 SHA512 c66fbb608dcd1b7daef8c70ad9a60ab442bf8b851b8d8c5e3b11854ab476dff115e2eef31f171a40ce364778682ce351114caf36c995521ec589bd9dd94415c5 +DIST lua-cjson-2.1.0.10.tar.gz 78651 BLAKE2B c215f0a78ba306831a9aa147df9edcb693164a82a0b0505265425124adb40c918da826d128c2dcd048e2c3040d191e177c78b143abb28608b38b3c2b21760539 SHA512 889761b6381b2d10b7aa2e5687e5059705352c0f7fbbca9bc5f7c9d89aed8b1e283c18e217183042cc6f1ec4f19d1c4cf720e3efc6f5a06e81aa1bec8a6b93c4 diff --git a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/sparse_array_test_fix.patch deleted file mode 100644 index 0c1d138cbadf..000000000000 --- a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 75678e4b0d1b25fc15f0399f1496db6e0287b72f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Tue, 12 Feb 2019 13:32:38 -0800 -Subject: [PATCH] Fix Encode sparse array as object test - -Port of this commit from upstream -https://github.com/mpx/lua-cjson/commit/98eb1d01e952fc60a36f47846f905b86c92a4f58 ---- - tests/test.lua | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/tests/test.lua b/tests/test.lua -index d1bf7e4..be5e19c 100755 ---- a/tests/test.lua -+++ b/tests/test.lua -@@ -10,6 +10,17 @@ local json = require "cjson" - local json_safe = require "cjson.safe" - local util = require "cjson.util" - -+local function json_encode_output_type(value) -+ local text = json.encode(value) -+ if string.match(text, "{.*}") then -+ return "object" -+ elseif string.match(text, "%[.*%]") then -+ return "array" -+ else -+ return "scalar" -+ end -+end -+ - local function gen_raw_octets() - local chars = {} - for i = 0, 255 do chars[i + 1] = string.char(i) end -@@ -292,8 +303,8 @@ local cjson_tests = { - json.encode, { { [1] = "one", [4] = "sparse test" } }, - true, { '["one",null,null,"sparse test"]' } }, - { "Encode sparse array as object", -- json.encode, { { [1] = "one", [5] = "sparse test" } }, -- true, { '{"5":"sparse test","1":"one"}' } }, -+ json_encode_output_type, { { [1] = "one", [5] = "sparse test" } }, -+ true, { 'object' } }, - { "Encode table with numeric string key as object", - json.encode, { { ["2"] = "numeric string key test" } }, - true, { '{"2":"numeric string key test"}' } }, --- -2.20.1 - diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild new file mode 100644 index 000000000000..dd196fb7ded8 --- /dev/null +++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A fast JSON encoding/parsing module for Lua" +HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson" +SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+internal-fpconv test +threads" +REQUIRED_USE=" + threads? ( internal-fpconv ) + ${LUA_REQUIRED_USE} +" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-lang/perl )" + +DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" ) + +src_prepare() { + default + + # Don't install tests + sed -e '/cd tests/d' -i Makefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CFLAGS=${CFLAGS}" + "LDFLAGS=${LDFLAGS}" + "LUA_INCLUDE_DIR=$(lua_get_include_dir)" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + cd tests || die + + ln -s "${BUILD_DIR}"/cjson.so ./ || die + ln -s "${S}"/lua/cjson ./ || die + + ./genutf8.pl || die + ./test.lua || die + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "DESTDIR=${D}" + "LUA_CMODULE_DIR=$(lua_get_cmod_dir)" + "LUA_MODULE_DIR=$(lua_get_lmod_dir)" + "PREFIX=${EPREFIX}/usr" + ) + + emake "${myemakeargs[@]}" install install-extra + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild deleted file mode 100644 index d8443f9f6901..000000000000 --- a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="A fast JSON encoding/parsing module for Lua" -HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson" -SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+internal-fpconv luajit test +threads" - -REQUIRED_USE="threads? ( internal-fpconv )" - -RDEPEND=">=dev-lang/lua-5.1:0" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-lang/perl )" - -DOCS=( NEWS README.md THANKS manual.txt performance.txt ) - -PATCHES=( - "${FILESDIR}"/sparse_array_test_fix.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FPCONV="$(usex internal-fpconv)" - -DMULTIPLE_THREADS="$(usex threads)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests || die - ln -s "${BUILD_DIR}"/cjson.so ./ || die - ln -s "${S}"/lua/cjson ./ || die - ./genutf8.pl || die - ./test.lua || die -} diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild deleted file mode 100644 index d8443f9f6901..000000000000 --- a/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="A fast JSON encoding/parsing module for Lua" -HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson" -SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+internal-fpconv luajit test +threads" - -REQUIRED_USE="threads? ( internal-fpconv )" - -RDEPEND=">=dev-lang/lua-5.1:0" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-lang/perl )" - -DOCS=( NEWS README.md THANKS manual.txt performance.txt ) - -PATCHES=( - "${FILESDIR}"/sparse_array_test_fix.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FPCONV="$(usex internal-fpconv)" - -DMULTIPLE_THREADS="$(usex threads)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests || die - ln -s "${BUILD_DIR}"/cjson.so ./ || die - ln -s "${S}"/lua/cjson ./ || die - ./genutf8.pl || die - ./test.lua || die -} diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml index 5b6408370bec..b87098d6b587 100644 --- a/dev-lua/lua-cjson/metadata.xml +++ b/dev-lua/lua-cjson/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> - <longdescription lang="en"> + <longdescription> OpenResty fork of mpx/lua-cjson, includes a few bugfixes and improvements, especially to facilitate the encoding of empty tables as JSON Arrays. </longdescription> diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest index a2022b3e4ba5..a002c80a9b76 100644 --- a/dev-lua/lua-openssl/Manifest +++ b/dev-lua/lua-openssl/Manifest @@ -1,3 +1,3 @@ -DIST lua-openssl-0.7.3.tar.gz 383743 BLAKE2B 2709eed607e6d752488cacd5b96ee4a845f1ec13948fc7e40e45af968f240579b5d96ab69380f87d7edfc8a55aa44b099e9a592891f78a7928d172f5abcbc9fb SHA512 00eea8d4d04e167456a7602ae111cb768db61f7bdf9e0056c424bdcd67618811cd304543f95ecb273c66c6b41779e2fe721cb43bc332765ce77effb6245edbe2 -DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4 -DIST lua-openssl-compat-daebe77a2f498817713df37f0bb316db1d82222f.tar.gz 51418 BLAKE2B 1d04684e6b6d850bdf6bd3165a90c6a08bd93b757d91e387da152bcb3fc4756db5c16f3cc12ecf33bcdd647742c7923cc2e72627beb5527c5e9dfbfd63c147ba SHA512 60ec9ecfc4e4ad47b6a8189ffb1e7c83fe8b9e9df13cb91bf33725905ab72bff3d3009e8ad04fb73fd7255facdbb8279f20bfd160aee89b12c25431786eaca14 +DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952 +DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d +DIST lua-openssl-0.9.0_p0.tar.gz 415793 BLAKE2B 74fd4565ecbca90d9ca141bd909d403e2d16f68df089b86f747e7c37e6b57c81f1f94e468180f99f564e613afec5fe6aeb18de78d88aa2f41b6395fba2e7c884 SHA512 146231335c036f9dc0c4c5c40d93aa59e47f761afc5d1ee695c336d1b881c51d52cec3d1903cda6bc3c57224e041e17faab3be61dee6b1a154db22b47f9cc303 diff --git a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch b/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch deleted file mode 100644 index 19b0539c0820..000000000000 --- a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch +++ /dev/null @@ -1,433 +0,0 @@ -From 44d5360d0caed1f4f364691f789fe825fcd17a3e Mon Sep 17 00:00:00 2001 -From: crito <crito@fnordpipe.org> -Date: Mon, 1 Oct 2018 20:10:05 +0200 -Subject: [PATCH] fix libressl compat - -add conditions to build with libressl and add missing functions. -backported from upstream repo. ---- - src/compat.c | 11 ++++++++--- - src/digest.c | 2 +- - src/ec.c | 2 +- - src/engine.c | 10 +++++----- - src/lhash.c | 7 ++++--- - src/openssl.c | 12 ++++++++++-- - src/ots.c | 5 +++++ - src/pkcs7.c | 24 ++++++++++++------------ - src/private.h | 7 ++++--- - src/sm2.c | 2 +- - src/srp.c | 3 ++- - src/x509.c | 2 +- - 12 files changed, 54 insertions(+), 33 deletions(-) - -diff --git a/src/compat.c b/src/compat.c -index cc4cc21..cc45845 100644 ---- a/src/compat.c -+++ b/src/compat.c -@@ -5,7 +5,7 @@ - #include "openssl.h" - #include "private.h" - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int BIO_up_ref(BIO *b) - { - CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO); -@@ -16,6 +16,11 @@ int X509_up_ref(X509 *x) - CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); - return 1; - } -+int X509_CRL_up_ref(X509_CRL *x) -+{ -+ int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); -+ return (refs > 1) ? 1 : 0; -+} - int X509_STORE_up_ref(X509_STORE *s) - { - CRYPTO_add(&s->references, 1, CRYPTO_LOCK_X509_STORE); -@@ -464,7 +469,7 @@ const ASN1_BIT_STRING *TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a) - return a->failure_info; - } - --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - int i2d_re_X509_tbs(X509 *x, unsigned char **pp) - { - x->cert_info->enc.modified = 1; -@@ -527,4 +532,4 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, - return ctx->imprint; - } - --#endif /* < 1.1.0 */ -\ No newline at end of file -+#endif /* < 1.1.0 */ -diff --git a/src/digest.c b/src/digest.c -index 02e8fe1..0dcf65b 100644 ---- a/src/digest.c -+++ b/src/digest.c -@@ -468,7 +468,7 @@ restore md data - static LUA_FUNCTION(openssl_digest_ctx_data) - { - EVP_MD_CTX *ctx = CHECK_OBJECT(1, EVP_MD_CTX, "openssl.evp_digest_ctx"); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (lua_isnone(L, 2)) - { - lua_pushlstring(L, ctx->md_data, ctx->digest->ctx_size); -diff --git a/src/ec.c b/src/ec.c -index f0d2b6b..5db32db 100644 ---- a/src/ec.c -+++ b/src/ec.c -@@ -611,7 +611,7 @@ static int openssl_ecdsa_set_method(lua_State *L) - { - EC_KEY *ec = CHECK_OBJECT(1, EC_KEY, "openssl.ec_key"); - ENGINE *e = CHECK_OBJECT(2, ENGINE, "openssl.engine"); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - const ECDSA_METHOD *m = ENGINE_get_ECDSA(e); - if (m) { - int r = ECDSA_set_method(ec, m); -diff --git a/src/engine.c b/src/engine.c -index 1a26d8b..f12ca53 100644 ---- a/src/engine.c -+++ b/src/engine.c -@@ -14,7 +14,7 @@ enum - { - TYPE_RSA, - TYPE_DSA, --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - TYPE_ECDH, - TYPE_ECDSA, - #else -@@ -24,7 +24,7 @@ enum - TYPE_RAND, - TYPE_CIPHERS, - TYPE_DIGESTS, --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - TYPE_STORE, - #else - TYPE_PKEY_METHODS, -@@ -150,7 +150,7 @@ static int openssl_engine_register(lua_State*L) - else - ENGINE_register_DSA(eng); - break; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - case TYPE_ECDH: - if (unregister) - ENGINE_unregister_ECDH(eng); -@@ -183,7 +183,7 @@ static int openssl_engine_register(lua_State*L) - else - ENGINE_register_RAND(eng); - break; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - case TYPE_STORE: - if (unregister) - ENGINE_unregister_STORE(eng); -@@ -392,7 +392,7 @@ static int openssl_engine_set_default(lua_State*L) - case TYPE_DSA: - ret = ENGINE_set_default_DSA(eng); - break; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - case TYPE_ECDH: - ret = ENGINE_set_default_ECDH(eng); - break; -diff --git a/src/lhash.c b/src/lhash.c -index 564bb52..8057efb 100644 ---- a/src/lhash.c -+++ b/src/lhash.c -@@ -130,21 +130,22 @@ static void dump_value_doall_arg(CONF_VALUE *a, lua_State *L) - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, lua_State); - #elif OPENSSL_VERSION_NUMBER >= 0x10000002L - static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, lua_State) - #endif -+#if !defined(LIBRESSL_VERSION_NUMBER) - #define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \ - lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg)) -- -+#endif - - static LUA_FUNCTION(openssl_lhash_parse) - { - LHASH* lhash = CHECK_OBJECT(1, LHASH, "openssl.lhash"); - - lua_newtable(L); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - lh_CONF_VALUE_doall_lua_State(lhash, dump_value_doall_arg, L); - #elif OPENSSL_VERSION_NUMBER >= 0x10000002L - lh_CONF_VALUE_doall_arg(lhash, LHASH_DOALL_ARG_FN(dump_value), lua_State, L); -diff --git a/src/openssl.c b/src/openssl.c -index 994c22b..debea63 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -338,6 +338,9 @@ get FIPS mode - */ - static int openssl_fips_mode(lua_State *L) - { -+#if defined(LIBRESSL_VERSION_NUMBER) -+ return 0; -+#else - int ret =0, on = 0; - if(lua_isnone(L, 1)) - { -@@ -353,6 +356,7 @@ static int openssl_fips_mode(lua_State *L) - else - ret = openssl_pushresult(L, ret); - return ret; -+#endif - } - - #ifndef OPENSSL_NO_CRYPTO_MDEBUG -@@ -405,7 +409,9 @@ void CRYPTO_thread_cleanup(void); - - static int luaclose_openssl(lua_State *L) - { -+#if !defined(LIBRESSL_VERSION_NUMBER) - FIPS_mode_set(0); -+#endif - #if defined(OPENSSL_THREADS) - CRYPTO_thread_cleanup(); - #endif -@@ -421,7 +427,7 @@ static int luaclose_openssl(lua_State *L) - CRYPTO_cleanup_all_ex_data(); - #ifndef OPENSSL_NO_CRYPTO_MDEBUG - #if !(defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_FP_API)) --#if OPENSSL_VERSION_NUMBER < 0x10101000L -+#if OPENSSL_VERSION_NUMBER < 0x10101000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_mem_leaks_fp(stderr); - #else - if(CRYPTO_mem_leaks_fp(stderr)!=1) -@@ -541,13 +547,15 @@ LUALIB_API int luaopen_openssl(lua_State*L) - luaopen_dh(L); - lua_setfield(L, -2, "dh"); - --#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) -+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER) - luaopen_sm2(L); - lua_setfield(L, -2, "sm2"); - #endif - -+#if !defined(LIBRESSL_VERSION_NUMBER) - luaopen_srp(L); - lua_setfield(L, -2, "srp"); -+#endif - - #ifdef ENABLE_OPENSSL_GLOBAL - lua_pushvalue(L, -1); -diff --git a/src/ots.c b/src/ots.c -index 6b75946..762d17e 100644 ---- a/src/ots.c -+++ b/src/ots.c -@@ -1265,7 +1265,12 @@ static LUA_FUNCTION(openssl_ts_resp_ctx_set_time_cb) - arg->cb_arg = luaL_ref(L, LUA_REGISTRYINDEX); - - openssl_valueset(L, ctx, time_cb_key); -+#if defined(LIBRESSL_VERSION_NUMBER) -+ ctx->time_cb = openssl_time_cb; -+ ctx->time_cb_data = L; -+#else - TS_RESP_CTX_set_time_cb(ctx, openssl_time_cb, L); -+#endif - return 0; - } - -diff --git a/src/pkcs7.c b/src/pkcs7.c -index f043c86..f0e5221 100644 ---- a/src/pkcs7.c -+++ b/src/pkcs7.c -@@ -346,7 +346,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio) - os = p7->d.signed_and_enveloped->enc_data->enc_data; - if (!os) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - os = M_ASN1_OCTET_STRING_new(); - #else - os = ASN1_OCTET_STRING_new(); -@@ -364,7 +364,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio) - os = p7->d.enveloped->enc_data->enc_data; - if (!os) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - os = M_ASN1_OCTET_STRING_new(); - #else - os = ASN1_OCTET_STRING_new(); -@@ -383,7 +383,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio) - /* If detached data then the content is excluded */ - if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - M_ASN1_OCTET_STRING_free(os); - #else - ASN1_OCTET_STRING_free(os); -@@ -398,7 +398,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio) - /* If detached data then the content is excluded */ - if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - M_ASN1_OCTET_STRING_free(os); - #else - ASN1_OCTET_STRING_free(os); -@@ -474,7 +474,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio) - goto err; - if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) - goto err; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); - #else - ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); -@@ -577,7 +577,7 @@ int PKCS7_signatureVerify_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509, - - md_type = OBJ_obj2nid(si->digest_alg->algorithm); - md = EVP_get_digestbynid(md_type); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (!md || !data || (hash && len != (size_t) md->ctx_size) ) - goto err; - -@@ -1137,7 +1137,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - os = p7->d.signed_and_enveloped->enc_data->enc_data; - if (!os) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - os = M_ASN1_OCTET_STRING_new(); - #else - os = ASN1_OCTET_STRING_new(); -@@ -1155,7 +1155,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - os = p7->d.enveloped->enc_data->enc_data; - if (!os) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - os = M_ASN1_OCTET_STRING_new(); - #else - os = ASN1_OCTET_STRING_new(); -@@ -1174,7 +1174,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - /* If detached data then the content is excluded */ - if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - M_ASN1_OCTET_STRING_free(os); - #else - ASN1_OCTET_STRING_free(os); -@@ -1189,7 +1189,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - /* If detached data then the content is excluded */ - if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - M_ASN1_OCTET_STRING_free(os); - #else - ASN1_OCTET_STRING_free(os); -@@ -1217,7 +1217,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - - if (hash) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (l == (size_t) mdc->digest->ctx_size) - { - memcpy(mdc->md_data, data, l); -@@ -1272,7 +1272,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest) - unsigned int md_len; - md = EVP_get_digestbynid(OBJ_obj2nid(p7->d.digest->md->algorithm)); - EVP_DigestInit_ex(mdc, md, NULL); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (l == (size_t) mdc->digest->ctx_size) - { - memcpy(mdc->md_data, data, l); -diff --git a/src/private.h b/src/private.h -index 8e9d5b8..7140cae 100644 ---- a/src/private.h -+++ b/src/private.h -@@ -46,9 +46,10 @@ extern "C" { - luaL_getmetatable(L,"openssl.bn"); \ - lua_setmetatable(L,-2) - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int BIO_up_ref(BIO *b); - int X509_up_ref(X509 *x); -+int X509_CRL_up_ref(X509_CRL *x); - int X509_STORE_up_ref(X509_STORE *s); - int EVP_PKEY_up_ref(EVP_PKEY *pkey); - -@@ -124,12 +125,12 @@ STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx, - unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, - unsigned char *hexstr, long len); - --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - int i2d_re_X509_tbs(X509 *x, unsigned char **pp); -+#endif - void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, - const X509 *x); - int X509_get_signature_nid(const X509 *x); --#endif - - #endif - -diff --git a/src/sm2.c b/src/sm2.c -index 0655888..1db3198 100644 ---- a/src/sm2.c -+++ b/src/sm2.c -@@ -1,7 +1,7 @@ - #include "openssl.h" - #include "private.h" - --#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) -+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER) - - # include <openssl/sm2.h> - -diff --git a/src/srp.c b/src/srp.c -index 85626b5..6fb0a50 100644 ---- a/src/srp.c -+++ b/src/srp.c -@@ -1,6 +1,7 @@ - #include "openssl.h" - #include "private.h" - -+#if !defined(LIBRESSL_VERSION_NUMBER) - #include <openssl/srp.h> - #include <openssl/bn.h> - -@@ -198,4 +199,4 @@ int luaopen_srp(lua_State *L) - lua_settable(L, -3); - return 1; - } -- -+#endif -diff --git a/src/x509.c b/src/x509.c -index 94e9982..07adb54 100644 ---- a/src/x509.c -+++ b/src/x509.c -@@ -1196,7 +1196,7 @@ static int openssl_x509_extensions(lua_State* L) - else - { - STACK_OF(X509_EXTENSION) *others = (STACK_OF(X509_EXTENSION) *)openssl_sk_x509_extension_fromtable(L, 2); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - sk_X509_EXTENSION_pop_free(self->cert_info->extensions, X509_EXTENSION_free); - self->cert_info->extensions = others; - #else --- -2.16.4 - diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild deleted file mode 100644 index 564518d7fb1a..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="OpenSSL binding for Lua" -HOMEPAGE="https://github.com/zhaozg/lua-openssl" -LUA_AUX_COMMIT="b56f6937096acea34ddf241ec7ea08ac52414d18" -LUA_COMPAT_COMMIT="daebe77a2f498817713df37f0bb316db1d82222f" -SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/zhaozg/lua-auxiliar/archive/${LUA_AUX_COMMIT}.tar.gz -> ${PN}-aux-${LUA_AUX_COMMIT}.tar.gz - https://github.com/keplerproject/lua-compat-5.3/archive/${LUA_COMPAT_COMMIT}.tar.gz -> ${PN}-compat-${LUA_COMPAT_COMMIT}.tar.gz" - -LICENSE="MIT openssl PHP-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl luajit" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - libressl? ( <dev-libs/libressl-2.7.0:0= ) - !libressl? ( dev-libs/openssl:0=[-bindist] ) - !dev-lua/luaossl - " -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=("${FILESDIR}/0001-fix-libressl-compat.patch") - -src_unpack() { - unpack "${P}.tar.gz" - pushd "${WORKDIR}/${P}/deps" > /dev/null || die - unpack "${PN}-aux-${LUA_AUX_COMMIT}.tar.gz" - unpack "${PN}-compat-${LUA_COMPAT_COMMIT}.tar.gz" - rmdir auxiliar lua-compat || die - mv "lua-auxiliar-${LUA_AUX_COMMIT}" auxiliar || die - mv "lua-compat-5.3-${LUA_COMPAT_COMMIT}" lua-compat || die - popd > /dev/null || die -} - -src_configure() { - tc-export PKG_CONFIG - LUA_VERSION="$(${PKG_CONFIG} --variable=$(usex luajit abiver V) $(usex luajit luajit lua))" - LUA_CFLAGS="$(${PKG_CONFIG} $(usex luajit luajit lua) --cflags) ${CFLAGS}" - LUA_LIBS="$(${PKG_CONFIG} $(usex luajit luajit lua) --libs) ${LDFLAGS}" - - export LUA_VERSION LUA_CFLAGS LUA_LIBS -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX="${ED}/usr" install - einstalldocs -} diff --git a/dev-lua/lua-openssl/lua-openssl-0.9.0_p0.ebuild b/dev-lua/lua-openssl/lua-openssl-0.9.0_p0.ebuild new file mode 100644 index 000000000000..80f2eb53b56a --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.9.0_p0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN_AUX="lua-auxiliar" +MY_PN_COMPAT="lua-compat-5.3" +MY_PV="${PV//_p/-}" +MY_PV_COMPAT="0.10" + +inherit flag-o-matic lua toolchain-funcs + +DESCRIPTION="OpenSSL binding for Lua" +HOMEPAGE="https://github.com/zhaozg/lua-openssl" +SRC_URI=" + https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz + https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz +" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT openssl PHP-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND=" + !dev-lua/luaossl + !dev-lua/luasec + dev-libs/openssl:0=[-bindist(-)] + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +src_prepare() { + default + + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + + # Disable TestCMS test suite, as it fails + # See: https://github.com/zhaozg/lua-openssl/issues/230 + sed -e '/6.cms.lua/d' -i test/test.lua || die + + # Prepare needed dependencies (source code files only) + rm -r deps/{auxiliar,lua-compat} || die + mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die + mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + # See https://bugs.gentoo.org/920643 + # See https://github.com/zhaozg/lua-openssl/issues/305 + append-cflags -Wno-error=incompatible-pointer-types + + local myemakeargs=( + "AR=$(tc-getAR)" + "CC=$(tc-getCC)" + "LUA=" + "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" + "LUA_LIBS=${LDFLAGS}" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA=${ELUA}" + "LUA_CFLAGS=" + "LUA_LIBS=" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" test + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_LIBS=" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml index 731dad42e18a..16f1bdb25c09 100644 --- a/dev-lua/lua-openssl/metadata.xml +++ b/dev-lua/lua-openssl/metadata.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>crito@fnordpipe.org</email> - <name>Matthias Hauber</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person" proxied="yes"> + <email>vpayno+gentoo@gmail.com</email> + <name>Victor Payno</name> + </maintainer> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> </maintainer> <upstream> <remote-id type="github">zhaozg/lua-openssl</remote-id> diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest index 51f2606ee339..7b7b7ef410e3 100644 --- a/dev-lua/lua-term/Manifest +++ b/dev-lua/lua-term/Manifest @@ -1 +1,2 @@ -DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7 +DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31 +DIST lua-term-0.8.tar.gz 4838 BLAKE2B 690c9e7b7e831d69d0a2626c69721ca53fe9026e4885af50925942ebce1ffa44b2242cbe91b4ddcccfa2fbd56b3eeb3eeb8aa5014d1689ed1b6d2e184da785aa SHA512 115d2696f244945d876ae97ea6e9f3be0ea0e19ec7e057cbc047d3189482fca0e21ff68fee79e5d24257496cf51f507451f408f0b0a952ff707ffe0eedc36866 diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild deleted file mode 100644 index 2ec69903c2c6..000000000000 --- a/dev-lua/lua-term/lua-term-0.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -# Yes, upstream used different version numbers. -# The rockspec version number is 0.3, but the version associated with -# the tarball is 0.03. -MY_PV=0.03 - -DESCRIPTION="Terminal functions for Lua" -HOMEPAGE="https://github.com/hoelzro/lua-term" -SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_compile() { - echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \ - -o core.so core.c" - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \ - -o core.so core.c || die -} - -src_install() { - exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/term - doexe core.so - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" -doins -r term -} diff --git a/dev-lua/lua-term/lua-term-0.7-r2.ebuild b/dev-lua/lua-term/lua-term-0.7-r2.ebuild new file mode 100644 index 000000000000..5fb52c4915e1 --- /dev/null +++ b/dev-lua/lua-term/lua-term-0.7-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="0.07" + +inherit lua toolchain-funcs + +DESCRIPTION="Terminal operations for Lua" +HOMEPAGE="https://github.com/hoelzro/lua-term" +SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O3//g' -i Makefile + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CFLAGS=${CFLAGS} -fPIC ${LDFLAGS} $(lua_get_CFLAGS)" + ) + + emake "${myemakeargs[@]}" all + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + LUA_LIBDIR="${ED}/$(lua_get_cmod_dir)/term" + LUA_SHARE="${ED}/$(lua_get_lmod_dir)/term" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-term/lua-term-0.8.ebuild b/dev-lua/lua-term/lua-term-0.8.ebuild new file mode 100644 index 000000000000..d8c193de70ac --- /dev/null +++ b/dev-lua/lua-term/lua-term-0.8.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="0.08" + +inherit lua toolchain-funcs + +DESCRIPTION="Terminal operations for Lua" +HOMEPAGE="https://github.com/hoelzro/lua-term" +SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O3//g' -i Makefile + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CFLAGS=${CFLAGS} -fPIC ${LDFLAGS} $(lua_get_CFLAGS)" + ) + + emake "${myemakeargs[@]}" all + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + LUA_LIBDIR="${ED}/$(lua_get_cmod_dir)/term" + LUA_SHARE="${ED}/$(lua_get_lmod_dir)/term" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-term/metadata.xml b/dev-lua/lua-term/metadata.xml index cd082b51556c..ba6974f5b710 100644 --- a/dev-lua/lua-term/metadata.xml +++ b/dev-lua/lua-term/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> <remote-id type="github">hoelzro/lua-term</remote-id> </upstream> diff --git a/dev-lua/lua-unbound/Manifest b/dev-lua/lua-unbound/Manifest new file mode 100644 index 000000000000..bae911379a0d --- /dev/null +++ b/dev-lua/lua-unbound/Manifest @@ -0,0 +1 @@ +DIST luaunbound-1.0.0.tar.gz 6366 BLAKE2B 7e5937e0109cb7222f982a62b7934ca272be9003810edee0d58684809928514441aeee22c83cbc3a8e309e9ee010f1d4afea50123647ad6eee387a556878f654 SHA512 9fab77481e7c84409d9ceb79156d06cb9ac2b2d7df53349e0f1b6c118022c9b1c22481e9413efedda41cc9acb1640d3d30cc4e0f9b7ed7fd6ed2511192a69d3c diff --git a/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild b/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild new file mode 100644 index 000000000000..abf456484978 --- /dev/null +++ b/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN="${PN/-/}" +MY_P="${MY_PN}-${PV}" + +inherit lua toolchain-funcs + +DESCRIPTION="A binding to libunbound for Lua" +HOMEPAGE="https://www.zash.se/luaunbound.html" +SRC_URI="https://code.zash.se/dl/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + net-dns/unbound +" +DEPEND="${RDEPEND}" + +DOCS=( "README.markdown" ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + CC="$(tc-getCC)" + CFLAGS="${CFLAGS} -fPIC $(lua_get_CFLAGS)" + LD="$(tc-getCC)" + LDFLAGS="${LDFLAGS} -shared" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + DESTDIR="${ED}" + LUA_LIBDIR="$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + einstalldocs + + popd +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-unbound/metadata.xml b/dev-lua/lua-unbound/metadata.xml new file mode 100644 index 000000000000..c07e13d4a6bd --- /dev/null +++ b/dev-lua/lua-unbound/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> +</pkgmetadata> diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest new file mode 100644 index 000000000000..b867fe622a42 --- /dev/null +++ b/dev-lua/lua-utf8/Manifest @@ -0,0 +1 @@ +DIST lua-utf8-0.1.5.tar.gz 47986 BLAKE2B 8902649f71b9b2f982278bfa697309474013f4b15788e268ee73aaeb80ceda93a03178ca00918c96478fa66623dbcea8b5bde89e216d8c73a18e9fe38aec7509 SHA512 2f7f1e80c27012d2ebcf3da8e9367f00dda9f7b1a7d4adee265ee37ab12a78ef7c94930945e88f060f0ec4186174dd87af80a50917d3b22a71c84f67b0df12d0 diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.5.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.5.ebuild new file mode 100644 index 000000000000..845005960bba --- /dev/null +++ b/dev-lua/lua-utf8/lua-utf8-0.1.5.ebuild @@ -0,0 +1,82 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A UTF-8 support module for Lua and LuaJIT" +HOMEPAGE="https://github.com/starwing/luautf8" +SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN//-/}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_compile() { + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "${LDFLAGS}" + "$(lua_get_CFLAGS)" + "-c lutf8lib.c" + "-o lutf8lib-${ELUA}.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "-o lutf8lib-${ELUA}.so" + "lutf8lib-${ELUA}.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + local mytests=( + "test.lua" + "test_compat.lua" + "test_pm.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="${S}/lutf8lib-${ELUA}.so" ${ELUA} ${mytest} || die + done +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + exeinto "$(lua_get_cmod_dir)" + newexe "lutf8lib-${ELUA}.so" "lua-utf8.so" + + insinto "$(lua_get_lmod_dir)" + doins parseucd.lua +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml new file mode 100644 index 000000000000..caf7f5454d25 --- /dev/null +++ b/dev-lua/lua-utf8/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription lang="en"> + This module adds UTF-8 support to Lua. + + It use data extracted from Unicode Character Database, and tested on Lua 5.2.3, Lua 5.3.0 and LuaJIT. + </longdescription> + <upstream> + <remote-id type="github">starwing/luautf8</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest index bac884dea046..581fe51d0237 100644 --- a/dev-lua/lua-zlib/Manifest +++ b/dev-lua/lua-zlib/Manifest @@ -1 +1 @@ -DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633 +DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4 diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild deleted file mode 100644 index b51a835e97de..000000000000 --- a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Lua bindings to zlib" -HOMEPAGE="https://github.com/brimworks/lua-zlib" -SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="dev-lang/lua:0 - sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=(-DINSTALL_CMOD="$(pkg-config --variable INSTALL_CMOD lua)") - cmake-utils_src_configure -} diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r1.ebuild new file mode 100644 index 000000000000..fee095b99a75 --- /dev/null +++ b/dev-lua/lua-zlib/lua-zlib-1.2-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake lua + +DESCRIPTION="Simple streaming interface to zlib for Lua" +HOMEPAGE="https://github.com/brimworks/lua-zlib" +SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + sys-libs/zlib + ${LUA_DEPS} + +" +DEPEND="${RDEPEND}" + +lua_src_configure() { + local mycmakeargs=( + -DINSTALL_CMOD="$(lua_get_cmod_dir)" + -DLUA_INCLUDE_DIR="$(lua_get_include_dir)" + -DUSE_LUA_VERSION="$(lua_get_version)" + ) + + if [[ ${ELUA} == luajit ]]; then + mycmakeargs+=( -DUSE_LUAJIT="ON" ) + fi + + cmake_src_configure +} + +src_configure() { + lua_foreach_impl lua_src_configure +} + +src_compile() { + lua_foreach_impl cmake_src_compile +} + +src_install() { + lua_foreach_impl cmake_src_install +} diff --git a/dev-lua/lua-zlib/metadata.xml b/dev-lua/lua-zlib/metadata.xml index b89e350d8c26..34b62ed6b1af 100644 --- a/dev-lua/lua-zlib/metadata.xml +++ b/dev-lua/lua-zlib/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">brimworks/lua-zlib</remote-id> - </upstream> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">brimworks/lua-zlib</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest index b397d8d960fa..dcb3ae88b9c8 100644 --- a/dev-lua/lua_cliargs/Manifest +++ b/dev-lua/lua_cliargs/Manifest @@ -1,2 +1 @@ -DIST lua_cliargs-2.5_p5.tar.gz 19513 BLAKE2B 25cdfd9e96fd0cf5d600394c47ec53dd80e619dac8a37a40e22366e1090ffc9f9f250d71683140959fbd33b3983a759c931c3ac70a3f14e9556005fe5f82f72c SHA512 7c4d490f5d86b07bdf299c976b99bf83c9ba86fabeb321f348587f8ad207983292e3e9268ef72f3cc6ff9d6e32a43669de1d3c21c47499852f971c2cc2a4e746 -DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd3678277e11b6218d56ae38e4678dd48472d65dd959b59bb44d5c42c1e64697fe4e54b67e80933ab706d9d2b01c79f SHA512 2bdcd3c790a82351df598cb3d289de980fe771222ebd9715036678eecdbe51b7563d24629afa4d286b900d722bf844004d12f2330744a1e644d9286ac44b4dbe +DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024 diff --git a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild deleted file mode 100644 index 703880029899..000000000000 --- a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -# Below is the upstream package version. -# The final component of the version number has been mapped to the _px -# component of the version number in portage so should be kept in sync. -MY_PV="2.5-5" - -DESCRIPTION="A command-line argument parser." -HOMEPAGE="https://github.com/amireh/lua_cliargs" -SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" - doins src/cliargs.lua - dodoc README.md -dodoc -r examples - docinto html - dodoc -r doc/* -} diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild deleted file mode 100644 index dd6a99c24ac3..000000000000 --- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -# Below is the upstream package version. -# The final component of the version number has been mapped to the _px -# component of the version number in portage so should be kept in sync. -MY_PV="3.0-1" - -DESCRIPTION="A command-line argument parser." -HOMEPAGE="https://github.com/amireh/lua_cliargs" -SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" - doins -r src/cliargs.lua src/cliargs - dodoc README.md - dodoc -r examples - docinto html - dodoc -r doc/* -} diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r1.ebuild new file mode 100644 index 000000000000..d3dd68867bec --- /dev/null +++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="${PV/_p/-}" + +inherit lua + +DESCRIPTION="A command-line argument parsing module for Lua" +HOMEPAGE="https://github.com/amireh/lua_cliargs" +SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="examples" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +BDEPEND="virtual/pkgconfig" + +HTML_DOCS=( "doc/." ) + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins -r src/. +} + +src_install() { + lua_foreach_impl lua_src_install + + use examples && dodoc -r examples + einstalldocs +} diff --git a/dev-lua/lua_cliargs/metadata.xml b/dev-lua/lua_cliargs/metadata.xml index 61ea9ce51390..5cd0e8ad0fa9 100644 --- a/dev-lua/lua_cliargs/metadata.xml +++ b/dev-lua/lua_cliargs/metadata.xml @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription> This module adds support for accepting CLI arguments easily using multiple notations and argument types. diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest index 57caad0b9572..96122383debe 100644 --- a/dev-lua/luacheck/Manifest +++ b/dev-lua/luacheck/Manifest @@ -1 +1 @@ -DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd +DIST luacheck-1.1.2.tar.gz 179240 BLAKE2B 52fdf895e14ec42f86078c9a0be3adc91b0d51c525281ec19cc41671437ca2a29a79c1a826026de11b433368b306ddf2b21473b90975d1de1c13b160d208a25b SHA512 38b22cc0fd00905572859092c4138081c5be434b6e3314bc6cee14b859b0fa1dbb078c6474588891ec3e75b378a7be9a09ee164a4ef9291378193f3bdda10365 diff --git a/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch new file mode 100644 index 000000000000..04d40ec958b6 --- /dev/null +++ b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch @@ -0,0 +1,13 @@ +--- a/spec/cli_spec.lua ++++ b/spec/cli_spec.lua +@@ -68,10 +68,6 @@ + assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config") + end) + +- it("allows measuring performance", function() +- assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config --profile") +- end) +- + it("removes ./ in the beginnings of file names", function() + assert.equal([[ + Checking spec/samples/good_code.lua OK diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0.ebuild deleted file mode 100644 index 0122b526457b..000000000000 --- a/dev-lua/luacheck/luacheck-0.20.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A tool for linting and static analysis of Lua code" -HOMEPAGE="https://github.com/mpeterv/luacheck" -SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="doc luajit test" - -RDEPEND=" - dev-lua/luafilesystem[luajit=] - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx ) - test? ( dev-lua/busted )" - -DOCS=( CHANGELOG.md README.md ) - -src_compile() { - if use doc; then - sphinx-build docsrc html || die - fi -} - -src_test() { - busted -o gtest || die -} - -src_install() { - local instdir - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" - insinto "${instdir#${EPREFIX}}" - doins -r src/luacheck - - newbin bin/luacheck.lua luacheck - - use doc && HTML_DOCS+=( html/. ) - - einstalldocs -} diff --git a/dev-lua/luacheck/luacheck-1.1.2.ebuild b/dev-lua/luacheck/luacheck-1.1.2.ebuild new file mode 100644 index 000000000000..e7f6b7200caa --- /dev/null +++ b/dev-lua/luacheck/luacheck-1.1.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="A tool for linting and static analysis of Lua code" +HOMEPAGE="https://github.com/lunarmodules/luacheck" +SRC_URI="https://github.com/lunarmodules/luacheck/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lua/lua-argparse[${LUA_USEDEP}] + dev-lua/lua-utf8[${LUA_USEDEP}] + dev-lua/luafilesystem[${LUA_USEDEP}] +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" ) + +src_compile() { + if use doc; then + sphinx-build docsrc html || die + fi +} + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto "$(lua_get_lmod_dir)" + doins -r src/luacheck +} + +src_install() { + lua_foreach_impl lua_src_install + + newbin bin/luacheck.lua luacheck + + use doc && local -a HTML_DOCS=( "html/." ) + einstalldocs +} diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml index 585b0dc75dda..8bc8d9434e33 100644 --- a/dev-lua/luacheck/metadata.xml +++ b/dev-lua/luacheck/metadata.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - </pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription lang="en"> + A tool for linting and static analysis of Lua code. + Luacheck supports checking Lua files using syntax of + Lua 5.1, Lua 5.2, Lua 5.3, Lua 5.4 and LuaJIT. + Luacheck itself is written in Lua and runs on all of mentioned Lua versions. + </longdescription> + <upstream> + <remote-id type="github">lunarmodules/luacheck</remote-id> + <remote-id type="github">mpeterv/luacheck</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest index e8f8a4c749f6..bf35ef5bb0e8 100644 --- a/dev-lua/luacov/Manifest +++ b/dev-lua/luacov/Manifest @@ -1 +1 @@ -DIST luacov-0.8.tar.gz 33613 BLAKE2B 942c47de25dbd53de445e1ed1fa924f1be278da4c3b134e4a603f4a5ab5090f87d762c48163cf82ed9bab585e35b0528c330b3dc849e0043ccc96532107c8a94 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11 +DIST luacov-0.15.0.tar.gz 52571 BLAKE2B f9d12295739b1461a4b9d698990430a17b5e73608bec062bf614c5ed84d91b86e2de61031275e0c767f61fcb1da0747dc2587aa0d6ef5ec119f809bf947c74ab SHA512 cab02c540aad905db1fecd7f62545157c8ff9ea82f9ea602bff7b6093e3940a3a316e212a2efe30fa2439435dae6cd4005c2ee41de6b937d3e5f447bc2128a59 diff --git a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch deleted file mode 100644 index 7a4ea6ba9ea7..000000000000 --- a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Makefile b/Makefile -index 477f9de..adad2cc 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,13 +6,13 @@ BINDIR=$(PREFIX)/bin - LUADIR=$(PREFIX)/share/lua/5.1/ - - install: -- mkdir -p $(BINDIR) -- cp src/bin/luacov $(BINDIR) -- chmod +x $(BINDIR)/luacov -- mkdir -p $(LUADIR) -- cp src/luacov.lua $(LUADIR) -- mkdir -p $(LUADIR)/luacov -- cp src/luacov/*.lua $(LUADIR)/luacov -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp src/bin/luacov $(DESTDIR)$(BINDIR) -+ chmod +x $(DESTDIR)$(BINDIR)/luacov -+ mkdir -p $(DESTDIR)$(LUADIR) -+ cp src/luacov.lua $(DESTDIR)$(LUADIR) -+ mkdir -p $(DESTDIR)$(LUADIR)/luacov -+ cp src/luacov/*.lua $(DESTDIR)$(LUADIR)/luacov - - dist: - rm -rf $(PACKAGE)-$(VERSION) diff --git a/dev-lua/luacov/luacov-0.15.0.ebuild b/dev-lua/luacov/luacov-0.15.0.ebuild new file mode 100644 index 000000000000..6ebf602b4270 --- /dev/null +++ b/dev-lua/luacov/luacov-0.15.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua + +DESCRIPTION="A simple coverage analyzer for Lua scripts" +HOMEPAGE="https://github.com/keplerproject/luacov" +SRC_URI="https://github.com/keplerproject/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +HTML_DOCS=( "docs/." ) + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto "$(lua_get_lmod_dir)" + doins src/luacov.lua + doins -r src/luacov +} + +src_install() { + lua_foreach_impl lua_src_install + + dobin src/bin/luacov + + einstalldocs +} diff --git a/dev-lua/luacov/luacov-0.8.ebuild b/dev-lua/luacov/luacov-0.8.ebuild deleted file mode 100644 index 280c33a87c1f..000000000000 --- a/dev-lua/luacov/luacov-0.8.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="LuaCov is a simple coverage analyzer for Lua scripts" -HOMEPAGE="https://github.com/keplerproject/luacov" -SRC_URI="https://github.com/keplerproject/luacov/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PF}-fix-makefile.patch -} - -src_compile() { - return 0 -} - -src_install() { - emake DESTDIR="${ED}" \ - PREFIX=/usr \ - LUADIR="$(pkg-config --variable INSTALL_LMOD lua)" install -dohtml -r doc/* - dodoc -r examples -} diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml index e9f9224d483a..8678dcf1b480 100644 --- a/dev-lua/luacov/metadata.xml +++ b/dev-lua/luacov/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - LuaCov is a coverage analyzer for Lua scripts. - </longdescription> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">keplerproject/luacov</remote-id> </upstream> diff --git a/dev-lua/luacrypto/Manifest b/dev-lua/luacrypto/Manifest deleted file mode 100644 index d3dbfcb1e563..000000000000 --- a/dev-lua/luacrypto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST luacrypto-0.3.2.tar.gz 374363 BLAKE2B 043ef787f9b99f7d25bfa9a96d2495f2bfbeec0200c956b978cfc003c51f0faba99848bf290e011a3f8ba8a50d99bf5b6f9b5346addcd57f71978a4af8f4117d SHA512 4cb20d2cc348a11f140210dffb803629034c72cc7232590f4488f559d5c7233e0c41e56fcd0863959ac0b07e64c9aa79ea573e4126fdc11bc3f1b3b49d13343e diff --git a/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch b/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch deleted file mode 100644 index 461e066865c2..000000000000 --- a/dev-lua/luacrypto/files/luacrypto-0.3.2-lualibdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- luacrypto-0.3.2/configure.ac -+++ luacrypto-0.3.2/configure.ac -@@ -31,7 +31,7 @@ - PKG_CHECK_MODULES([LUA], [lua]) - - # lua libdir --LUALIBDIR="`$PKGCONFIG --variable=libdir lua`" -+LUALIBDIR="`$PKGCONFIG --variable=INSTALL_CMOD lua`" - - # dest of headers - CRYPTOINC="${includedir}/${PACKAGE_NAME}" diff --git a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild deleted file mode 100644 index 2166a46878b5..000000000000 --- a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools - -DESCRIPTION="Lua frontend to OpenSSL" -HOMEPAGE="http://mkottman.github.io/luacrypto/ https://github.com/mkottman/luacrypto/" -SRC_URI="https://github.com/mkottman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" - -RDEPEND=" - >=dev-lang/lua-5.1:0 - !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${P}-lualibdir.patch - eautoreconf -} - -src_configure() { - econf --htmldir=/usr/share/doc/${PF}/html -} - -src_test() { - emake test -} - -src_install() { - default - prune_libtool_files --modules -} diff --git a/dev-lua/luacrypto/metadata.xml b/dev-lua/luacrypto/metadata.xml deleted file mode 100644 index b6155ce2e922..000000000000 --- a/dev-lua/luacrypto/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">mkottman/luacrypto</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest index 197912a61669..a23ac9b7eccf 100644 --- a/dev-lua/luadbi/Manifest +++ b/dev-lua/luadbi/Manifest @@ -1 +1,2 @@ -DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62 +DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9 +DIST luadbi-0.7.3.tar.gz 35753 BLAKE2B ff5fdd144560153fc74733131b48a60a14b7e95de5d6faaa982588cc5df28aa979aa805c5000fdc76fae98b99be4cc4ccb82938c8f6222bcdfe4fca4d12c9bfa SHA512 1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/0.5-r2-Makefile.patch deleted file mode 100644 index 98e4988b281b..000000000000 --- a/dev-lua/luadbi/files/0.5-r2-Makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/Makefile 2013-02-01 13:34:54.490898002 +0400 -+++ b/Makefile 2013-02-01 13:44:25.927772130 +0400 -@@ -1,5 +1,6 @@ - CC=gcc --CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I . -+INCLUDES=-I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I . -+CFLAGS+=-pedantic -shared -fpic $(INCLUDES) - AR=ar rcu - RANLIB=ranlib - RM=rm -rf -@@ -27,6 +27,14 @@ - DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o - ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o - -+INSTALL = install -+INSTALL_PROGRAM = $(INSTALL) -+INSTALL_DATA = $(INSTALL) -m 644 -+LUA_INC_DIR=/usr/include/lua5.1 -+LUA_LIB_DIR=/usr/lib -+INSTALL_DIR_LUA=/usr/share/lua/5.1 -+INSTALL_DIR_BIN=/usr/lib/lua/5.1 -+ - free: mysql psql sqlite3 - - all: mysql psql sqlite3 db2 oracle -@@ -90,3 +98,21 @@ - build: - $(MKDIR) ${BUILDDIR} - -+install_lua: -+ $(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua -+ -+install_mysql: install_lua -+ $(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL) -+ -+install_psql: install_lua -+ $(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL) -+ -+install_sqlite3: install_lua -+ $(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3) -+ -+install_db2: install_lua -+ $(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2) -+ -+install_oracle: install_lua -+ $(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE) -+ diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch new file mode 100644 index 000000000000..dfe3db4b030d --- /dev/null +++ b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type.patch @@ -0,0 +1,163 @@ +From 7f9c10e753325e3cc00d4955bf9d6a77a896bdcb Mon Sep 17 00:00:00 2001 +From: Matthew Wild <mwild1@gmail.com> +Date: Thu, 5 Sep 2019 14:25:20 +0100 +Subject: [PATCH 1/3] MySQL: Don't set (unused) field is_null to nonsense + value, fixes #56 + +--- + dbd/mysql/statement.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c +index aca865a..dd01c1e 100644 +--- a/dbd/mysql/statement.c ++++ b/dbd/mysql/statement.c +@@ -218,7 +218,6 @@ static int statement_execute(lua_State *L) { + switch(type) { + case LUA_TNIL: + bind[i].buffer_type = MYSQL_TYPE_NULL; +- bind[i].is_null = (int*)1; + break; + + case LUA_TBOOLEAN: + +From 83954fe0ba8c83fbe9351937e0d30b9c842dadb1 Mon Sep 17 00:00:00 2001 +From: Matthew Wild <mwild1@gmail.com> +Date: Thu, 5 Sep 2019 14:26:04 +0100 +Subject: [PATCH 2/3] Add test for handling of NULL values + +--- + tests/run_tests.lua | 48 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/tests/run_tests.lua b/tests/run_tests.lua +index 0dd9f72..80526b6 100755 +--- a/tests/run_tests.lua ++++ b/tests/run_tests.lua +@@ -301,6 +301,51 @@ local function test_insert_multi() + + end + ++local function test_insert_null() ++ ++ local sth, sth2, err, success ++ local stringy = os.date() ++ ++ ++ sth, err = dbh:prepare(code('insert')) ++ ++ assert.is_nil(err) ++ assert.is_not_nil(sth) ++ ++ success, err = sth:execute(nil) ++ ++ assert.is_true(success) ++ assert.is_nil(err) ++ ++ assert.is_equal(1, sth:affected()) ++ ++ -- ++ -- Grab it back, make sure it's all good ++ -- ++ ++ local id = dbh:last_id() ++ assert.is_not_nil(id) ++ sth:close() ++ ++ sth2, err = dbh:prepare(code('insert_select')) ++ ++ assert.is_nil(err) ++ assert.is_not_nil(sth) ++ ++ success, err = sth2:execute(id) ++ ++ assert.is_true(success) ++ assert.is_nil(err) ++ ++ local row = sth2:rows(false)() ++ assert.is_not_nil(row) ++ assert.are_equal(id, row[1]) ++ assert.is_nil(row[2]) ++ ++ sth:close() ++ sth2:close() ++ ++end + + local function test_insert_returning() + +@@ -494,6 +539,7 @@ describe("PostgreSQL #psql", function() + it( "Tests a simple select", test_select ) + it( "Tests multi-row selects", test_select_multi ) + it( "Tests inserts", test_insert_returning ) ++ it( "Tests inserts of NULL", test_insert_null ) + it( "Tests statement reuse", test_insert_multi ) + it( "Tests no insert_id", test_no_insert_id ) + it( "Tests affected rows", test_update ) +@@ -514,6 +560,7 @@ describe("SQLite3 #sqlite3", function() + it( "Tests simple selects", test_select ) + it( "Tests multi-row selects", test_select_multi ) + it( "Tests inserts", test_insert ) ++ it( "Tests inserts of NULL", test_insert_null ) + it( "Tests statement reuse", test_insert_multi ) + it( "Tests no rowcount", test_no_rowcount ) + it( "Tests affected rows", test_update ) +@@ -534,6 +581,7 @@ describe("MySQL #mysql", function() + it( "Tests simple selects", test_select ) + it( "Tests multi-row selects", test_select_multi ) + it( "Tests inserts", test_insert ) ++ it( "Tests inserts of NULL", test_insert_null ) + it( "Tests statement reuse", test_insert_multi ) + it( "Tests affected rows", test_update ) + it( "Tests closing dbh doesn't segfault", test_db_close_doesnt_segfault ) + +From 4555eb0a63945e829ffba635cac87b9e22155ffc Mon Sep 17 00:00:00 2001 +From: Matthew Wild <mwild1@gmail.com> +Date: Thu, 5 Sep 2019 14:35:52 +0100 +Subject: [PATCH 3/3] tests/schemas: allow null inserts for testing + +--- + tests/schemas/mysql.sql | 2 +- + tests/schemas/postgresql.sql | 2 +- + tests/schemas/sqlite3.sql | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/schemas/mysql.sql b/tests/schemas/mysql.sql +index 1134e64..2948075 100644 +--- a/tests/schemas/mysql.sql ++++ b/tests/schemas/mysql.sql +@@ -46,7 +46,7 @@ drop table if exists insert_tests; + create table insert_tests + ( + id int not null primary key auto_increment, +- val varchar(255) not null ++ val varchar(255) + ); + + grant insert, select on insert_tests to 'luadbi'@'%'; +diff --git a/tests/schemas/postgresql.sql b/tests/schemas/postgresql.sql +index f430516..efe23f3 100644 +--- a/tests/schemas/postgresql.sql ++++ b/tests/schemas/postgresql.sql +@@ -47,7 +47,7 @@ drop table if exists insert_tests cascade; + create table insert_tests + ( + id serial primary key, +- val varchar(255) not null ++ val varchar(255) + ); + + grant insert, select on insert_tests to luadbi; +diff --git a/tests/schemas/sqlite3.sql b/tests/schemas/sqlite3.sql +index d3ba4bc..3bf0eb0 100644 +--- a/tests/schemas/sqlite3.sql ++++ b/tests/schemas/sqlite3.sql +@@ -44,7 +44,7 @@ drop table if exists insert_tests; + create table insert_tests + ( + id integer primary key, +- val varchar(255) not null ++ val varchar(255) + ); + + drop table if exists update_tests; diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type2.patch b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type2.patch new file mode 100644 index 000000000000..22a6e7c7e881 --- /dev/null +++ b/dev-lua/luadbi/files/luadbi-0.7.2-incompatible-pointer-type2.patch @@ -0,0 +1,29 @@ +--- a/dbd/mysql/statement.c ++++ b/dbd/mysql/statement.c +@@ -226,7 +226,7 @@ + *boolean = lua_toboolean(L, p); + + bind[i].buffer_type = MYSQL_TYPE_LONG; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = false; + bind[i].buffer = (char *)boolean; + bind[i].length = 0; + break; +@@ -241,7 +241,7 @@ + *num = lua_tonumber(L, p); + + bind[i].buffer_type = MYSQL_TYPE_DOUBLE; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = false; + bind[i].buffer = (char *)num; + bind[i].length = 0; + break; +@@ -252,7 +252,7 @@ + str = lua_tolstring(L, p, str_len); + + bind[i].buffer_type = MYSQL_TYPE_STRING; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = false; + bind[i].buffer = (char *)str; + bind[i].length = str_len; + break; diff --git a/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch new file mode 100644 index 000000000000..ef463433357e --- /dev/null +++ b/dev-lua/luadbi/files/luadbi-0.7.2-mysql-8.patch @@ -0,0 +1,55 @@ +From b72503cad0654878841172451b2ea860a59e30c1 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki <conrad@kostecki.com> +Date: Tue, 13 Oct 2020 07:34:16 +0200 +Subject: [PATCH] dbd/mysql/statement.c: fix compilation with mysql-8 + +Signed-off-by: Conrad Kostecki <conrad@kostecki.com> +--- + dbd/mysql/dbd_mysql.h | 2 +- + dbd/mysql/statement.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/dbd/mysql/dbd_mysql.h b/dbd/mysql/dbd_mysql.h +index 233bc35..4777289 100644 +--- a/dbd/mysql/dbd_mysql.h ++++ b/dbd/mysql/dbd_mysql.h +@@ -3,7 +3,7 @@ + #endif + + +-#include <mysql.h> ++#include <mysql/mysql.h> + #include <dbd/common.h> + + #define DBD_MYSQL_CONNECTION "DBD.MySQL.Connection" +diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c +index aca865a..6af4c39 100644 +--- a/dbd/mysql/statement.c ++++ b/dbd/mysql/statement.c +@@ -424,7 +424,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_ + + if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) { + char str[20]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second); + +@@ -435,7 +435,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_ + } + } else if (fields[i].type == MYSQL_TYPE_TIME) { + char str[9]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second); + +@@ -446,7 +446,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_ + } + } else if (fields[i].type == MYSQL_TYPE_DATE) { + char str[20]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day); + diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild deleted file mode 100644 index e1cdb2f76572..000000000000 --- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="DBI module for Lua" -HOMEPAGE="https://code.google.com/p/luadbi/" -SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="mysql postgres +sqlite" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -RDEPEND=">=dev-lang/lua-5.1 - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - sqlite? ( >=dev-db/sqlite-3 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-r2-Makefile.patch - sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" \ - -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" \ - -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" \ - -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" \ - -e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die - - drivers="" - - if use mysql; then - drivers+="mysql " - sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \ - -e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die - fi - - if use postgres; then - drivers+="psql " - sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \ - -e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die - fi - - use sqlite && drivers+="sqlite3" -} - -src_compile() { - append-flags -fPIC - for driver in ${drivers}; do - emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver} - done -} - -src_install() { - for driver in ${drivers}; do - emake DESTDIR="${D}" "install_${driver// /}" - done -} diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild deleted file mode 100644 index 2f194b5ab36c..000000000000 --- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="DBI module for Lua" -HOMEPAGE="https://code.google.com/p/luadbi/" -SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="mysql postgres +sqlite" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -RDEPEND=">=dev-lang/lua-5.1 - mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql ) - sqlite? ( >=dev-db/sqlite-3 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}" - -PATCHES=( "${FILESDIR}"/${PV}-r2-Makefile.patch ) - -src_prepare() { - default - local pkgconf=$(tc-getPKG_CONFIG) - sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(${pkgconf} --variable INSTALL_LMOD lua)#" \ - -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(${pkgconf} --variable INSTALL_CMOD lua)#" \ - -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(${pkgconf} --variable INSTALL_INC lua)#" \ - -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(${pkgconf} --variable INSTALL_LIB lua)#" \ - -e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die - - drivers="" - - if use mysql; then - drivers+="mysql " - sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \ - -e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die - fi - - if use postgres; then - drivers+="psql " - sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \ - -e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die - fi - - use sqlite && drivers+="sqlite3" -} - -src_compile() { - append-flags -fPIC - for driver in ${drivers}; do - emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver} - done -} - -src_install() { - for driver in ${drivers}; do - emake DESTDIR="${D}" "install_${driver// /}" - done -} diff --git a/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild new file mode 100644 index 000000000000..f6a6bb822552 --- /dev/null +++ b/dev-lua/luadbi/luadbi-0.7.2-r2.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A database interface library for Lua" +HOMEPAGE="https://github.com/mwild1/luadbi" +SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="mysql postgres +sqlite test" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + || ( mysql postgres sqlite ) +" +RESTRICT="test" + +RDEPEND=" + ${LUA_DEPS} + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/luarocks + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" + "${FILESDIR}/${PN}-0.7.2-incompatible-pointer-type.patch" + "${FILESDIR}/${PN}-0.7.2-incompatible-pointer-type2.patch" +) + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + tc-export AR CC + + local myemakeargs=( + "LUA_INC=$(lua_get_CFLAGS)" + ) + + use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql + use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql + use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + cd "${S}"/tests && ${ELUA} run_tests.lua || die + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + DESTDIR="${ED}" + LUA_CDIR="$(lua_get_cmod_dir)" + LUA_INC="$(lua_get_CFLAGS)" + LUA_LDIR="$(lua_get_lmod_dir)" + ) + + use mysql && emake ${myemakeargs[@]} install_mysql + use postgres && emake ${myemakeargs[@]} install_psql + use sqlite && emake ${myemakeargs[@]} install_sqlite3 + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luadbi/luadbi-0.7.3.ebuild b/dev-lua/luadbi/luadbi-0.7.3.ebuild new file mode 100644 index 000000000000..a018a850e8e3 --- /dev/null +++ b/dev-lua/luadbi/luadbi-0.7.3.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A database interface library for Lua" +HOMEPAGE="https://github.com/mwild1/luadbi" +SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="mysql postgres +sqlite test" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + || ( mysql postgres sqlite ) +" +RESTRICT="test" + +RDEPEND=" + ${LUA_DEPS} + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/luarocks + ) +" + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + tc-export AR CC + + local myemakeargs=( + "LUA_INC=$(lua_get_CFLAGS)" + ) + + use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql + use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql + use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + cd "${S}"/tests && ${ELUA} run_tests.lua || die + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + DESTDIR="${ED}" + LUA_CDIR="$(lua_get_cmod_dir)" + LUA_INC="$(lua_get_CFLAGS)" + LUA_LDIR="$(lua_get_lmod_dir)" + ) + + use mysql && emake ${myemakeargs[@]} install_mysql + use postgres && emake ${myemakeargs[@]} install_psql + use sqlite && emake ${myemakeargs[@]} install_sqlite3 + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml index 2ff9f66c8898..ecc5f304144a 100644 --- a/dev-lua/luadbi/metadata.xml +++ b/dev-lua/luadbi/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> - <remote-id type="google-code">luadbi</remote-id> + <remote-id type="github">mwild1/luadbi</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/luadoc/Manifest b/dev-lua/luadoc/Manifest deleted file mode 100644 index af6b1b70a67a..000000000000 --- a/dev-lua/luadoc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST luadoc-3.0.1.tar.gz 108824 BLAKE2B 52092feeb22cdcd7570ba5d54c57598d16688daba7c90d81dc975cfd2545c5e42e6f4b8f1bdc150c877f6b953cbb193d03d1a02f0ac48cfbc5cf1ec4a91b101c SHA512 413b40e72cc0699c00caf47fe3d7233c8619bfd6064eac001762bcb2ae0b21ccc6f800bd05566cd83924546e5616d1e5840d8bc20ec6d1f1c7a64910a9df6be2 diff --git a/dev-lua/luadoc/luadoc-3.0.1.ebuild b/dev-lua/luadoc/luadoc-3.0.1.ebuild deleted file mode 100644 index 93cd498bdc02..000000000000 --- a/dev-lua/luadoc/luadoc-3.0.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit multilib -DESCRIPTION="LuaDoc is a documentation tool for Lua source code" -HOMEPAGE="http://luadoc.luaforge.net/" -SRC_URI="http://luaforge.net/frs/download.php/3185/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-lang/lua-5.1.3 - dev-lua/luafilesystem" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e "s|/usr/local|\$(DESTDIR)/usr|" \ - -e "s|lib|$(get_libdir)|" \ - -e "s|lua5.1|lua|" \ - config || die - - # lua-5.1.3 - find . -name '*.lua' | xargs sed -i -e "s/gfind/gmatch/g" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README - dohtml -r doc/us/* -} diff --git a/dev-lua/luadoc/metadata.xml b/dev-lua/luadoc/metadata.xml deleted file mode 100644 index fe12f6f53b37..000000000000 --- a/dev-lua/luadoc/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> - <longdescription lang="en"> - LuaDoc is a documentation generator tool for Lua source code. - It parses the declarations and documentation comments in a set of Lua - source files and produces a set of XHTML pages describing the commented - declarations and functions. - </longdescription> -</pkgmetadata> diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest index 3d8697f3af9b..c02ce0b39725 100644 --- a/dev-lua/luaevent/Manifest +++ b/dev-lua/luaevent/Manifest @@ -1,2 +1 @@ -DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913 diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild deleted file mode 100644 index 57fc5cf893f5..000000000000 --- a/dev-lua/luaevent/luaevent-0.4.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit toolchain-funcs - -DESCRIPTION="libevent bindings for Lua" -HOMEPAGE="http://luaforge.net/projects/luaevent" -SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND="dev-lang/lua:0 - dev-libs/libevent:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \ - || die "sed failed" - sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \ - || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" -} diff --git a/dev-lua/luaevent/luaevent-0.4.6-r1.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r1.ebuild new file mode 100644 index 000000000000..8088a451e565 --- /dev/null +++ b/dev-lua/luaevent/luaevent-0.4.6-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Binding of libevent for Lua" +HOMEPAGE="http://luaforge.net/projects/luaevent" +SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + dev-libs/libevent:0= +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + local mysedargs=( + -e "'s/CFLAGS =/CFLAGS +=/'" + -e "'s/LDFLAGS =/LDFLAGS +=/'" + -e "'s:-I\$(LUA_INC_DIR):\$(LUA_INC_DIR):'" + -i Makefile + ) + + eval sed ${mysedargs[@]} || die +} + +lua_src_compile() { + tc-export CC + + emake LUA_INC_DIR="$(lua_get_CFLAGS)" +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + local myemakeargs=( + DESTDIR="${ED}" + INSTALL_DIR_BIN="$(lua_get_cmod_dir)" + INSTALL_DIR_LUA="$(lua_get_lmod_dir)" + LUA_INC_DIR="$(lua_get_CFLAGS)" + ) + + emake ${myemakeargs[@]} install +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild deleted file mode 100644 index 84700e9d48e4..000000000000 --- a/dev-lua/luaevent/luaevent-0.4.6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="libevent bindings for Lua" -HOMEPAGE="http://luaforge.net/projects/luaevent" -SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="dev-lang/lua:0 - dev-libs/libevent:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \ - || die "sed failed" - sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \ - || die "sed failed" - sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \ - || die "sed failed" - eapply_user -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" -} diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml index 1bedf880cb6c..d7c18c6176c1 100644 --- a/dev-lua/luaevent/metadata.xml +++ b/dev-lua/luaevent/metadata.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - </maintainer> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">harningt/luaevent</remote-id> - </upstream> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">harningt/luaevent</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest index a5190ff3d7a6..77295d9bb3bb 100644 --- a/dev-lua/luaexpat/Manifest +++ b/dev-lua/luaexpat/Manifest @@ -1,2 +1 @@ -DIST luaexpat-1.2.0.tar.gz 28621 BLAKE2B d47a8c909d10afc103a48a8b4812a9afb15343a31e5106bfc9fa32c5cae2f0db7e1caeb65fd680852f1563dae682c328604f84aea3b7028d0472f08ad790823c SHA512 4f28e36fabcade14f9ae524b8aea19757ceaca9d4ad50c367fe8f58c14c3850efe252df780641159eeb01e96aaba38a9c9c6fe51d21f54a6c4ce33f80c87033f -DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae +DIST luaexpat-1.5.1.tar.gz 53912 BLAKE2B 0e8aa342864159e7a3f3ac21bfd65a7fb4378fc51b5889a93f8c00fd497f985bf194b3889d39f28ca097fd84a6160c9804d5957744a7ac9a002d1a0b6969abf3 SHA512 45834b02d863a65c6de2ad3c5c671935ae512dd906233a647269438aeeb37c7bbd6e7166aefd8da72480b33e1aa79a86ed070ed8800a8e0f303ccc74918f3bb8 diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch deleted file mode 100644 index 754fe27c8419..000000000000 --- a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- makefile.bak 2012-03-01 13:44:47.000000000 +0100 -+++ makefile 2012-03-01 13:45:50.000000000 +0100 -@@ -12,17 +12,17 @@ - lib: src/$(LIBNAME) - - src/$(LIBNAME) : $(OBJS) -- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat -+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(LDFLAGS) $(OBJS) -lexpat - - $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c -- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c -+ $(CC) -c $(CFLAGS) $(LDFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c - - install: -- mkdir -p $(LUA_LIBDIR) -- cp src/$(LIBNAME) $(LUA_LIBDIR) -- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so -- mkdir -p $(LUA_DIR)/$T -- cp src/$T/lom.lua $(LUA_DIR)/$T -+ mkdir -p $(DESTDIR)$(LUA_LIBDIR) -+ cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR) -+ cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so -+ mkdir -p $(DESTDIR)$(LUA_DIR)/$T -+ cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T - - clean: - rm -f src/$(LIBNAME) $(OBJS) diff --git a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild deleted file mode 100644 index 79fc45c14b42..000000000000 --- a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs flag-o-matic eutils - -DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library" -HOMEPAGE="http://www.keplerproject.org/luaexpat/" -SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~mips x86" -IUSE="" - -RDEPEND=">=dev-lang/lua-5.1[deprecated] - dev-libs/expat" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i -e "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/config" - sed -i -e "s#^LUA_DIR=.*#LUA_DIR=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/config" - sed -i -e "s#^LUA_INC=.*#LUA_INC=$(pkg-config --variable INSTALL_INC lua)#" "${S}/config" - sed -i -e "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" "${S}/config" - sed -i -e "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" "${S}/config" - epatch "${FILESDIR}/${PV}-destdir-ldflags.patch" -} - -src_compile() { - append-flags -fPIC - emake \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC) -shared" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README - dohtml -r doc/* -} diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild deleted file mode 100644 index 26b4cdecaef2..000000000000 --- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs flag-o-matic eutils multilib-minimal - -DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library" -HOMEPAGE="http://www.keplerproject.org/luaexpat/" -SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}] - >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -src_prepare() { - multilib_copy_sources - - append-flags -fPIC -} - -multilib_src_compile() { - emake \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC) -shared" \ - LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \ - LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \ - LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)" -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \ - LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \ - LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)" \ - install -} - -multilib_src_install_all() { - dodoc README - dohtml -r doc/* -} diff --git a/dev-lua/luaexpat/luaexpat-1.5.1.ebuild b/dev-lua/luaexpat/luaexpat-1.5.1.ebuild new file mode 100644 index 000000000000..653582b9bb6d --- /dev/null +++ b/dev-lua/luaexpat/luaexpat-1.5.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A SAX XML parser based on the Expat library" +HOMEPAGE="https://github.com/lunarmodules/luaexpat" +SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + dev-libs/expat + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +HTML_DOCS=( "docs/." ) + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O2//g' -i Makefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA_INC=$(lua_get_CFLAGS)" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "DESTDIR=${ED}" + "LUA_CDIR=$(lua_get_cmod_dir)" + "LUA_INC=$(lua_get_include_dir)" + "LUA_LDIR=$(lua_get_lmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml index 379d1734e2d3..8c09ba70bf56 100644 --- a/dev-lua/luaexpat/metadata.xml +++ b/dev-lua/luaexpat/metadata.xml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/lunarmodules/luaexpat/issues</bugs-to> + <remote-id type="github">luaexpat/issues</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest index 7059285c0f07..b050fb3c8c4e 100644 --- a/dev-lua/luafilesystem/Manifest +++ b/dev-lua/luafilesystem/Manifest @@ -1,3 +1 @@ -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.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247 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 f93c58976e06..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="mirror://github/keplerproject/luafilesystem/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd" -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 || die - dodoc README || die - dohtml doc/us/* || die -} 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 9995175daabd..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="mirror://github/keplerproject/luafilesystem/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" -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 7efb3954a6b5..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 ~x86-fbsd" -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.8.0-r101.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild new file mode 100644 index 000000000000..a9140fcba06d --- /dev/null +++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} 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 ~ia64 ~mips ppc ppc64 ~riscv 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() { + pushd "${BUILD_DIR}" || die + 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 + popd +} + +src_prepare() { + default + + lua_copy_sources + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + emake CONFIG="config-${ELUA}" + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + LUA_CPATH="${BUILD_DIR}/src/?.so" ${ELUA} tests/test.lua || die + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + emake CONFIG="config-${ELUA}" install + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml index 59f1123dc93b..f742c21831c5 100644 --- a/dev-lua/luafilesystem/metadata.xml +++ b/dev-lua/luafilesystem/metadata.xml @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</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. LuaFileSystem offers a portable way to access the underlying directory structure and file attributes. </longdescription> + <upstream> + <remote-id type="github">keplerproject/luafilesystem</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest index 94e156d2659b..5f2473690bc4 100644 --- a/dev-lua/luajson/Manifest +++ b/dev-lua/luajson/Manifest @@ -1 +1 @@ -DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2 +DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7 diff --git a/dev-lua/luajson/luajson-1.3.3.ebuild b/dev-lua/luajson/luajson-1.3.3.ebuild deleted file mode 100644 index 78c00286a7b2..000000000000 --- a/dev-lua/luajson/luajson-1.3.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="JSON Parser/Constructor for Lua" -HOMEPAGE="https://www.eharning.us/wiki/luajson/" -SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" -IUSE="test" - -RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) - dev-lua/lpeg" -DEPEND="test? ( dev-lua/luafilesystem )" - -# lunit not in the tree yet -RESTRICT="test" - -# nothing to compile -src_compile() { :; } - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install - dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt -} diff --git a/dev-lua/luajson/luajson-1.3.4.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild new file mode 100644 index 000000000000..cabddc0c9358 --- /dev/null +++ b/dev-lua/luajson/luajson-1.3.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="JSON Parser/Constructor for Lua" +HOMEPAGE="https://www.eharning.us/wiki/luajson/" +SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="dev-lua/lpeg[${LUA_USEDEP}]" + +# Require lunitx, which is not in the tree yet +RESTRICT="test" + +DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt ) + +# nothing to compile +src_compile() { :; } + +lua_src_install() { + emake DESTDIR="${ED}" INSTALL_LMOD="$(lua_get_lmod_dir)" install +} + +src_install() { + lua_foreach_impl lua_src_install + einstalldocs +} diff --git a/dev-lua/luajson/metadata.xml b/dev-lua/luajson/metadata.xml index 1bb1a0290ad3..b201c0bb4186 100644 --- a/dev-lua/luajson/metadata.xml +++ b/dev-lua/luajson/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">harningt/luajson</remote-id> - </upstream> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">harningt/luajson</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest index 727dc31550e3..eaf86455ed5a 100644 --- a/dev-lua/lualdap/Manifest +++ b/dev-lua/lualdap/Manifest @@ -1 +1,2 @@ -DIST lualdap-1.2.0.tar.xz 12380 BLAKE2B 42bf8633a5ccd60f6082b8729b9ba77c8f5486a7bab6cf727fc011856fec244de9f0fa96dd53c23a3fb5932a1670bbb621739c965618671c2c856c41e3faffbb SHA512 02cd3089dc6ca1f60957fa4733dae3cbfb2e13c25b068ddeb51b059701278eb86e359d56a6ef1df28cf514193311323255b36ff036bafda9fcbae0676d90a238 +DIST lualdap-1.3.1.tar.gz 82290 BLAKE2B 8436f1b3cf6497a3aea19de74a2e06bf2bb9ba4951d7357584c5b29a4d37ea2c5d4877d6ea3d44fca42d19207366abdf6a017ce1953d283a7bc243d230081077 SHA512 29d622ecf63214ac26ade71478c383e4f1b7468097bf19b99b8209b3f6cbb2078298a149d64ba8a7ca4abe97aa45550982792fa4ac0a8014f7daf709fe725e9f +DIST lualdap-1.4.0.tar.gz 83205 BLAKE2B 8e56cbf8f772fd4bac3e4d545741d51adc447cdc00a4ccaa390af3ddbd035de9fe7b0a652ce71da869f74ba241c51f2a63835f2f200e9454a058e123d4acbf5f SHA512 92d6cb81adfb9fc21ba21d6e765f70c1eb0e30bd04d5fabc2bec2a9e22850c5ab1586bf866f01a871e72a705de93d61be2545edf3d9b25011f74f2a5c4e46d32 diff --git a/dev-lua/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild deleted file mode 100644 index 38007f295ddf..000000000000 --- a/dev-lua/lualdap/lualdap-1.2.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -MY_PN="LuaLDAP" - -DESCRIPTION="Simple interface from Lua to OpenLDAP" -HOMEPAGE="https://git.zx2c4.com/lualdap/about/" -SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -RDEPEND="dev-lang/lua:* net-nds/openldap" -DEPEND="${RDEPEND} - net-nds/openldap - virtual/pkgconfig" diff --git a/dev-lua/lualdap/lualdap-1.3.1.ebuild b/dev-lua/lualdap/lualdap-1.3.1.ebuild new file mode 100644 index 000000000000..36fc9c5c764e --- /dev/null +++ b/dev-lua/lualdap/lualdap-1.3.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A lua binding for the OpenLDAP client libraries" +HOMEPAGE="https://github.com/lualdap/lualdap" +SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND=" + net-nds/openldap:= + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LBER_LIBDIR=/usr/$(get_libdir)" + "LDAP_LIBDIR=/usr/$(get_libdir)" + "LUA_INCDIR=$(lua_get_include_dir)" + "LUA_LIBDIR=/usr/$(get_libdir)" + ) + + emake "${myemakeargs[@]}" + + popd || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua || die + popd || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + # Workaround, as 'make install' does not create this directory + dodir "$(lua_get_cmod_dir)" + + local myemakeargs=( + "DESTDIR=${ED}" + "INST_LIBDIR=$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lualdap/lualdap-1.4.0.ebuild b/dev-lua/lualdap/lualdap-1.4.0.ebuild new file mode 100644 index 000000000000..36fc9c5c764e --- /dev/null +++ b/dev-lua/lualdap/lualdap-1.4.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A lua binding for the OpenLDAP client libraries" +HOMEPAGE="https://github.com/lualdap/lualdap" +SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND=" + net-nds/openldap:= + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LBER_LIBDIR=/usr/$(get_libdir)" + "LDAP_LIBDIR=/usr/$(get_libdir)" + "LUA_INCDIR=$(lua_get_include_dir)" + "LUA_LIBDIR=/usr/$(get_libdir)" + ) + + emake "${myemakeargs[@]}" + + popd || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua || die + popd || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + # Workaround, as 'make install' does not create this directory + dodir "$(lua_get_cmod_dir)" + + local myemakeargs=( + "DESTDIR=${ED}" + "INST_LIBDIR=$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml index 485a025884ba..a2be82f4b892 100644 --- a/dev-lua/lualdap/metadata.xml +++ b/dev-lua/lualdap/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>chainsaw@gentoo.org</email> - <name>Tony Vroon</name> - </maintainer> - <maintainer type="person"> <email>zx2c4@gentoo.org</email> <name>Jason A. Donenfeld</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">lualdap/lualdap</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest index 7afba5248fd4..d5cb892cc7f3 100644 --- a/dev-lua/luaossl/Manifest +++ b/dev-lua/luaossl/Manifest @@ -1,3 +1 @@ -DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f381496837924ce999a58a4528a46b1b43fdd7b14041bab2a4536c89a37c6f31926f353d1bb1997e9ffd57ab6e2cfb83b6ef SHA512 de565ff7b9ac07493e771045b05902dd64e8b6c458180dd03d08cf900067d1b9cb88385c69dc29fb45774e4ec36b563cab705b34d37cec2f5cc792cf4f7b5049 -DIST luaossl-rel-20180708.tar.gz 455381 BLAKE2B d57e27638e6aee44a94f85094bab9161f0b87bdb379863fdef4517a1cb3415f4ef7e62967ee1e3fa2dde4d5629a24d732dc8ea0fd2ea54ccd84f69c4b18e2c57 SHA512 b2a73a7e7ace9a01c8c5a26603107f7741de88de32c393ed9134b70d55278c81d48e357955e671654825de282449b9570ecdc6a4fbcf4890439c0200ba471338 -DIST luaossl-rel-20181207.tar.gz 472294 BLAKE2B 1dd991cd73a432b7f8918d391bd3cbea98d77d4bd6390815840e3c7f63e98b9bcca6d9a4841da663ba7ecaa19880a4f3db4fce09d47d103cfd85f8d920efe84d SHA512 e5412c115d0dda3b3f2446ffd9a8d9b78be3800e834d7a43ec2cde16e56798fe2467d91add3ab8030321e6bf1a12349ecd5987dd88216ab0d7ba4ff451f0fb91 +DIST luaossl-rel-20220711.tar.gz 505174 BLAKE2B be8736c9198c2c602ab4495f5498e96c90c66ac2712c4c299e3279fa5acd9168fcac29730f1db000eb908ca5f0a2215856c75bbd4a2cf3927cbdf82615160467 SHA512 13c51881218a5a9995d195d4781f6871f0dfe58f061b85dd997b98ec970a38302ac6b057b7987bff5f7719bfdb826aae09f602ea8db5e4b2d462648ad0236909 diff --git a/dev-lua/luaossl/luaossl-20150727.ebuild b/dev-lua/luaossl/luaossl-20150727.ebuild deleted file mode 100644 index b0a610625a0f..000000000000 --- a/dev-lua/luaossl/luaossl-20150727.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe." -HOMEPAGE="https://github.com/wahern/luaossl" -SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="luajit" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - dev-libs/openssl:0[-bindist] - !dev-lua/lua-openssl" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-rel-${PV}" - -src_prepare() { - local version_var= - local engine= - - use luajit && engine=luajit || engine=lua - use luajit && version_var=abiver || version_var=V - - LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=${version_var} ${engine})" -} - -src_compile() { - emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION} -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION} -} diff --git a/dev-lua/luaossl/luaossl-20180708.ebuild b/dev-lua/luaossl/luaossl-20180708.ebuild deleted file mode 100644 index fd7565276080..000000000000 --- a/dev-lua/luaossl/luaossl-20180708.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P=${PN}-rel-${PV} -DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe." -HOMEPAGE="https://github.com/wahern/luaossl" -SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="luajit" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - dev-libs/openssl:0[-bindist] - !dev-lua/lua-openssl" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))" -} - -src_compile() { - emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION} -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION} -} diff --git a/dev-lua/luaossl/luaossl-20181207.ebuild b/dev-lua/luaossl/luaossl-20181207.ebuild deleted file mode 100644 index 300a08cda740..000000000000 --- a/dev-lua/luaossl/luaossl-20181207.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P=${PN}-rel-${PV} -DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe." -HOMEPAGE="https://github.com/wahern/luaossl" -SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="luajit" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - dev-libs/openssl:0[-bindist] - !dev-lua/lua-openssl" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))" -} - -src_compile() { - emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION} -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION} -} diff --git a/dev-lua/luaossl/luaossl-20220711.ebuild b/dev-lua/luaossl/luaossl-20220711.ebuild new file mode 100644 index 000000000000..125f5e9215b0 --- /dev/null +++ b/dev-lua/luaossl/luaossl-20220711.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_P="${PN}-rel-${PV}" + +inherit lua toolchain-funcs + +DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe" +HOMEPAGE="https://github.com/wahern/luaossl" +SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + dev-libs/openssl:0=[-bindist(-)] + !dev-lua/lua-openssl + !dev-lua/luasec + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( "doc/." ) + +src_prepare() { + default + + # Remove Lua autodetection + # Respect users CFLAGS + sed \ + -e '/LUAPATH :=/d' \ + -e '/LUAPATH_FN =/d' \ + -e '/HAVE_API_FN =/d' \ + -e '/WITH_API_FN/d' \ + -e 's/-O2//g' \ + -i GNUmakefile || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} != luajit ]]; then + LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" + else + # This is a workaround for luajit, as it confirms to lua5.1 + # and the 'GNUmakefile' doesn't understand LuaJITs version. + LUA_VERSION="5.1" + fi + + local myemakeargs=( + "CC=$(tc-getCC)" + "ALL_CPPFLAGS=${CPPFLAGS} $(lua_get_CFLAGS)" + "libdir=" + ) + + emake "${myemakeargs[@]}" openssl${LUA_VERSION} + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} != luajit ]]; then + LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" + else + # This is a workaround for luajit, as it confirms to lua5.1 + # and the 'GNUmakefile' doesn't understand LuaJITs version. + LUA_VERSION="5.1" + fi + + local myemakeargs=( + "DESTDIR=${D}" + "lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)" + "lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)" + "prefix=${EPREFIX}/usr" + ) + + emake "${myemakeargs[@]}" install${LUA_VERSION} + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + use examples && dodoc -r "examples/." + einstalldocs +} diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml index 8056c7be9898..76d042b914d7 100644 --- a/dev-lua/luaossl/metadata.xml +++ b/dev-lua/luaossl/metadata.xml @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>crito@fnordpipe.org</email> <name>Matthias Hauber</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> <remote-id type="github">wahern/luaossl</remote-id> </upstream> diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest index bf3cf9b13a23..7a5009c06f9d 100644 --- a/dev-lua/luaposix/Manifest +++ b/dev-lua/luaposix/Manifest @@ -1 +1 @@ -DIST luaposix-33.4.0.tar.gz 643523 BLAKE2B e407363eb6410d2636024371a169eefe8d0bc633b9fcbad6c2e7edb413b4aa0fc681e94b35c9ea39a561ecdcf225af1033ded1c67d87cd57bed2ba3e0d795aab SHA512 3cb78ccb343a55e2bf5b182410e2050356379e8f7a86d42a79853db6198628cae85f9984854f99f41505cb7e4fbb5288e4a46633a6db459649837729af76044c +DIST luaposix-36.2.1.tar.gz 188010 BLAKE2B 7f1d3cf0d766e32433f4946be92f3f0036652ae09e4816c8423e65ce47237b20151fec8ffa3d4b32079b247a98cb79f9c35758aff3c56c116b903a3b44c2c550 SHA512 cd7deeaa9179306f90bafdc6cfb2668cf42d5378e72e5baa09419198f2d42c5eab5d881e5584ac511f317bbfd850f2ad46b8cb743f1ae5e1a96f8153e03599d8 diff --git a/dev-lua/luaposix/luaposix-33.4.0.ebuild b/dev-lua/luaposix/luaposix-33.4.0.ebuild deleted file mode 100644 index ba2e3aea549f..000000000000 --- a/dev-lua/luaposix/luaposix-33.4.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Bindings for POSIX APIs" -HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix" -SRC_URI="https://github.com/luaposix/luaposix/archive/release-v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="dev-lang/lua:0=" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${PN}-release-v${PV} diff --git a/dev-lua/luaposix/luaposix-36.2.1.ebuild b/dev-lua/luaposix/luaposix-36.2.1.ebuild new file mode 100644 index 000000000000..d6946f33967c --- /dev/null +++ b/dev-lua/luaposix/luaposix-36.2.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Bindings for POSIX APIs" +HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix" +SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux" +IUSE="doc" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Requires specl, which is not in the tree yet +RESTRICT="test" + +DEPEND="${LUA_DEPS} + virtual/libcrypt:= +" +RDEPEND="${DEPEND} + lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) + lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + # LDOC=true means disable ldoc update documentation + ./build-aux/luke --verbose package="${PN}" version="${PV}" \ + LDOC=true \ + PREFIX="${ED}/usr" \ + INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \ + INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \ + LUA_INCDIR="${EPREFIX}/$(lua_get_include_dir)" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die + + popd || die +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + ./build-aux/luke install \ + LDOC=true \ + PREFIX="${ED}/usr" \ + INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \ + INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \ + || die + + popd || die +} + +src_install() { + lua_foreach_impl lua_src_install + dodoc {NEWS,README}.md + use doc && dodoc -r doc +} diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml index 686aaf5c3d7a..38ab97b49eff 100644 --- a/dev-lua/luaposix/metadata.xml +++ b/dev-lua/luaposix/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jlec@gentoo.org</email> - <name>Justin Lecher</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> <upstream> <remote-id type="github">luaposix/luaposix</remote-id> diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest index a54a145fe64b..c9a5e7d6883e 100644 --- a/dev-lua/luarocks/Manifest +++ b/dev-lua/luarocks/Manifest @@ -1,4 +1,3 @@ -DIST luarocks-2.0.12.tar.gz 89028 BLAKE2B 66d06696483f6550421acb8e6834b082f06c5bc0088f730b0316db72725ce5c5ebaf0956a7c84f18b03beafaa6e7c558387025ba9ac701c8b8f7f64fa5557e11 SHA512 5ece403d7bc7804ff47ec8d0ecdea7687d530d10ddf0a800c4a2a68b69a263e68f40ab7e55e39a59ab05315d3e2bc9cf76a0618803dc8e12c7e52941b4a7053f -DIST luarocks-2.0.7.1.tar.gz 81757 BLAKE2B 2b279fd1302e56eaaa5e5b32f4be37cb1fe21ed5b495aae4014903a5f5e87f198e05f8c2a59fba900ff15f26ec76587b5b8114f6bdf3cdf81d5e59795ffbf792 SHA512 00f37c2baed83bbc7182a4595973bbe5c252fd7f530ebc35ba254fab727c1e6a7f743bafc25bfbde945e40d531f0e764c1f785edddef62fc6219e318bffdc6f3 -DIST luarocks-2.0.8.tar.gz 82313 BLAKE2B e27071c1ef6cf9b4182d8100d76c93e86c606b4ccc62be8e883cdfe7e39de900bef100f1e1a9274cfcae58218768b58a1d1189a0a15696091909b77a83a9ed5f SHA512 8246b3a863197bc5bd9efad343f8f5ba22d7a34904fd3afe99f916631ee30930ec91d15298e67abf22f0bcc6cda02785a5bbc9e60b424a631162e20941d20523 -DIST luarocks-2.2.0.tar.gz 111549 BLAKE2B 214c1c03e03f95ca1acfc1fda863895c91c508221c615fe3ccc064e9adbcaa8549d24ff788141c0093259ca52578fadccfb3f6891209f86336c57937ac5ec32d SHA512 41f32e383263485758e64df661ecfbd744369035362755c64466f2c52a8740ed941b80cab3212222d7d24e4b1a7ed9ccb84fa66c8e458526056af0b06d97224f +DIST luarocks-3.10.0.tar.gz 273518 BLAKE2B 64a9f7d5c9e15b8753e32f080d8f792be37f7b66635ce3df2218563774d5f90a18ef1b625861e13df9e728e1cbd90f0ed7247ce1bec207b97fa895780a77ab53 SHA512 4a834059b8f544274a110131d59d0647fb317078ef7709c1dc1a464513ebc38300abb71094620e21bb2f6e60193e9a1b0c06e7e0f4ad9acc2bf188bf4b599922 +DIST luarocks-3.11.0.tar.gz 277031 BLAKE2B eadef03badc9b4f0784e67f08f4fbfb4032840e6f7378e20dd2460da6324bba9c6f0210803b42a5e7465a44f0a3cf706c555ba64f622ce3884ac0b49f42304ad SHA512 bec918e98209e5ff5c498c4454b8c8182ecfeb0786cb4cd241d59149f33560e981ff2db8d49785823ccf31643366de15b5f2599c6eef0951d17ba66436b79644 +DIST luarocks-3.9.2.tar.gz 256117 BLAKE2B eebbad38dd71b0318852a177d394df5fd20e807d566893a2338526e76e17daf2436309e512dd50b325914b2d84b90ef857396bfd6d41f22893131ed78931b8ad SHA512 7e93164bdcf35338e993822931a8e59957ab69c6e23236a7a075649c2f7cd173305c4ca6e9d115fc5e282cb76c21754d7adac92b21885006e5ee3bc06a9d0059 diff --git a/dev-lua/luarocks/luarocks-2.0.12.ebuild b/dev-lua/luarocks/luarocks-2.0.12.ebuild deleted file mode 100644 index d1b114274466..000000000000 --- a/dev-lua/luarocks/luarocks-2.0.12.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils multilib - -DESCRIPTION="A deployment and management system for Lua modules" -HOMEPAGE="http://www.luarocks.org" -SRC_URI="http://luarocks.org/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="curl openssl" - -DEPEND="dev-lang/lua - curl? ( net-misc/curl ) - openssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND} - app-arch/unzip" - -src_configure() { - USE_MD5="md5sum" - USE_FETCH="wget" - use openssl && USE_MD5="openssl" - use curl && USE_FETCH="curl" - - # econf doesn't work b/c it passes variables the custom configure can't - # handle - ./configure \ - --prefix=/usr \ - --with-lua-lib=/usr/$(get_libdir) \ - --rocks-tree=/usr/$(get_libdir)/lua/luarocks \ - --with-downloader=$USE_FETCH \ - --with-md5-checker=$USE_MD5 \ - || die "configure failed" -} - -src_compile() { - # -j1 b/c make tries to delete files it has yet to create (bug #402005) - emake DESTDIR="${D}" -j1 || die "make failed" -} - -src_install() { - # -j1 b/c otherwise it fails to find src/bin/luarocks - emake DESTDIR="${D}" -j1 install || die "einstall" -} - -pkg_preinst() { - find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed" -} diff --git a/dev-lua/luarocks/luarocks-2.0.7.1.ebuild b/dev-lua/luarocks/luarocks-2.0.7.1.ebuild deleted file mode 100644 index 85009d19c02c..000000000000 --- a/dev-lua/luarocks/luarocks-2.0.7.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils multilib - -DESCRIPTION="A deployment and management system for Lua modules" -HOMEPAGE="http://www.luarocks.org" -SRC_URI="http://luarocks.org/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="curl openssl" - -DEPEND="dev-lang/lua - curl? ( net-misc/curl ) - openssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND} - app-arch/unzip" - -src_configure() { - USE_MD5="md5sum" - USE_FETCH="wget" - use openssl && USE_MD5="openssl" - use curl && USE_FETCH="curl" - - # econf doesn't work b/c it passes variables the custom configure can't - # handle - ./configure \ - --prefix=/usr \ - --with-lua-lib=/usr/$(get_libdir) \ - --rocks-tree=/usr/$(get_libdir)/lua/luarocks \ - --with-downloader=$USE_FETCH \ - --with-md5-checker=$USE_MD5 \ - --force-config || die "configure failed" -} - -src_compile() { - emake DESTDIR="${D}" || die "make failed" -} - -src_install() { - # -j1 b/c otherwise it fails with to find src/bin/luarocks - emake DESTDIR="${D}" -j1 install || die "einstall" -} - -pkg_preinst() { - find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed" -} diff --git a/dev-lua/luarocks/luarocks-2.0.8.ebuild b/dev-lua/luarocks/luarocks-2.0.8.ebuild deleted file mode 100644 index a4e71ae1e79b..000000000000 --- a/dev-lua/luarocks/luarocks-2.0.8.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils multilib - -DESCRIPTION="A deployment and management system for Lua modules" -HOMEPAGE="http://www.luarocks.org" -SRC_URI="http://luarocks.org/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="curl openssl" - -DEPEND="dev-lang/lua - curl? ( net-misc/curl ) - openssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND} - app-arch/unzip" - -src_configure() { - USE_MD5="md5sum" - USE_FETCH="wget" - use openssl && USE_MD5="openssl" - use curl && USE_FETCH="curl" - - # econf doesn't work b/c it passes variables the custom configure can't - # handle - ./configure \ - --prefix=/usr \ - --with-lua-lib=/usr/$(get_libdir) \ - --rocks-tree=/usr/$(get_libdir)/lua/luarocks \ - --with-downloader=$USE_FETCH \ - --with-md5-checker=$USE_MD5 \ - --force-config || die "configure failed" -} - -src_compile() { - # -j1 b/c make tries to delete files it has yet to create (bug #402005) - emake DESTDIR="${D}" -j1 || die "make failed" -} - -src_install() { - # -j1 b/c otherwise it fails to find src/bin/luarocks - emake DESTDIR="${D}" -j1 install || die "einstall" -} - -pkg_preinst() { - find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed" -} diff --git a/dev-lua/luarocks/luarocks-2.2.0.ebuild b/dev-lua/luarocks/luarocks-2.2.0.ebuild deleted file mode 100644 index a64514f182e2..000000000000 --- a/dev-lua/luarocks/luarocks-2.2.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils multilib - -DESCRIPTION="A deployment and management system for Lua modules" -HOMEPAGE="http://www.luarocks.org" -SRC_URI="http://luarocks.org/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="curl openssl" - -DEPEND="dev-lang/lua - curl? ( net-misc/curl ) - openssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND} - app-arch/unzip" - -src_configure() { - USE_MD5="md5sum" - USE_FETCH="wget" - use openssl && USE_MD5="openssl" - use curl && USE_FETCH="curl" - - # econf doesn't work b/c it passes variables the custom configure can't - # handle - ./configure \ - --prefix=/usr \ - --with-lua-lib=/usr/$(get_libdir) \ - --rocks-tree=/usr/$(get_libdir)/lua/luarocks \ - --with-downloader=$USE_FETCH \ - --with-md5-checker=$USE_MD5 \ - || die "configure failed" -} - -src_compile() { - # -j1 b/c make tries to delete files it has yet to create (bug #402005) - emake DESTDIR="${D}" -j1 || die "make failed" -} - -src_install() { - # -j1 b/c otherwise it fails to find src/bin/luarocks - emake DESTDIR="${D}" -j1 install || die "einstall" -} - -pkg_preinst() { - find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed" -} diff --git a/dev-lua/luarocks/luarocks-3.10.0.ebuild b/dev-lua/luarocks/luarocks-3.10.0.ebuild new file mode 100644 index 000000000000..2319a20303e0 --- /dev/null +++ b/dev-lua/luarocks/luarocks-3.10.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single + +DESCRIPTION="A package manager for the Lua programming language" +HOMEPAGE="https://luarocks.org" +SRC_URI="https://luarocks.org/releases/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" + +DEPEND=" + net-misc/curl + dev-libs/openssl:0 + ${RDEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + $(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]') + ${RDEPEND} + ) +" + +src_prepare() { + default + + # If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists, + # as no compiled modules are installed on a new, fresh installation, + # so this check must be disabled, otherwise 'configure' will fail. + sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die +} + +src_configure() { + local myeconfargs=( + "--prefix=${EPREFIX}/usr" + "--rocks-tree=$(lua_get_lmod_dir)" + "--with-lua-include=$(lua_get_include_dir)" + "--with-lua-interpreter=${ELUA}" + "--with-lua-lib=$(lua_get_cmod_dir)" + ) + + # Since the configure script is handcrafted, + # and yells at unknown options, do not use 'econf'. + ./configure "${myeconfargs[@]}" || die +} + +src_test() { + busted --lua=${ELUA} || die +} + +src_install() { + default + + { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die +} + +pkg_postinst() { + local lua_abi_ver + if use lua_single_target_luajit; then + lua_abi_ver="5.1" + else + lua_abi_ver=${ELUA#lua} + fi + elog + elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})" + elog "you can use the command-line option --lua-version, e.g." + elog + elog " luarocks --lua-version 5.3 install luasocket" + elog + elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system." + elog +} diff --git a/dev-lua/luarocks/luarocks-3.11.0.ebuild b/dev-lua/luarocks/luarocks-3.11.0.ebuild new file mode 100644 index 000000000000..780e6d75e53f --- /dev/null +++ b/dev-lua/luarocks/luarocks-3.11.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single + +DESCRIPTION="A package manager for the Lua programming language" +HOMEPAGE="https://luarocks.org" +SRC_URI="https://luarocks.org/releases/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" + +DEPEND=" + net-misc/curl + dev-libs/openssl:0 + ${RDEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + $(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]') + ${RDEPEND} + ) +" + +src_prepare() { + default + + # If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists, + # as no compiled modules are installed on a new, fresh installation, + # so this check must be disabled, otherwise 'configure' will fail. + sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die +} + +src_configure() { + local myeconfargs=( + "--prefix=${EPREFIX}/usr" + "--rocks-tree=$(lua_get_lmod_dir)" + "--with-lua-include=$(lua_get_include_dir)" + "--with-lua-interpreter=${ELUA}" + "--with-lua-lib=$(lua_get_cmod_dir)" + ) + + # Since the configure script is handcrafted, + # and yells at unknown options, do not use 'econf'. + ./configure "${myeconfargs[@]}" || die +} + +src_test() { + busted --lua=${ELUA} || die +} + +src_install() { + default + + { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die +} + +pkg_postinst() { + local lua_abi_ver + if use lua_single_target_luajit; then + lua_abi_ver="5.1" + else + lua_abi_ver=${ELUA#lua} + fi + elog + elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})" + elog "you can use the command-line option --lua-version, e.g." + elog + elog " luarocks --lua-version 5.3 install luasocket" + elog + elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system." + elog +} diff --git a/dev-lua/luarocks/luarocks-3.9.2.ebuild b/dev-lua/luarocks/luarocks-3.9.2.ebuild new file mode 100644 index 000000000000..8756903989dc --- /dev/null +++ b/dev-lua/luarocks/luarocks-3.9.2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single + +DESCRIPTION="A package manager for the Lua programming language" +HOMEPAGE="https://luarocks.org" +SRC_URI="https://luarocks.org/releases/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" + +DEPEND=" + net-misc/curl + dev-libs/openssl:0 + ${RDEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + $(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]') + ${RDEPEND} + ) +" + +src_prepare() { + default + + # If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists, + # as no compiled modules are installed on a new, fresh installation, + # so this check must be disabled, otherwise 'configure' will fail. + sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die +} + +src_configure() { + local myeconfargs=( + "--prefix=${EPREFIX}/usr" + "--rocks-tree=$(lua_get_lmod_dir)" + "--with-lua-include=$(lua_get_include_dir)" + "--with-lua-interpreter=${ELUA}" + "--with-lua-lib=$(lua_get_cmod_dir)" + ) + + # Since the configure script is handcrafted, + # and yells at unknown options, do not use 'econf'. + ./configure "${myeconfargs[@]}" || die +} + +src_test() { + busted --lua=${ELUA} || die +} + +src_install() { + default + + { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die +} + +pkg_postinst() { + local lua_abi_ver + if use lua_single_target_luajit; then + lua_abi_ver="5.1" + else + lua_abi_ver=${ELUA#lua} + fi + elog + elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})" + elog "you can use the command-line option --lua-version, e.g." + elog + elog " luarocks --lua-version 5.3 install luasocket" + elog + elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system." + elog +} diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml index b813073127f7..29410ca00d16 100644 --- a/dev-lua/luarocks/metadata.xml +++ b/dev-lua/luarocks/metadata.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> - <use> - <flag name="curl">Uses <pkg>net-misc/curl</pkg> for fetching lua - packages instead of <pkg>net-misc/wget</pkg>.</flag> - <flag name="openssl">Uses <pkg>dev-libs/openssl</pkg> for verifying lua - packages instead of md5sum.</flag> - </use> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription lang="en"> + Package manager for Lua. + + It allows you to create and install Lua modules as self-contained packages called rocks. + </longdescription> + <upstream> + <remote-id type="github">luarocks/luarocks</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest index 3ed43bd34149..9f53f19a70ee 100644 --- a/dev-lua/luasec/Manifest +++ b/dev-lua/luasec/Manifest @@ -1,3 +1,3 @@ -DIST luasec-0.5.1.tar.gz 46820 BLAKE2B 3b3d33c59c6817a810bb4ab5968657e29d123d5496e9ba28f03636ce389b99fb1e7724d9f2531fc651c86c8252a08973e76ae65ee5ab551cfe4d450519982053 SHA512 c7c92c79d0ec3e12b69f88d810a19397eaf570957d1f13b9695ee435cb6f0f9c31f5bc20a7252aac93d18eed98a5d3fc8a181cd85845a704e469055f215609a8 -DIST luasec-0.6.tar.gz 51071 BLAKE2B d10761399e074eaa657abad2788936296a6fd33db64291663e385b21fc4a4a19ff96fe1a88db9805a3794406f08c597a03c048cfc8675949baf9eaa9368b8b7f SHA512 f7004a329153d0126a3ea27b4986e9d83fb8f2de9c5c2f0c96427c50cc42e1252c69fd8cc69e2e8d423745d2dbfdb5a781b609938f7f502c7aedeb99fd0778cd -DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358 +DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe +DIST luasec-1.3.1.tar.gz 54807 BLAKE2B e09d340b8bc391830d671dd5cbec76bd5190bebdd2e534800bea8efd19749a4379e2681bb7a6e6551da49109345f0b846904c222c0ecada6135d775e2060bfc7 SHA512 cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508 +DIST luasec-1.3.2.tar.gz 54925 BLAKE2B d86a241c22083dc0ed201d83392e694fbefed207feafd758d7ba1235ea209b4dc66301abca4bd113f7074c88d5193fd9a28cbcbba4bed2f96fa669d799e1a38f SHA512 8f0c4b5ff87c024685b23770e1d342467554b8dc19a1704076e184d9e84b966f171091c31d1da135ab009e850275adc2bf2720fc9f32c83ac23f0a42f13d311f diff --git a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch deleted file mode 100644 index 951b6fb11dbf..000000000000 --- a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru luasec-0.5.1/src/ssl.c luasec-0.5.1-fixed/src/ssl.c ---- luasec-0.5.1/src/ssl.c 2015-11-20 22:39:32.000000000 +0100 -+++ luasec-0.5.1-fixed/src/ssl.c 2016-03-02 15:48:09.439005988 +0100 -@@ -395,24 +395,30 @@ - } - return 1; - } -- -+ - /** - * Return the compression method used. - */ - static int meth_compression(lua_State *L) - { -+#if !defined(OPENSSL_NO_COMP) - const COMP_METHOD *comp; -+#endif - p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); - if (ssl->state != LSEC_STATE_CONNECTED) { - lua_pushnil(L); - lua_pushstring(L, "closed"); - return 2; - } -+#if !defined(OPENSSL_NO_COMP) - comp = SSL_get_current_compression(ssl->ssl); - if (comp) - lua_pushstring(L, SSL_COMP_get_name(comp)); - else - lua_pushnil(L); -+#else -+ lua_pushnil(L); -+#endif - return 1; - } - -Only in luasec-0.5.1-fixed/src: ssl.c.orig diff --git a/dev-lua/luasec/luasec-0.5.1.ebuild b/dev-lua/luasec/luasec-0.5.1.ebuild deleted file mode 100644 index f8cdd3945dd0..000000000000 --- a/dev-lua/luasec/luasec-0.5.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs eutils - -DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" -HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/" -SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="libressl" - -RDEPEND=" - >=dev-lang/lua-5.1:0[deprecated] - dev-lua/luasocket - !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - sed -i -e "s#^LUAPATH.*#LUAPATH=$(pkg-config --variable INSTALL_LMOD lua)#"\ - -e "s#^LUACPATH.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" Makefile || die - sed -i -e "s/-O2//" src/Makefile || die - lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die - epatch "${FILESDIR}/${PN}-0.5.1-compdefine.patch" -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - linux -} diff --git a/dev-lua/luasec/luasec-0.6.ebuild b/dev-lua/luasec/luasec-0.6.ebuild deleted file mode 100644 index 40f367fc02d4..000000000000 --- a/dev-lua/luasec/luasec-0.6.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs eutils - -DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" -HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/" -SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="libressl" - -RDEPEND=" - >=dev-lang/lua-5.1:0[deprecated] - dev-lua/luasocket - !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - sed -i -e "s/-O2//" src/Makefile || die - lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - linux -} - -src_install() { - emake \ - LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \ - LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \ - install -} diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild deleted file mode 100644 index d6ddcf8c569f..000000000000 --- a/dev-lua/luasec/luasec-0.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs - -DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" -HOMEPAGE="https://github.com/brunoos/luasec" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/brunoos/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz" - KEYWORDS="amd64 arm x86" - S=${WORKDIR}/${PN}-${P} -fi - -LICENSE="MIT" -SLOT="0" -IUSE="libressl" - -RDEPEND=" - >=dev-lang/lua-5.1:0[deprecated] - dev-lua/luasocket - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - sed -i -e "s/-O2//" src/Makefile || die - lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - linux -} - -src_install() { - emake \ - LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \ - LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \ - install -} diff --git a/dev-lua/luasec/luasec-1.2.0.ebuild b/dev-lua/luasec/luasec-1.2.0.ebuild new file mode 100644 index 000000000000..b96cb6076757 --- /dev/null +++ b/dev-lua/luasec/luasec-1.2.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" +HOMEPAGE="https://github.com/brunoos/luasec" +SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" + +RDEPEND=" + >=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}] + dev-libs/openssl:0= + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + + ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + + popd +} + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O2//g' -i src/Makefile || die + + # Allow to redefine libraries linking + sed -e 's/LIBS=/LIBS?=/g' -i src/Makefile || die + + lua_copy_sources + + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CCLD=$(tc-getCC)" + "INC_PATH=-I$(lua_get_include_dir)" + "LIB_PATH=-L$(lua_get_cmod_dir)/socket" + "LIBS=$($(tc-getPKG_CONFIG) --libs openssl) $(lua_get_cmod_dir)/socket/core.so" + "MYLDFLAGS=-Wl,-rpath,$(lua_get_cmod_dir)/socket -Wl,-soname=socket/core.so" + "EXTRA=" + "DEFS=" + ) + + emake "${myemakeargs[@]}" linux + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local emakeargs=( + "DESTDIR=${ED}" + "LUAPATH=$(lua_get_lmod_dir)" + "LUACPATH=$(lua_get_cmod_dir)" + ) + + emake "${emakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luasec/luasec-1.3.1.ebuild b/dev-lua/luasec/luasec-1.3.1.ebuild new file mode 100644 index 000000000000..8371ae1e3422 --- /dev/null +++ b/dev-lua/luasec/luasec-1.3.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" +HOMEPAGE="https://github.com/brunoos/luasec" +SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" + +RDEPEND=" + >=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}] + dev-libs/openssl:0= + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + + ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + + popd +} + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O2//g' -i src/Makefile || die + + # Allow to redefine libraries linking + sed -e 's/LIBS=/LIBS?=/g' -i src/Makefile || die + + lua_copy_sources + + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CCLD=$(tc-getCC)" + "INC_PATH=-I$(lua_get_include_dir)" + "LIB_PATH=-L$(lua_get_cmod_dir)/socket" + "LIBS=$($(tc-getPKG_CONFIG) --libs openssl) $(lua_get_cmod_dir)/socket/core.so" + "MYLDFLAGS=-Wl,-rpath,$(lua_get_cmod_dir)/socket -Wl,-soname=socket/core.so" + "EXTRA=" + "DEFS=" + ) + + emake "${myemakeargs[@]}" linux + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local emakeargs=( + "DESTDIR=${ED}" + "LUAPATH=$(lua_get_lmod_dir)" + "LUACPATH=$(lua_get_cmod_dir)" + ) + + emake "${emakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luasec/luasec-1.3.2.ebuild b/dev-lua/luasec/luasec-1.3.2.ebuild new file mode 100644 index 000000000000..8371ae1e3422 --- /dev/null +++ b/dev-lua/luasec/luasec-1.3.2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" +HOMEPAGE="https://github.com/brunoos/luasec" +SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" + +RDEPEND=" + >=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}] + dev-libs/openssl:0= + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + + ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + + popd +} + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-O2//g' -i src/Makefile || die + + # Allow to redefine libraries linking + sed -e 's/LIBS=/LIBS?=/g' -i src/Makefile || die + + lua_copy_sources + + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CCLD=$(tc-getCC)" + "INC_PATH=-I$(lua_get_include_dir)" + "LIB_PATH=-L$(lua_get_cmod_dir)/socket" + "LIBS=$($(tc-getPKG_CONFIG) --libs openssl) $(lua_get_cmod_dir)/socket/core.so" + "MYLDFLAGS=-Wl,-rpath,$(lua_get_cmod_dir)/socket -Wl,-soname=socket/core.so" + "EXTRA=" + "DEFS=" + ) + + emake "${myemakeargs[@]}" linux + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local emakeargs=( + "DESTDIR=${ED}" + "LUAPATH=$(lua_get_lmod_dir)" + "LUACPATH=$(lua_get_cmod_dir)" + ) + + emake "${emakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild deleted file mode 100644 index df666e66d836..000000000000 --- a/dev-lua/luasec/luasec-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs - -DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication" -HOMEPAGE="https://github.com/brunoos/luasec" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/brunoos/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" - S=${WORKDIR}/${PN}-${P} -fi - -LICENSE="MIT" -SLOT="0" -IUSE="libressl" - -RDEPEND=" - >=dev-lang/lua-5.1:0[deprecated] - dev-lua/luasocket - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - sed -i -e "s/-O2//" src/Makefile || die - lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getCC)" \ - linux -} - -src_install() { - emake \ - LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \ - LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \ - install -} diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml index 7d74356af05a..7de89727ccf9 100644 --- a/dev-lua/luasec/metadata.xml +++ b/dev-lua/luasec/metadata.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">brunoos/luasec</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>azamat.hackimov@gmail.com</email> + <name>Azamat H. Hackimov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">brunoos/luasec</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest index e050ea632440..224c295616e1 100644 --- a/dev-lua/luasocket/Manifest +++ b/dev-lua/luasocket/Manifest @@ -1 +1 @@ -DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540 +DIST luasocket-3.1.0.tar.gz 336542 BLAKE2B 64d3ab7028050a93a93db444a4d1757f579f111e79c2f84629d0eb9558fc594918614a48cd1cb522d573b84bb4096537fb7950834adeacfffb3e060721402f71 SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b diff --git a/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch new file mode 100644 index 000000000000..8f6c9de42697 --- /dev/null +++ b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch @@ -0,0 +1,73 @@ +--- a/src/makefile ++++ b/src/makefile +@@ -162,7 +162,7 @@ + O_macosx=o + CC_macosx=gcc + DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN +-CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common ++CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common + LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o + LD_macosx=gcc + SOCKET_macosx=usocket.o +@@ -174,8 +174,7 @@ + O_linux=o + CC_linux=gcc + DEF_linux=-DLUASOCKET_$(DEBUG) +-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ +- -Wimplicit -O2 -ggdb3 -fpic ++CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic + LDFLAGS_linux=-O -shared -fpic -o + LD_linux=gcc + SOCKET_linux=usocket.o +@@ -187,8 +186,7 @@ + O_freebsd=o + CC_freebsd=gcc + DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN +-CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ +- -Wimplicit -O2 -ggdb3 -fpic ++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic + LDFLAGS_freebsd=-O -shared -fpic -o + LD_freebsd=gcc + SOCKET_freebsd=usocket.o +@@ -200,8 +198,7 @@ + O_solaris=o + CC_solaris=gcc + DEF_solaris=-DLUASOCKET_$(DEBUG) +-CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ +- -Wimplicit -O2 -ggdb3 -fpic ++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic + LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o + LD_solaris=gcc + SOCKET_solaris=usocket.o +@@ -214,7 +211,7 @@ + CC_mingw=gcc + DEF_mingw= -DLUASOCKET_$(DEBUG) \ + -DWINVER=0x0501 +-CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common ++CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common + LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o + LD_mingw=gcc + SOCKET_mingw=wsocket.o +@@ -396,18 +393,18 @@ + all: $(SOCKET_SO) $(MIME_SO) + + $(SOCKET_SO): $(SOCKET_OBJS) +- $(LD) $(SOCKET_OBJS) $(LDFLAGS)$@ ++ $(LD) $(SOCKET_OBJS) -Wl,-soname,socket/core.so $(LDFLAGS)$@ + + $(MIME_SO): $(MIME_OBJS) +- $(LD) $(MIME_OBJS) $(LDFLAGS)$@ ++ $(LD) $(MIME_OBJS) -Wl,-soname,mime/core.so $(LDFLAGS)$@ + + all-unix: all $(UNIX_SO) $(SERIAL_SO) + + $(UNIX_SO): $(UNIX_OBJS) +- $(LD) $(UNIX_OBJS) $(LDFLAGS)$@ ++ $(LD) $(UNIX_OBJS) -Wl,-soname,socket/unix.so $(LDFLAGS)$@ + + $(SERIAL_SO): $(SERIAL_OBJS) +- $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ ++ $(LD) $(SERIAL_OBJS) -Wl,-soname,socket/serial.so $(LDFLAGS)$@ + + install: + $(INSTALL_DIR) $(INSTALL_TOP_LDIR) diff --git a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch new file mode 100644 index 000000000000..874f0eb26a7c --- /dev/null +++ b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch @@ -0,0 +1,294 @@ +From 88cefd1ff8e70c10661c81b96baf5da1fc49feef Mon Sep 17 00:00:00 2001 +From: Jonas Wielicki <j.wielicki@sotecware.net> +Date: Wed, 31 Jul 2013 14:25:23 +0200 +Subject: [PATCH 1/2] Make the API more accessible by publishing constants + +--- + src/buffer.h | 15 ++++++++------- + src/common.h | 16 ++++++++++++++++ + src/io.h | 7 ++++--- + src/socket.h | 51 ++++++++++++++++++++++++++------------------------- + src/timeout.h | 19 ++++++++++--------- + src/usocket.c | 6 ------ + src/usocket.h | 16 ++++++++++++++++ + src/wsocket.c | 4 ---- + src/wsocket.h | 5 +++++ + 9 files changed, 85 insertions(+), 54 deletions(-) + create mode 100644 src/common.h + +diff --git a/src/buffer.h b/src/buffer.h +index a0901fc..66acf09 100644 +--- a/src/buffer.h ++++ b/src/buffer.h +@@ -18,6 +18,7 @@ + #include "luasocket.h" + #include "io.h" + #include "timeout.h" ++#include "common.h" + + /* buffer size in bytes */ + #define BUF_SIZE 8192 +@@ -37,13 +38,13 @@ typedef t_buffer *p_buffer; + #pragma GCC visibility push(hidden) + #endif + +-int buffer_open(lua_State *L); +-void buffer_init(p_buffer buf, p_io io, p_timeout tm); +-int buffer_meth_getstats(lua_State *L, p_buffer buf); +-int buffer_meth_setstats(lua_State *L, p_buffer buf); +-int buffer_meth_send(lua_State *L, p_buffer buf); +-int buffer_meth_receive(lua_State *L, p_buffer buf); +-int buffer_isempty(p_buffer buf); ++LUASOCKET_API int buffer_open(lua_State *L); ++LUASOCKET_API void buffer_init(p_buffer buf, p_io io, p_timeout tm); ++LUASOCKET_API int buffer_meth_getstats(lua_State *L, p_buffer buf); ++LUASOCKET_API int buffer_meth_setstats(lua_State *L, p_buffer buf); ++LUASOCKET_API int buffer_meth_send(lua_State *L, p_buffer buf); ++LUASOCKET_API int buffer_meth_receive(lua_State *L, p_buffer buf); ++LUASOCKET_API int buffer_isempty(p_buffer buf); + + #ifndef _WIN32 + #pragma GCC visibility pop +diff --git a/src/common.h b/src/common.h +new file mode 100644 +index 0000000..9bb0666 +--- /dev/null ++++ b/src/common.h +@@ -0,0 +1,16 @@ ++#ifndef LUASOCKET_COMMON_H ++#define LUASOCKET_COMMON_H ++ ++#ifndef LUASOCKET_API ++#define LUASOCKET_API extern ++#endif ++ ++#ifndef UNIX_API ++#define UNIX_API extern ++#endif ++ ++#ifndef MIME_API ++#define MIME_API extern ++#endif ++ ++#endif +diff --git a/src/io.h b/src/io.h +index b8a54df..6e399fb 100644 +--- a/src/io.h ++++ b/src/io.h +@@ -14,13 +14,14 @@ + \*=========================================================================*/ + #include "luasocket.h" + #include "timeout.h" ++#include "common.h" + + /* IO error codes */ + enum { + IO_DONE = 0, /* operation completed successfully */ + IO_TIMEOUT = -1, /* operation timed out */ + IO_CLOSED = -2, /* the connection has been closed */ +- IO_UNKNOWN = -3 ++ IO_UNKNOWN = -3 + }; + + /* interface to error message function */ +@@ -60,8 +61,8 @@ typedef t_io *p_io; + #pragma GCC visibility push(hidden) + #endif + +-void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx); +-const char *io_strerror(int err); ++LUASOCKET_API void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx); ++LUASOCKET_API const char *io_strerror(int err); + + #ifndef _WIN32 + #pragma GCC visibility pop +diff --git a/src/socket.h b/src/socket.h +index e541f27..e0b6432 100644 +--- a/src/socket.h ++++ b/src/socket.h +@@ -10,6 +10,7 @@ + * creates a interface compatible with the io.h module. + \*=========================================================================*/ + #include "io.h" ++#include "common.h" + + /*=========================================================================*\ + * Platform specific compatibilization +@@ -40,31 +41,31 @@ typedef struct sockaddr SA; + #pragma GCC visibility push(hidden) + #endif + +-int socket_waitfd(p_socket ps, int sw, p_timeout tm); +-int socket_open(void); +-int socket_close(void); +-void socket_destroy(p_socket ps); +-int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm); +-int socket_create(p_socket ps, int domain, int type, int protocol); +-int socket_bind(p_socket ps, SA *addr, socklen_t addr_len); +-int socket_listen(p_socket ps, int backlog); +-void socket_shutdown(p_socket ps, int how); +-int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); +-int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm); +-int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); +-int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm); +-int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); +-int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm); +-int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); +-int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); +-void socket_setblocking(p_socket ps); +-void socket_setnonblocking(p_socket ps); +-int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp); +-int socket_gethostbyname(const char *addr, struct hostent **hp); +-const char *socket_hoststrerror(int err); +-const char *socket_strerror(int err); +-const char *socket_ioerror(p_socket ps, int err); +-const char *socket_gaistrerror(int err); ++LUASOCKET_API int socket_waitfd(p_socket ps, int sw, p_timeout tm); ++LUASOCKET_API int socket_open(void); ++LUASOCKET_API int socket_close(void); ++LUASOCKET_API void socket_destroy(p_socket ps); ++LUASOCKET_API int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm); ++LUASOCKET_API int socket_create(p_socket ps, int domain, int type, int protocol); ++LUASOCKET_API int socket_bind(p_socket ps, SA *addr, socklen_t addr_len); ++LUASOCKET_API int socket_listen(p_socket ps, int backlog); ++LUASOCKET_API void socket_shutdown(p_socket ps, int how); ++LUASOCKET_API int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); ++LUASOCKET_API int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm); ++LUASOCKET_API int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); ++LUASOCKET_API int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm); ++LUASOCKET_API int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); ++LUASOCKET_API int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm); ++LUASOCKET_API int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm); ++LUASOCKET_API int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm); ++LUASOCKET_API void socket_setblocking(p_socket ps); ++LUASOCKET_API void socket_setnonblocking(p_socket ps); ++LUASOCKET_API int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp); ++LUASOCKET_API int socket_gethostbyname(const char *addr, struct hostent **hp); ++LUASOCKET_API const char *socket_hoststrerror(int err); ++LUASOCKET_API const char *socket_strerror(int err); ++LUASOCKET_API const char *socket_ioerror(p_socket ps, int err); ++LUASOCKET_API const char *socket_gaistrerror(int err); + + #ifndef _WIN32 + #pragma GCC visibility pop +diff --git a/src/timeout.h b/src/timeout.h +index 9e5250d..b36bd58 100644 +--- a/src/timeout.h ++++ b/src/timeout.h +@@ -5,6 +5,7 @@ + * LuaSocket toolkit + \*=========================================================================*/ + #include "luasocket.h" ++#include "common.h" + + /* timeout control structure */ + typedef struct t_timeout_ { +@@ -18,18 +19,18 @@ typedef t_timeout *p_timeout; + #pragma GCC visibility push(hidden) + #endif + +-void timeout_init(p_timeout tm, double block, double total); +-double timeout_get(p_timeout tm); +-double timeout_getstart(p_timeout tm); +-double timeout_getretry(p_timeout tm); +-p_timeout timeout_markstart(p_timeout tm); ++LUASOCKET_API void timeout_init(p_timeout tm, double block, double total); ++LUASOCKET_API double timeout_get(p_timeout tm); ++LUASOCKET_API double timeout_getstart(p_timeout tm); ++LUASOCKET_API double timeout_getretry(p_timeout tm); ++LUASOCKET_API p_timeout timeout_markstart(p_timeout tm); + +-double timeout_gettime(void); ++LUASOCKET_API double timeout_gettime(void); + +-int timeout_open(lua_State *L); ++LUASOCKET_API int timeout_open(lua_State *L); + +-int timeout_meth_settimeout(lua_State *L, p_timeout tm); +-int timeout_meth_gettimeout(lua_State *L, p_timeout tm); ++LUASOCKET_API int timeout_meth_settimeout(lua_State *L, p_timeout tm); ++LUASOCKET_API int timeout_meth_gettimeout(lua_State *L, p_timeout tm); + + #ifndef _WIN32 + #pragma GCC visibility pop +diff --git a/src/usocket.c b/src/usocket.c +index acfe186..7490df5 100644 +--- a/src/usocket.c ++++ b/src/usocket.c +@@ -20,9 +20,6 @@ + #ifndef SOCKET_SELECT + #include <sys/poll.h> + +-#define WAITFD_R POLLIN +-#define WAITFD_W POLLOUT +-#define WAITFD_C (POLLIN|POLLOUT) + int socket_waitfd(p_socket ps, int sw, p_timeout tm) { + int ret; + struct pollfd pfd; +@@ -41,9 +38,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) { + } + #else + +-#define WAITFD_R 1 +-#define WAITFD_W 2 +-#define WAITFD_C (WAITFD_R|WAITFD_W) + + int socket_waitfd(p_socket ps, int sw, p_timeout tm) { + int ret; +diff --git a/src/usocket.h b/src/usocket.h +index 45f2f99..ca67c95 100644 +--- a/src/usocket.h ++++ b/src/usocket.h +@@ -56,4 +56,20 @@ typedef struct sockaddr_storage t_sockaddr_storage; + + #define SOCKET_INVALID (-1) + ++#ifndef SOCKET_SELECT ++#include <sys/poll.h> ++ ++#define WAITFD_R POLLIN ++#define WAITFD_W POLLOUT ++#define WAITFD_C (POLLIN|POLLOUT) ++ ++#else ++ ++#define WAITFD_R 1 ++#define WAITFD_W 2 ++#define WAITFD_C (WAITFD_R|WAITFD_W) ++ ++#endif ++ ++ + #endif /* USOCKET_H */ +diff --git a/src/wsocket.c b/src/wsocket.c +index 20da330..6101dd6 100755 +--- a/src/wsocket.c ++++ b/src/wsocket.c +@@ -42,10 +42,6 @@ int socket_close(void) { + /*-------------------------------------------------------------------------*\ + * Wait for readable/writable/connected socket with timeout + \*-------------------------------------------------------------------------*/ +-#define WAITFD_R 1 +-#define WAITFD_W 2 +-#define WAITFD_E 4 +-#define WAITFD_C (WAITFD_E|WAITFD_W) + + int socket_waitfd(p_socket ps, int sw, p_timeout tm) { + int ret; +diff --git a/src/wsocket.h b/src/wsocket.h +index 3986640..55ab0a9 100644 +--- a/src/wsocket.h ++++ b/src/wsocket.h +@@ -30,4 +30,9 @@ typedef t_socket *p_socket; + #define AI_NUMERICSERV (0) + #endif + ++#define WAITFD_R 1 ++#define WAITFD_W 2 ++#define WAITFD_E 4 ++#define WAITFD_C (WAITFD_E|WAITFD_W) ++ + #endif /* WSOCKET_H */ +-- +2.32.0 + diff --git a/dev-lua/luasocket/files/proxy-fix.patch b/dev-lua/luasocket/files/proxy-fix.patch deleted file mode 100644 index 302e63663ff7..000000000000 --- a/dev-lua/luasocket/files/proxy-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1f9ccb2b586c3a7e29db3c99a23ac1cee6907cf2 Mon Sep 17 00:00:00 2001 -From: Pierre Chapuis <catwell@archlinux.us> -Date: Fri, 5 Jul 2013 18:00:29 +0200 -Subject: [PATCH] http: look for PROXY in _M, not as a global - ---- - src/http.lua | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/http.lua b/src/http.lua -index 5f70a374..f83dcc55 100644 ---- a/src/http.lua -+++ b/src/http.lua -@@ -186,7 +186,7 @@ end - local function adjusturi(reqt) - local u = reqt - -- if there is a proxy, we need the full url. otherwise, just a part. -- if not reqt.proxy and not PROXY then -+ if not reqt.proxy and not _M.PROXY then - u = { - path = socket.try(reqt.path, "invalid path 'nil'"), - params = reqt.params, -@@ -198,7 +198,7 @@ local function adjusturi(reqt) - end - - local function adjustproxy(reqt) -- local proxy = reqt.proxy or PROXY -+ local proxy = reqt.proxy or _M.PROXY - if proxy then - proxy = url.parse(proxy) - return proxy.host, proxy.port or 3128 diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild deleted file mode 100644 index b2b42fd1b64b..000000000000 --- a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib multilib-minimal flag-o-matic - -DESCRIPTION="Networking support library for the Lua language" -HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/" -SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86" -IUSE="debug" - -RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -S=${WORKDIR}/${PN}-${PV/_/-} - -RESTRICT="test" - -src_prepare() { - multilib_copy_sources -} - -multilib_src_compile() { - emake \ - CC="$(tc-getCC) ${CFLAGS}" \ - LD="$(tc-getCC) ${LDFLAGS}"\ - $(usex debug DEBUG="DEBUG" "") -} - -multilib_src_install() { - local luav=$($(tc-getPKG_CONFIG) --variable V lua) - emake \ - DESTDIR="${D}" \ - LUAPREFIX_linux=/usr \ - LUAV=${luav} \ - CDIR_linux=$(get_libdir)/lua/${luav} \ - install-unix -} - -multilib_src_install_all() { - dodoc NEW README - dohtml -r doc/. -} diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild deleted file mode 100644 index 2eb6498053e0..000000000000 --- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib multilib-minimal flag-o-matic - -DESCRIPTION="Networking support library for the Lua language" -HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/" -SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86" -IUSE="debug" - -RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -S=${WORKDIR}/${PN}-${PV/_/-} - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/proxy-fix.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - emake \ - CC="$(tc-getCC) ${CFLAGS}" \ - LD="$(tc-getCC) ${LDFLAGS}"\ - $(usex debug DEBUG="DEBUG" "") -} - -multilib_src_install() { - local luav=$($(tc-getPKG_CONFIG) --variable V lua) - emake \ - DESTDIR="${D}" \ - LUAPREFIX_linux=/usr \ - LUAV=${luav} \ - CDIR_linux=$(get_libdir)/lua/${luav} \ - install-unix -} - -multilib_src_install_all() { - dodoc NEW README - docinto html - dodoc -r doc/. -} diff --git a/dev-lua/luasocket/luasocket-3.1.0.ebuild b/dev-lua/luasocket/luasocket-3.1.0.ebuild new file mode 100644 index 000000000000..ba54f605290c --- /dev/null +++ b/dev-lua/luasocket/luasocket-3.1.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Networking support for the Lua language" +HOMEPAGE=" + https://lunarmodules.github.io/luasocket/ + https://github.com/lunarmodules/luasocket +" +SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="doc" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +HTML_DOCS="docs/." + +PATCHES=( + "${FILESDIR}/${PN}-3.0_rc1_p20200328_publish_API.patch" + "${FILESDIR}/${PN}-3.0.0_makefile.patch" +) + +src_prepare() { + default + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LD=$(tc-getCC)" + "LUAINC_linux=$(lua_get_include_dir)" + "LUAV=${ELUA}" + "MYCFLAGS=${CFLAGS}" + "MYLDFLAGS=${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" all + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CDIR=$(lua_get_cmod_dir)" + "DESTDIR=${ED}" + "LDIR=$(lua_get_lmod_dir)" + "LUAPREFIX_linux=" + ) + + emake "${myemakeargs[@]}" install + emake "${myemakeargs[@]}" install-unix + + insinto "$(lua_get_include_dir)"/luasocket + doins src/*.h + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + use doc && einstalldocs +} diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml index 409d430eb575..aadd3b74b2a5 100644 --- a/dev-lua/luasocket/metadata.xml +++ b/dev-lua/luasocket/metadata.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">diegonehab/luasocket</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>azamat.hackimov@gmail.com</email> + <name>Azamat H. Hackimov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="github">lunarmodules/luasocket</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest index 4e2859d2cf3b..eeadb92638ca 100644 --- a/dev-lua/luassert/Manifest +++ b/dev-lua/luassert/Manifest @@ -1,2 +1 @@ -DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05 -DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b +DIST luassert-1.9.0.tar.gz 42645 BLAKE2B 2541184bb5ee7a6a7e0c8e2fead8c4926a5d8384345dc173d60c9b52bb4cffe9f50e90980293465e1e5cadee337823abf77421d1cfc423eb32d9d73a7594a306 SHA512 267d31f0061376a4766c7e978bda9e4a2396c8bf959d4aaa347ad40bd286a3873441e38983e1e86ea07a1be7cf7c92d91248c4ba70d6dd4ec82f02c7f7638e9f diff --git a/dev-lua/luassert/luassert-1.7.10.ebuild b/dev-lua/luassert/luassert-1.7.10.ebuild deleted file mode 100644 index 8a27ae75e261..000000000000 --- a/dev-lua/luassert/luassert-1.7.10.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Lua Assertions Extension" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="luajit test" - -CDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2 )" -RDEPEND="${CDEPEND} - >=dev-lua/say-1.2_p1[luajit=]" -DEPEND="${CDEPEND} - virtual/pkgconfig - test? ( dev-lua/busted )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_test() { - busted -o gtest || die -} - -src_install() { - local instdir - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN} - insinto "${instdir#${EPREFIX}}" - doins -r src/* - einstalldocs -} diff --git a/dev-lua/luassert/luassert-1.7.9.ebuild b/dev-lua/luassert/luassert-1.7.9.ebuild deleted file mode 100644 index 82b2bca8d3da..000000000000 --- a/dev-lua/luassert/luassert-1.7.9.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="Lua Assertions Extension" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - >=dev-lua/say-1.2_p1" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN} - doins -r src/* - dodoc *.md -} diff --git a/dev-lua/luassert/luassert-1.9.0.ebuild b/dev-lua/luassert/luassert-1.9.0.ebuild new file mode 100644 index 000000000000..f60fbc483d39 --- /dev/null +++ b/dev-lua/luassert/luassert-1.9.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="Assertion library for Lua" +HOMEPAGE="http://olivinelabs.com/busted/" +SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lua/say[${LUA_USEDEP}] + ${LUA_DEPS} +" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +DEPEND="${RDEPEND}" + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir)/luassert + doins -r src/. + + einstalldocs +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml index 0c230917f9a9..74b6d9e0990d 100644 --- a/dev-lua/luassert/metadata.xml +++ b/dev-lua/luassert/metadata.xml @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription> Adds a framework that allows registering new assertions without compromising builtin assertion functionality. </longdescription> diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest index 89f8c9f4861c..75382dfd485e 100644 --- a/dev-lua/luasystem/Manifest +++ b/dev-lua/luasystem/Manifest @@ -1 +1,2 @@ -DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336 +DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b +DIST luasystem-0.3.0.tar.gz 19607 BLAKE2B 82dd54dab61045d25d9d1dc074526c2443b9732adf27da052f65702f0941a04dce65582091b5ecb802e5aed9baa2f4dbd53e4cd1b624426341a83fbcb0109378 SHA512 1adf1167767d7d8233ed2c90c106b050dc2370e891465eeb13f16ebc96e8f467d67a89a40173064112117ac9db2451aa73fde0d11fab01f6d2c56bdef50cb6ac diff --git a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch index 803d2835c37f..373ef95c42fa 100644 --- a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch +++ b/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch @@ -11,7 +11,7 @@ index 10fc31a..af5e4e4 100644 + -Wimplicit -fpic -fvisibility=hidden +LDFLAGS_linux=-lrt -shared -fpic -o LD_linux=gcc - + #------ @@ -208,7 +208,7 @@ SOLIB=core.$(SO) # @@ -24,10 +24,10 @@ index 10fc31a..af5e4e4 100644 LUAINC= $(LUAINC_$(PLAT)) @@ -248,7 +248,7 @@ none: all: $(SOLIB) - + $(SOLIB): $(OBJS) - $(LD) $(OBJS) $(LDFLAGS)$@ + $(LD) $(OBJS) $(LDFLAGS) $@ - + install: all - $(INSTALL_DIR) $(INSTALL_TOP_LDIR) + $(INSTALL_DIR) $(INSTALL_TOP_LDIR) diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild deleted file mode 100644 index 182cc6ca66dd..000000000000 --- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -# The below is the upstream version number. The -x suffix should be kept -# in sync with the _px suffix in the ebuild version. -MY_PV="0.2.0-0" - -DESCRIPTION="platform independent system calls for lua" -HOMEPAGE="https://github.com/LuaDist2/luasystem" -SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz -> - ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-makefile.patch -) - -src_compile() { - emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \ - LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}" -} - -src_install () { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" - doins -r system - exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system - doexe src/core.so -dodoc README.md -} diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild new file mode 100644 index 000000000000..35c3a8b2f37a --- /dev/null +++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="${PV/_p/-}" + +inherit lua toolchain-funcs + +DESCRIPTION="Platform independent system calls for Lua" +HOMEPAGE="https://github.com/o-lim/luasystem/" +SRC_URI="https://github.com/o-lim/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LD=$(tc-getCC)" + "LUAINC_linux=$(lua_get_include_dir)" + "MYCFLAGS=${CFLAGS}" + "MYLDFLAGS=${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" linux + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install () { + pushd "${BUILD_DIR}" || die + + local emakeargs=( + "INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)" + "INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)" + "LUA_INC=${ED}/$(lua_get_include_dir)" + ) + + emake "${emakeargs[@]}" install + + insinto $(lua_get_lmod_dir)/system + doins system/init.lua + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luasystem/luasystem-0.3.0.ebuild b/dev-lua/luasystem/luasystem-0.3.0.ebuild new file mode 100644 index 000000000000..ee1ca807ef71 --- /dev/null +++ b/dev-lua/luasystem/luasystem-0.3.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="${PV/_p/-}" + +inherit lua toolchain-funcs + +DESCRIPTION="Platform independent system calls for Lua" +HOMEPAGE="https://github.com/lunarmodules/luasystem" +SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LD=$(tc-getCC)" + "LUAINC_linux=$(lua_get_include_dir)" + "MYCFLAGS=${CFLAGS}" + "MYLDFLAGS=${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" linux + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install () { + pushd "${BUILD_DIR}" || die + + local emakeargs=( + "INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)" + "INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)" + "LUA_INC=${ED}/$(lua_get_include_dir)" + ) + + emake "${emakeargs[@]}" install + + insinto $(lua_get_lmod_dir)/system + doins system/init.lua + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/luasystem/metadata.xml b/dev-lua/luasystem/metadata.xml index 8ee365e7918b..4d95a0681768 100644 --- a/dev-lua/luasystem/metadata.xml +++ b/dev-lua/luasystem/metadata.xml @@ -1,11 +1,20 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + luasystem is a platform independent system call library for Lua. + Supports Lua >= 5.1 and luajit >= 2.0.0. + </longdescription> <upstream> <remote-id type="github">LuaDist2/luasystem</remote-id> + <remote-id type="github">lunarmodules/luasystem</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild deleted file mode 100644 index 2ac8fa765956..000000000000 --- a/dev-lua/lutok/lutok-0.4-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit ltprune - -DESCRIPTION="Lightweight C++ API library for Lua" -HOMEPAGE="https://github.com/jmmv/lutok" -SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/lua:0 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-libs/atf - dev-util/kyua - ) -" - -src_configure() { - econf --disable-shared --enable-static -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild new file mode 100644 index 000000000000..37821d01f1b6 --- /dev/null +++ b/dev-lua/lutok/lutok-0.4-r10.ebuild @@ -0,0 +1,49 @@ +# Copyright 2017-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LUA_COMPAT=( lua5-{1..4} ) + +inherit lua-single + +DESCRIPTION="Lightweight C++ API library for Lua" +HOMEPAGE="https://github.com/jmmv/lutok" +SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-libs/atf + dev-util/kyua + ) +" +DEPEND="${LUA_DEPS}" +RDEPEND="${DEPEND}" + +pkg_setup() { + : +} + +src_configure() { + lua_setup + local myconf=( + --enable-shared + --disable-static + LUA_CFLAGS="$(lua_get_CFLAGS)" + LUA_LIBS="$(lua_get_LIBS)" + ) + econf "${myconf[@]}" +} + +src_install() { + default + rm -rf "${ED}"/usr/tests || die + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/dev-lua/lutok/lutok-0.4-r11.ebuild b/dev-lua/lutok/lutok-0.4-r11.ebuild new file mode 100644 index 000000000000..d68865e5ab6d --- /dev/null +++ b/dev-lua/lutok/lutok-0.4-r11.ebuild @@ -0,0 +1,53 @@ +# Copyright 2017-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LUA_COMPAT=( lua5-{1..4} ) + +inherit lua-single + +DESCRIPTION="Lightweight C++ API library for Lua" +HOMEPAGE="https://github.com/jmmv/lutok" +SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-libs/atf + dev-util/kyua + ) +" +DEPEND="${LUA_DEPS}" +RDEPEND="${DEPEND}" + +pkg_setup() { + : +} + +src_configure() { + # Uses std::auto_ptr (deprecated in c++11, removed in c++17) + # <https://github.com/jmmv/lutok/issues/7> + export CXXFLAGS="-std=c++14 ${CXXFLAGS}" + + lua_setup + local myconf=( + --enable-shared + --disable-static + LUA_CFLAGS="$(lua_get_CFLAGS)" + LUA_LIBS="$(lua_get_LIBS)" + ) + econf "${myconf[@]}" +} + +src_install() { + default + rm -rf "${ED}"/usr/tests || die + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/dev-lua/lutok/metadata.xml b/dev-lua/lutok/metadata.xml index de09ffd8b089..bc13b48c8dd3 100644 --- a/dev-lua/lutok/metadata.xml +++ b/dev-lua/lutok/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> + <upstream> + <remote-id type="github">jmmv/lutok</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest new file mode 100644 index 000000000000..05e4070c4e16 --- /dev/null +++ b/dev-lua/luv/Manifest @@ -0,0 +1,3 @@ +DIST luv-1.44.2.0.tar.gz 124180 BLAKE2B 0a46ffccd67bf04fb60c7aa3685fef328da1323437640a04b36748680aaf4074300097c53206915d8a1133defc61a359cd88062f1661899dfa8c394c183f0d0d SHA512 0744590de941ec67e23e04811ed28de5e5ed8b6dd0d45e52e8e0efe0551d007f28cdada8e0d69e0d59bd37d4026102271a8ef977b12cfac1e84f6c8b57e6adce +DIST luv-1.45.0.0.tar.gz 130334 BLAKE2B f22f6705204db567de7943707b499897fbd51cf33c6bc571612e0682f3b6022d6dd56606df0ff850e72bde398f00c4db00c026f1b8de5182458b39095716cbd7 SHA512 50460573377bc9386a90aa75f7d4938571b04f74ca6f63e32fa2b2f8951e799465abb78b4270f22be511c4d328ce582c38ec3e3da1061310fcfee630b647854d +DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d diff --git a/dev-lua/luv/files/luv-1.43.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.43.0.0-cmake_lua_version.patch new file mode 100644 index 000000000000..d9c324935b91 --- /dev/null +++ b/dev-lua/luv/files/luv-1.43.0.0-cmake_lua_version.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78c0345..853ba90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ else (LUA) + if (WIN32) + find_package(Lua REQUIRED) + else() +- find_package(Lua) ++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) + endif() + if(NOT LUA_INCLUDE_DIR) + message( FATAL_ERROR "Failed to find Lua headers. Variable `LUA_INCLUDE_DIR' expected to be defined.") diff --git a/dev-lua/luv/luv-1.44.2.0.ebuild b/dev-lua/luv/luv-1.44.2.0.ebuild new file mode 100644 index 000000000000..307ba522d9fb --- /dev/null +++ b/dev-lua/luv/luv-1.44.2.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake flag-o-matic lua-single unpacker + +# e.g. MY_PV = a.b.c-d +MY_PV="$(ver_rs 3 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Bare libuv bindings for lua" +HOMEPAGE="https://github.com/luvit/luv" + +LUA_COMPAT_PV="0.10" +SRC_URI=" + https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz +" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +BDEPEND="virtual/pkgconfig" +DEPEND="${LUA_DEPS} + >=dev-libs/libuv-$(ver_cut 1-2):=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.43.0.0-cmake_lua_version.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix libdir + # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir + sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt" + cmake_src_prepare +} + +# This could in theory be multi-impl (and we have an ebuild in git history, +# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree, +# app-editors/neovim, actually links against luv instead of trying to load it +# as a module. We could probably implement some sort of a hack for this +# - but given how messy it would be, don't bother unless someone actually requests +# luv multi-impl support. +src_configure() { + lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}" + + local mycmakeargs=( + -DBUILD_MODULE=OFF + -DLUA_BUILD_TYPE=System + -DLUA_COMPAT53_DIR="${lua_compat_dir}" + -DWITH_SHARED_LIBUV=ON + ) + if [[ ${ELUA} == luajit ]]; then + mycmakeargs+=( + -DWITH_LUA_ENGINE=LuaJIT + ) + else + mycmakeargs+=( + -DWITH_LUA_ENGINE=Lua + -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi + + cmake_src_configure +} + +src_test() { + # We need to copy the library back so that the tests see it + ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests" + ${ELUA} "tests/run.lua" || die "Tests failed" +} diff --git a/dev-lua/luv/luv-1.45.0.0.ebuild b/dev-lua/luv/luv-1.45.0.0.ebuild new file mode 100644 index 000000000000..cc0ce4cbc780 --- /dev/null +++ b/dev-lua/luv/luv-1.45.0.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake flag-o-matic lua-single unpacker + +# e.g. MY_PV = a.b.c-d +MY_PV="$(ver_rs 3 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Bare libuv bindings for lua" +HOMEPAGE="https://github.com/luvit/luv" + +LUA_COMPAT_PV="0.10" +SRC_URI=" + https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz +" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +BDEPEND="virtual/pkgconfig" +DEPEND="${LUA_DEPS} + >=dev-libs/libuv-$(ver_cut 1-2):=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.43.0.0-cmake_lua_version.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix libdir + # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir + sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt" + cmake_src_prepare +} + +# This could in theory be multi-impl (and we have an ebuild in git history, +# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree, +# app-editors/neovim, actually links against luv instead of trying to load it +# as a module. We could probably implement some sort of a hack for this +# - but given how messy it would be, don't bother unless someone actually requests +# luv multi-impl support. +src_configure() { + lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}" + + local mycmakeargs=( + -DBUILD_MODULE=OFF + -DLUA_BUILD_TYPE=System + -DLUA_COMPAT53_DIR="${lua_compat_dir}" + -DWITH_SHARED_LIBUV=ON + ) + if [[ ${ELUA} == luajit ]]; then + mycmakeargs+=( + -DWITH_LUA_ENGINE=LuaJIT + ) + else + mycmakeargs+=( + -DWITH_LUA_ENGINE=Lua + -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi + + cmake_src_configure +} + +src_test() { + # We need to copy the library back so that the tests see it + ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests" + ${ELUA} "tests/run.lua" || die "Tests failed" +} diff --git a/dev-lua/luv/metadata.xml b/dev-lua/luv/metadata.xml new file mode 100644 index 000000000000..07d2e867afc8 --- /dev/null +++ b/dev-lua/luv/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <longdescription lang="en"> + libuv bindings for luajit and lua 5.1/ 5.2/ 5.3/ 5.4. + + This library makes libuv available to lua scripts. It was made for the + luvit project but should usable from nearly any lua project. + </longdescription> + <upstream> + <remote-id type="github">luvit/luv</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/md5/Manifest b/dev-lua/md5/Manifest new file mode 100644 index 000000000000..6da3d677a38a --- /dev/null +++ b/dev-lua/md5/Manifest @@ -0,0 +1 @@ +DIST md5-1.3.tar.gz 31377 BLAKE2B b6080c1ef71b5dd1e2d1831b055f31c6a45dd530a24436440a2188500f2fe0ad45730b23627eed7135b01102797a290af65b7550960add10346ac9f7ce906a9a SHA512 eda222b89432228a03c603237a787d55b6d0251f53ee3da11aaf0369ff26e3497ed8479a295b659e02b3fee85c636cd5f8cc9fd68367bf4ed2d3edcbbc373903 diff --git a/dev-lua/md5/md5-1.3-r1.ebuild b/dev-lua/md5/md5-1.3-r1.ebuild new file mode 100644 index 000000000000..2d38e4b5fca7 --- /dev/null +++ b/dev-lua/md5/md5-1.3-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Offers basic cryptographic facilities for Lua" +HOMEPAGE="https://github.com/keplerproject/md5" +SRC_URI="https://github.com/keplerproject/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + lua_copy_sources +} + +src_configure() { + # Provided 'configure' script is useless. + :; +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CFLAGS=${CFLAGS} -fPIC $(lua_get_CFLAGS) ${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}/src" || die + + # Workaround for tests. + ln -s core.so md5.so || die + + "${ELUA}" ../tests/test.lua + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + # Workaround, as 'Makefile' does not create this directory. + dodir "$(lua_get_cmod_dir)" + + local myemakeargs=( + "LUA_DIR=${ED}/$(lua_get_lmod_dir)" + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/md5/metadata.xml b/dev-lua/md5/metadata.xml new file mode 100644 index 000000000000..1ec2fecbb9e7 --- /dev/null +++ b/dev-lua/md5/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + MD5 offers basic cryptographic facilities for Lua. + A hash (digest) function, a pair crypt/decrypt based on MD5 and CFB, + and a pair crypt/decrypt based on DES with 56-bit keys. + </longdescription> + <upstream> + <remote-id type="github">keplerproject/md5</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r1.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r1.ebuild new file mode 100644 index 000000000000..9c629dac61b5 --- /dev/null +++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PV="${PV/_p/-}" + +inherit lua + +DESCRIPTION="Mediator pattern implementation for pub-sub management" +HOMEPAGE="http://olivinelabs.com/mediator_lua/" +SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins src/mediator.lua +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild deleted file mode 100644 index 4e8abcb12deb..000000000000 --- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -# Below is the upstream version number. The"-0" suffix should be kept in -# sync with the _p0 suffix of the ebuild version. -MY_PV=1.1.2-0 - -DESCRIPTION="Event handling through channels" -HOMEPAGE="http://olivinelabs.com/mediator_lua/", -SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" - doins src/mediator.lua - dodoc README.md -} diff --git a/dev-lua/mediator_lua/metadata.xml b/dev-lua/mediator_lua/metadata.xml index 29d24e70698d..e7e57ac3e417 100644 --- a/dev-lua/mediator_lua/metadata.xml +++ b/dev-lua/mediator_lua/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> mediator_lua allows you to subscribe and publish to a central object so you can decouple function calls in your application. It's as simple as mediator:subscribe("channel", function). Supports namespacing, predicates, diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest index ea14bdd8c5cb..7214b8587bf0 100644 --- a/dev-lua/messagepack/Manifest +++ b/dev-lua/messagepack/Manifest @@ -1 +1 @@ -DIST lua-messagepack-0.3.2.tar.xz 13416 BLAKE2B 03d80c3a1fc8d8bfa30821f3b83ead61bc0a8ccf565d9ac17ca0b1d97ac7c72d0550695ee13feb6ff38cd8098fa331c3acaf4b52c0f95bfc3141b70a655ba9df SHA512 d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd +DIST messagepack-0.5.2_p20201025.tar.gz 19652 BLAKE2B 5f85081daf2ab7f57399cb47782fbde0dfd2afe9514fdb652da1ba0eacd832e5c0924258b788d919b0a07e227f37ee58a239004086e7d6759b4727922ea57d76 SHA512 245790163ec819438fd3426f59ab2e5672864be647748dace35155be712ad4eaf78f8d7228d5a0ce94bfb92f6a1d1071cf871483bf99e02ba18872c31b3d0682 diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild b/dev-lua/messagepack/messagepack-0.3.2.ebuild deleted file mode 100644 index db4b06987448..000000000000 --- a/dev-lua/messagepack/messagepack-0.3.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="A pure Lua implementation of the MessagePack serialization format" -HOMEPAGE="http://fperrad.github.io/lua-MessagePack/" -SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/lua-${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+luajit" - -RDEPEND="luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_install() { - local lua=lua - use luajit && lua=luajit - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" - doins src/MessagePack.lua - dodoc CHANGES README.md -} diff --git a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild new file mode 100644 index 000000000000..d8f3db4f202c --- /dev/null +++ b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67" +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN="lua-MessagePack" +MY_P="${MY_PN}-${EGIT_COMMIT}" + +inherit lua + +DESCRIPTION="pure Lua implementation of the MessagePack serialization format" +HOMEPAGE="https://fperrad.frama.io/lua-MessagePack" +SRC_URI="https://framagit.org/fperrad/${MY_PN}/-/archive/${EGIT_COMMIT}/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Needed 'lua-TestMore' Lua module not in tree +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +src_compile() { + :; +} + +lua_src_install() { + local myemakeargs=( + "LIBDIR=${ED}/$(lua_get_lmod_dir)" + "LUAVER=$(ver_cut 1-2 $(lua_get_version))" + ) + + emake "${myemakeargs[@]}" install +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/messagepack/metadata.xml b/dev-lua/messagepack/metadata.xml index c1744fe7fc5b..115e9d64a669 100644 --- a/dev-lua/messagepack/metadata.xml +++ b/dev-lua/messagepack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-lua/metadata.xml b/dev-lua/metadata.xml index e7b1e1bc01de..43f9eba17b6b 100644 --- a/dev-lua/metadata.xml +++ b/dev-lua/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The dev-lua category contains libraries, utilities or @@ -35,4 +35,3 @@ Lua. </longdescription> </catmetadata> - diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest index 34119b47d3b1..0d98ae862c6e 100644 --- a/dev-lua/mpack/Manifest +++ b/dev-lua/mpack/Manifest @@ -1 +1,2 @@ -DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c +DIST mpack-1.0.11.tar.gz 16305 BLAKE2B e076043259692dc1aecbb62498cd44e523a44e40c265adeb3edc088f7b81a9e5892b13bbb730107fe64804be684c15510e8aea603abdafc2003c659e6bff9143 SHA512 2bd76e3d12928cb51f475d58e2c8b749f4b2b8b45f72296f6dd46c13b31fee80e0c4859de9332a7232842f511e4a53d30b43aad563980fd026d04fd65fb57b7e +DIST mpack-1.0.12.tar.gz 16524 BLAKE2B 7b2d5dbdbb72f6d792e366259ef5ba080872417b558ff8d4fd0877f5a9fbeb8794d6e1657034b74f0dffe5e1c03c0339060eebf9e85370619938cc7b8f03c540 SHA512 7df730ba98c9530d948252f2efa70cb6d4f65b0fbc3443de2239145e9ce1aa12dfa8acbbfd4b87edf19a529e3595c7a8955e00235f69aa3535d353f7f9a1c7d0 diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml index ee1dc5909516..3b3927a1ebaa 100644 --- a/dev-lua/mpack/metadata.xml +++ b/dev-lua/mpack/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> - <remote-id type="github">tarruda/libmpack</remote-id> + <remote-id type="github">libmpack/libmpack-lua</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/mpack/mpack-1.0.11.ebuild b/dev-lua/mpack/mpack-1.0.11.ebuild new file mode 100644 index 000000000000..2cc20b76c877 --- /dev/null +++ b/dev-lua/mpack/mpack-1.0.11.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +MY_PN="lib${PN}-lua" + +DESCRIPTION="Lua bindings for libmpack" +HOMEPAGE="https://github.com/libmpack/libmpack-lua/" +SRC_URI="https://github.com/${MY_PN/-lua/}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libmpack + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA_INCLUDE=$(lua_get_CFLAGS)" + "LUA_LIB=" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + # "[ FAILED ] test.lua @ 279: mpack should not leak memory" + # It doesn't seem upstream actually support LuaJIT so were this up to me + # I would drop it from LUA_COMPAT, unfortunately there are packages in the + # tree which currently expect it to be supported. + if [[ ${ELUA} == "luajit" ]]; then + ewarn "Not running tests under ${ELUA} because they are known to fail" + return + fi + + busted --lua="${ELUA}" test.lua || die + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local installdir="$(lua_get_cmod_dir)" + local myemakeargs=( + "DESTDIR=${ED}" + "LUA_CMOD_INSTALLDIR=${installdir#$EPREFIX}" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" install + + popd + + if [[ ${CHOST} == *-darwin* ]] ; then + local luav=$(lua_get_version) + # we only want the major version (e.g. 5.1) + local luamv=${luav:0:3} + local file="lua/${luamv}/mpack.so" + install_name_tool \ + -id "${EPREFIX}/usr/$(get_libdir)/${file}" \ + "${ED}/usr/$(get_libdir)/${file}" \ + || die "Failed to adjust install_name" + fi +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/mpack/mpack-1.0.12.ebuild b/dev-lua/mpack/mpack-1.0.12.ebuild new file mode 100644 index 000000000000..50625688ac67 --- /dev/null +++ b/dev-lua/mpack/mpack-1.0.12.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +MY_PN="lib${PN}-lua" + +DESCRIPTION="Lua bindings for libmpack" +HOMEPAGE="https://github.com/libmpack/libmpack-lua/" +SRC_URI="https://github.com/${MY_PN/-lua/}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libmpack + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${LUA_USEDEP}] + dev-lua/lua_cliargs[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA_INCLUDE=$(lua_get_CFLAGS)" + "LUA_LIB=" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + tc-export PKG_CONFIG + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + # "[ FAILED ] test.lua @ 279: mpack should not leak memory" + # It doesn't seem upstream actually support LuaJIT so were this up to me + # I would drop it from LUA_COMPAT, unfortunately there are packages in the + # tree which currently expect it to be supported. + if [[ ${ELUA} == "luajit" ]]; then + ewarn "Not running tests under ${ELUA} because they are known to fail" + return + fi + + busted --lua="${ELUA}" test.lua || die + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local installdir="$(lua_get_cmod_dir)" + local myemakeargs=( + "DESTDIR=${ED}" + "LUA_CMOD_INSTALLDIR=${installdir#$EPREFIX}" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" install + + popd + + if [[ ${CHOST} == *-darwin* ]] ; then + local luav=$(lua_get_version) + # we only want the major version (e.g. 5.1) + local luamv=${luav:0:3} + local file="lua/${luamv}/mpack.so" + install_name_tool \ + -id "${EPREFIX}/usr/$(get_libdir)/${file}" \ + "${ED}/usr/$(get_libdir)/${file}" \ + || die "Failed to adjust install_name" + fi +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild deleted file mode 100644 index 2c65a7b361e6..000000000000 --- a/dev-lua/mpack/mpack-1.0.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Lua bindings for libmpack" -HOMEPAGE="https://github.com/tarruda/libmpack/" -SRC_URI="https://github.com/tarruda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/libmpack-${PV}/binding/lua" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="luajit test" - -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2= )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-lua/busted )" - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - USE_SYSTEM_LUA=yes \ - LUA_INCLUDE="$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" \ - LUA_LIB="$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))" -} - -src_test() { - busted -o gtest test.lua || die -} - -src_install() { - emake \ - DESTDIR="${D}" \ - USE_SYSTEM_LUA=yes \ - LUA_CMOD_INSTALLDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \ - install -} diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest index 2f4fe07ae14f..c2a03d6ea6f3 100644 --- a/dev-lua/penlight/Manifest +++ b/dev-lua/penlight/Manifest @@ -1 +1,2 @@ -DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02 +DIST penlight-1.13.1.tar.gz 434059 BLAKE2B 09a509afc11ad28b88fc92e9f9237fef4d18fc4c5b8c401c6fc8b4e3765941534409e5e5c9c9a08e0ad1a8b08d635d9ef8b453ec602514e4365317e1b31bbf63 SHA512 de0a6a2f585f32bed234ef084d8fca9cee645eed3459aa3c39b885b46a05ae752b5c7ac3bb1957fef9519df2a11e250fc87d6d4d62ee6155be2742ad43a079fe +DIST penlight-1.14.0.tar.gz 439720 BLAKE2B 22ba9741dfcc446c2ffaa38af26f2a5b5022e316c63acc552ad4b7158c97e9239bdf124f1dc3438bd272f8dc79d8ae090f1aa7ba4b3bbcd5d006ec7244fc4041 SHA512 a83f70716106d6576b27a42222ba897d5d5a7b3918088c582e89283cf091a95a9920fe6d0b8d65e1ffc4c1664166f7d5bc4df3b023539d1b33d7175e585bbe9f diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml index 8fc3b6a3bf44..1a05f3bf022d 100644 --- a/dev-lua/penlight/metadata.xml +++ b/dev-lua/penlight/metadata.xml @@ -1,14 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> + <longdescription> Penlight is a set of pure Lua libraries for making it easier to work with common tasks like iterating over directories, reading configuration files and the like. Provides functional operations on tables and sequences. </longdescription> + <upstream> + <remote-id type="github">lunarmodules/Penlight</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lua/penlight/penlight-1.13.1.ebuild b/dev-lua/penlight/penlight-1.13.1.ebuild new file mode 100644 index 000000000000..eec077fe6527 --- /dev/null +++ b/dev-lua/penlight/penlight-1.13.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN="Penlight" + +inherit lua + +DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries" +HOMEPAGE="https://github.com/lunarmodules/Penlight" +SRC_URI="https://github.com/lunarmodules/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND="${LUA_DEPS}" + +RDEPEND=" + dev-lua/luafilesystem[${LUA_USEDEP}] + ${DEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( ${DEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +src_prepare() { + default + + # This is a demo app, not a real test + rm tests/test-app.lua || die + + # Remove test for executing a non-existent command + sed -e '/most-likely-nonexistent-command/d' -i tests/test-utils3.lua || die +} + +lua_src_test() { + "${ELUA}" run.lua || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins -r lua/pl + + einstalldocs +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/penlight/penlight-1.14.0.ebuild b/dev-lua/penlight/penlight-1.14.0.ebuild new file mode 100644 index 000000000000..9dc40907ae10 --- /dev/null +++ b/dev-lua/penlight/penlight-1.14.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +MY_PN="Penlight" + +inherit lua + +DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries" +HOMEPAGE="https://github.com/lunarmodules/Penlight" +SRC_URI="https://github.com/lunarmodules/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND="${LUA_DEPS}" + +RDEPEND=" + dev-lua/luafilesystem[${LUA_USEDEP}] + ${DEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( ${DEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +src_prepare() { + default + + # This is a demo app, not a real test + rm tests/test-app.lua || die + + # Remove test for executing a non-existent command + sed -e '/most-likely-nonexistent-command/d' -i tests/test-utils3.lua || die +} + +lua_src_test() { + "${ELUA}" run.lua || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir) + doins -r lua/pl + + einstalldocs +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild deleted file mode 100644 index 3c04e0e5285d..000000000000 --- a/dev-lua/penlight/penlight-1.3.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries" -HOMEPAGE="http://stevedonovan.github.com/Penlight", -SRC_URI="http://stevedonovan.github.io/files/${PN}-1.3.2-core.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -app-arch/unzip - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - dev-lua/luafilesystem" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" - doins -r lua/pl -} diff --git a/dev-lua/readline/Manifest b/dev-lua/readline/Manifest new file mode 100644 index 000000000000..c16a8b8abc6a --- /dev/null +++ b/dev-lua/readline/Manifest @@ -0,0 +1 @@ +DIST lua-readline-3.3.tar.gz 16370 BLAKE2B 59def7310545f6b8db31ad85891e2132b1031d9766874576dc8f24570840dc337ac234803902054a50e144d3704973ab5974d4d57dc18e574ddf790f5fd788c7 SHA512 a64fb71302c18a8733ac3548da53616532834e07d557bdcd6926d9793ba615b074b74890b18626ac7f5fd75a90f4ad4155e0788daffd9f8f1bb3e5d3931347ce diff --git a/dev-lua/readline/metadata.xml b/dev-lua/readline/metadata.xml new file mode 100644 index 000000000000..c07e13d4a6bd --- /dev/null +++ b/dev-lua/readline/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> +</pkgmetadata> diff --git a/dev-lua/readline/readline-3.3.ebuild b/dev-lua/readline/readline-3.3.ebuild new file mode 100644 index 000000000000..5c1ce424ed88 --- /dev/null +++ b/dev-lua/readline/readline-3.3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="A simple interface to the readline and history libraries" +HOMEPAGE="https://pjb.com.au/comp/lua/readline.html" +SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Tests are interactive +RESTRICT="test" + +RDEPEND=" + dev-lua/luaposix + sys-libs/readline:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "$(lua_get_CFLAGS)" + "-c C-readline.c" + "-o C-readline.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "$($(tc-getPKG_CONFIG) --libs readline)" + "-o C-readline.so" + "C-readline.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + LUA_CPATH="./?.so;${ESYSROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" \ + ${ELUA} test/test_rl.lua || die + popd || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + insinto "$(lua_get_cmod_dir)" + doins C-readline.so + + insinto "$(lua_get_lmod_dir)" + doins readline.lua + + popd || die +} + +src_install() { + lua_foreach_impl lua_src_install + + docinto html + dodoc doc/readline.html +} diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest index c196908b1e38..793ca862a678 100644 --- a/dev-lua/say/Manifest +++ b/dev-lua/say/Manifest @@ -1 +1 @@ -DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6 +DIST say-1.4.1.tar.gz 6091 BLAKE2B 59280a9d8e95f1f759c59a4886f864046ff65db035652acec0c9c32eda000ed8eda74385769bc6b0946262a3695db857848ca4b844a8a1626949c1b5bf273dab SHA512 a6c3477859615d7ae0677ac7aa0cefe8bf6f43424812062b4a06145017952b176801431c5be920cb67f52c07cc3d374e8a6714233e2252a2bb6b7ed4c3e32f90 diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml index 3f45427ec3a2..f476c828a2cd 100644 --- a/dev-lua/say/metadata.xml +++ b/dev-lua/say/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - Useful for internationalization. - </longdescription> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">Olivine-Labs/say</remote-id> + <remote-id type="github">lunarmodules/say</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild deleted file mode 100644 index e6570c902c37..000000000000 --- a/dev-lua/say/say-1.3_p1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -MY_PV=1.3-1 - -inherit toolchain-funcs - -DESCRIPTION="Lua String Hashing/Indexing Library" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="luajit test" - -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-lua/busted )" - -DOCS=( CONTRIBUTING.md README.md ) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_test() { - busted -o gtest || die -} - -src_install() { - local instdir - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN} - insinto "${instdir#${EPREFIX}}" - doins src/init.lua - einstalldocs -} diff --git a/dev-lua/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild deleted file mode 100644 index edf21e39b467..000000000000 --- a/dev-lua/say/say-1.3_p1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -MY_PV=1.3-1 - -inherit toolchain-funcs - -DESCRIPTION="Lua String Hashing/Indexing Library" -HOMEPAGE="http://olivinelabs.com/busted/" -SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:=" -DEPEND="${COMMON_DEPEND} -virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_install() { - insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN} -doins src/init.lua -dodoc CONTRIBUTING.md README.md -} diff --git a/dev-lua/say/say-1.4.1.ebuild b/dev-lua/say/say-1.4.1.ebuild new file mode 100644 index 000000000000..e18d471604d7 --- /dev/null +++ b/dev-lua/say/say-1.4.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua + +DESCRIPTION="Lua String Hashing/Indexing Library" +HOMEPAGE="https://github.com/lunarmodules/say" +SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" + +BDEPEND=" + virtual/pkgconfig + test? ( dev-lua/busted[${LUA_USEDEP}] ) + ${RDEPEND} +" + +lua_src_test() { + busted --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto $(lua_get_lmod_dir)/say + doins src/say/init.lua + + einstalldocs +} + +src_install() { + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest index e76de25ee333..cba0b0ff55d1 100644 --- a/dev-lua/toluapp/Manifest +++ b/dev-lua/toluapp/Manifest @@ -1,2 +1 @@ -DIST tolua++-1.0.93.tar.bz2 163956 BLAKE2B e4ff54ec130036654446a6e1f5d487d40af9ebbf2fdb3a8ae055fd20768fad6434fdfd4f359369dbc3669565f54dad3d6957da06c6e029e6abe6a529861ff96e SHA512 d1ae56b2dd38437e0aef81d5230d1a954b8f914133cfa199a18193d05ecfd188ec2bbeec76e63846ef673dc89c12e47bfd9727c227b71833d622cc441c071013 DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442 diff --git a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch new file mode 100644 index 000000000000..fda6c253c2e6 --- /dev/null +++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + cmake_minimum_required ( VERSION 2.8 ) + include ( cmake/dist.cmake ) + +-find_package ( Lua REQUIRED ) ++find_package ( Lua ${LUA_VERSION} EXACT REQUIRED ) + include_directories ( include src/lib ${LUA_INCLUDE_DIR} ) + + # Build lib diff --git a/dev-lua/toluapp/metadata.xml b/dev-lua/toluapp/metadata.xml index 379d1734e2d3..37a5c35170a5 100644 --- a/dev-lua/toluapp/metadata.xml +++ b/dev-lua/toluapp/metadata.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">LuaDist/toluapp</remote-id> + </upstream> </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 408e6ace008f..000000000000 --- a/dev-lua/toluapp/toluapp-1.0.93.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -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="" - -RDEPEND=">=dev-lang/lua-5.1.1[deprecated]" -DEPEND="${RDEPEND} - dev-util/scons" - -S=${WORKDIR}/${MY_P} - -src_compile() { - echo "## BEGIN gentoo.py - -LIBS = ['lua', 'dl', 'm'] - -## END gentoo.py" > ${S}/custom.py - - 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/toluapp/toluapp-1.0.93_p20190513-r1.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild index 337ea20356fe..1e925c75128b 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild @@ -1,9 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +# Newer Lua versions are NOT supported, see Bug #508222 +LUA_COMPAT=( lua5-1 ) + +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" + +inherit cmake lua-single MY_PN=${PN/pp/++} COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887" @@ -14,15 +19,23 @@ SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -RDEPEND="=dev-lang/lua-5.1*:=[deprecated]" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS}" DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}-${COMMIT_ID}" PATCHES=( "${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch + "${FILESDIR}"/${PN}-1.0.93_p20190513-lua-version.patch ) -CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake" + +src_configure() { + local mycmakeargs=( + -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + cmake_src_configure +} |