From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild | 2 +- dev-lua/LuaBitOp/Manifest | 2 +- dev-lua/Manifest.gz | Bin 6957 -> 6955 bytes dev-lua/luasec/Manifest | 4 +- dev-lua/luasec/luasec-1.0.1.ebuild | 86 --------------------- dev-lua/luasec/luasec-1.0.2.ebuild | 2 +- dev-lua/mpack/Manifest | 4 +- dev-lua/mpack/mpack-1.0.8-r100.ebuild | 2 +- dev-lua/mpack/mpack-1.0.9.ebuild | 113 ++++++++++++++++++++++++++++ 9 files changed, 121 insertions(+), 94 deletions(-) delete mode 100644 dev-lua/luasec/luasec-1.0.1.ebuild create mode 100644 dev-lua/mpack/mpack-1.0.9.ebuild (limited to 'dev-lua') diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild index 1cdb16ea1bea..99f1259bb78b 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND="${LUA_DEPS}" diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest index 3bc403fc6b42..a1902a6bfd76 100644 --- a/dev-lua/LuaBitOp/Manifest +++ b/dev-lua/LuaBitOp/Manifest @@ -1,5 +1,5 @@ AUX LuaBitOp-1.0.2-support-lua5-3+.patch 2747 BLAKE2B 1e00ea3f2b8c99b49bff1b0ed43e3bea370646a2a9c80856bafdcb58f2fc68ed3050ee980546ec75996608f7e97c3201f3b9240a13941edb43f7ef883c261ec0 SHA512 2b6a247b4fe18a87b7b3114d7b01dfbd36e2acd2c937661e1224f2828f610150022949f8b4b8a2d07f21bb1c79a1113b6d78436a284b4552b3ebf9f72184be82 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e EBUILD LuaBitOp-1.0.2-r102.ebuild 1746 BLAKE2B a065378b441af4f0ce0c571f17a1942d631e263fab06348ddd9409ac36eef4eded9a213413da3e98ea6e035a1d5b90a21137e4ff10c087409d3c2098c47bafc0 SHA512 3cdf405feb439e55fd2060c337e34ba23b79a5c8a2664771cfd0da378afd9f46bb58d904eca96792d7a73e6ae325f194e17124fb2f0d8bf3a07443740b3ab89a -EBUILD LuaBitOp-1.0.2-r103.ebuild 1803 BLAKE2B a729625004e3dc88cbd39138a0233f20777aae68dac9fd4076024aa00e12fc2197872512162a88d4bdb12787f51a586accac6a5e5df18a26a4a1062bd5c202a0 SHA512 55841f9f3002f696a8d1e7cc2f983d522bc4a856515ecfb66b572d079c803dd1d4ab23869d4353e8b2bab5562d26179209a2e263f0ed85b170b7c46f7dad1e2a +EBUILD LuaBitOp-1.0.2-r103.ebuild 1801 BLAKE2B d44472af6e499cc2c0a8767d11d3505062f61b52015489bdf7afcdf3b6672b93e0ecd2eeb77986e95ec1105e195d0fa2e8c1d76dc97a4046bf45815b1f35c368 SHA512 485b0703412050a640c49073a5d79fce0cfd1d14156502613d3037c5f4d35f4ac50cf78421e9407481e6fe2bb35126525a1bb5fe42c7b49788895879116f8a4a MISC metadata.xml 360 BLAKE2B e4c9313bdd5791822c8af70399c9fb8674b0650f600ea6c15e804756e50d201e1b07bc98f4556181dc4575a9dec07de525fb972bfa0980920cbefc83d7fb8a06 SHA512 c7bea4ae5b69e5e446054b553678263b5971e620ec491c0f5872ff5b292f45614191ffe0b01ba6a9a73dcc43cca0c249f1a31ad23f22b6a4ff3cc4bfc2980cf6 diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz index aee26d98b0cd..3a968f971860 100644 Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest index c4faa8dd8bfc..c69f35ea69ba 100644 --- a/dev-lua/luasec/Manifest +++ b/dev-lua/luasec/Manifest @@ -1,5 +1,3 @@ -DIST luasec-1.0.1.tar.gz 52370 BLAKE2B 4e90adafc5091fe462f2413f54aae9d3baf699471fad287ee58cc033140587a93e15baddea6fd6bbf7a90378e99f6fa12e63eeecab24d31c91a1ee2f9924df70 SHA512 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93 DIST luasec-1.0.2.tar.gz 52838 BLAKE2B 41bfaf8af6be56bb46c747b2bf3e938a164f43d2f39cde7386d5795811a555ebad3146344ef491412489de7679f82948bb9fb862e3ae98ab9b73f4116218a5ac SHA512 a873d8217b1ec9e66f50d7319ea0fa467b92b5855e7514dbd00429a26be3546e69fdfc985ac79a80d86f3c6845910b2e14a2198951dcad249b2d1c7d6855453f -EBUILD luasec-1.0.1.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0 -EBUILD luasec-1.0.2.ebuild 1539 BLAKE2B 460e723e4737efdf296fcaba182da50c6ff60e4dd2f7c39813626066b7ebbb8a41924adfc44306b032d857d49290c219a4adc2d35e53d8303875e8e5d3cfa89f SHA512 a5492f49b150d05ea83b941cea50af9a21d1d6faeab4d5a3b59fd848ee6959e982e93a2839f686ede33a9b8ed53ef3c5f8aa1eb620444797c452ccad62648702 +EBUILD luasec-1.0.2.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd diff --git a/dev-lua/luasec/luasec-1.0.1.ebuild b/dev-lua/luasec/luasec-1.0.1.ebuild deleted file mode 100644 index a001f3ea42e7..000000000000 --- a/dev-lua/luasec/luasec-1.0.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) -LUA_REQ_USE="deprecated(+)" - -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" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - dev-lua/luasocket[${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 - - lua_copy_sources - - lua_foreach_impl lua_src_prepare -} - -lua_src_compile() { - pushd "${BUILD_DIR}" || die - - local myemakeargs=( - "CC=$(tc-getCC)" - "LD=$(tc-getCC)" - "INC_PATH=-I$(lua_get_include_dir)" - "LIB_PATH=$(lua_get_CFLAGS)" - "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=( - "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.0.2.ebuild b/dev-lua/luasec/luasec-1.0.2.ebuild index 6a5be6fe0b5e..a001f3ea42e7 100644 --- a/dev-lua/luasec/luasec-1.0.2.ebuild +++ b/dev-lua/luasec/luasec-1.0.2.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest index cbe153d40dc2..a196fa77d669 100644 --- a/dev-lua/mpack/Manifest +++ b/dev-lua/mpack/Manifest @@ -1,3 +1,5 @@ DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75 -EBUILD mpack-1.0.8-r100.ebuild 2289 BLAKE2B 5744fcf8391d4ddfeb0120d58bff388dd20e8e3348987461c53628ad1ee3e7cfcfdba05a4cdc2a6acdacd374806dfcc9d1e6621c485656d40e64c70b7b0ba951 SHA512 69de8d444861ce0290d526dcc491a586c282db14c18b619fe2750b07eee6801237a93b7a2b8c1f0989680bab2fae0ac801e934dc1969407c33de88c2eab64414 +DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395 +EBUILD mpack-1.0.8-r100.ebuild 2293 BLAKE2B 7e4d11b5c859d51813251caef4ca2fda1110d62b0cd068ae3fc62ad93346f7d4a97e0c9ba1ff8cdc79afc548a70155df209a6bf2ddef33f7e62884d7015a4d3b SHA512 c422c57c5db234c5334e353ef1e3a7570e9f2ec745ace398841089397e56f3ec61752943c226600fde3dde6fca9521c93e85b62b22116fd73c62fad2e883d3d2 +EBUILD mpack-1.0.9.ebuild 2295 BLAKE2B 497b611896fd5110c5c6b423357544920c536f57fb37d19378c30fbfaca2ee0fca937f64480630145809c545d4a4267457665ce2f46a866519d2f2a8f3cd2889 SHA512 c845b69773c2600f76515b46fcf64856621ede5d0b88b25dcca5f3cfcfa0a1902891491dc865861bb248fa86ce510fe2ffb2c8c3d3c1e7d6d36608124243ed93 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1 diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild index f26a805ece17..b8aedd1891d9 100644 --- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild +++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild @@ -10,7 +10,7 @@ inherit lua toolchain-funcs MY_PN="lib${PN}-lua" DESCRIPTION="Lua bindings for libmpack" -HOMEPAGE="https://github.com/libmpack/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}" diff --git a/dev-lua/mpack/mpack-1.0.9.ebuild b/dev-lua/mpack/mpack-1.0.9.ebuild new file mode 100644 index 000000000000..e31c8d100fa4 --- /dev/null +++ b/dev-lua/mpack/mpack-1.0.9.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~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 +} -- cgit v1.2.3