diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-lua | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-lua')
156 files changed, 2918 insertions, 797 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 e09c02489414..000000000000 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit eutils multilib 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 ~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-r101.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild new file mode 100644 index 000000000000..66c4e3131492 --- /dev/null +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) + +inherit lua multilib-minimal 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 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +HTML_DOCS=( "doc/." ) + +src_prepare() { + default + + lua_copy_sources + lua_foreach_impl multilib_copy_sources +} + +lua_multilib_src_compile() { + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "CCOPT=" + "INCLUDES=$(lua_get_CFLAGS)" + ) + + emake "${myemakeargs[@]}" all + + popd +} + +multilib_src_compile() { + lua_foreach_impl lua_multilib_src_compile +} + +lua_multilib_src_test() { + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die + + local mytests=( + "bitbench.lua" + "bittest.lua" + "md5test.lua" + "nsievebits.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="./?.so" ${ELUA} ${mytest} + done + + popd +} + +multilib_src_test() { + multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test +} + +lua_multilib_src_install() { + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die + + exeinto $(lua_get_cmod_dir) + doexe bit.so + + popd +} + +multilib_src_install() { + lua_foreach_impl lua_multilib_src_install +} + +multilib_src_install_all() { + einstalldocs +} diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild index e56c2587e41d..67165da21a3c 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="" -RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]" +RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" 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 135066755046..42ba42d60215 100644 --- a/dev-lua/LuaBitOp/Manifest +++ b/dev-lua/LuaBitOp/Manifest @@ -1,7 +1,4 @@ -AUX LuaBitOp-ldflags.patch 376 BLAKE2B f1681d7c9b403a31bc687d93e700ec160cc474064da6cfbc33b4aaccbec3856dfa1b4103d32253a54c6a379676d9f4a79a24225dfe8c602e0614cab1d518e42f SHA512 14b779c738dff2413d3b658c6861de02afd4cf577e7fd95b72af4d58240ed406d9727e1fb47d2ccce4d783fd2aeb576770790c85625935723da15d5c18a486c1 -DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e -EBUILD LuaBitOp-1.0.1-r1.ebuild 754 BLAKE2B 83c18f6c8acb421813ad3487442d7ef0b773ec2f49f6f3c624ab18083945edbcb9c04841a22bb301585713876384f39d86a56977ea409d5bcd9c9ed9cd0ad25a SHA512 8b697c84786862079205663adcc07b2c259090cfd90424bd833aefada2ae88e19da59d817db6ee1c55f9ca374c9d06d71054a3ad6bdb35e62ba6a4edab9ea473 -EBUILD LuaBitOp-1.0.2-r1.ebuild 917 BLAKE2B cab5c4db544326ce4cbfa5cb924b086a5c7593b5e28cc3f0c54e08061a3cfc60f5afb07647e53146924591be17434df7df226d29b86631ae378fcd40b8d07576 SHA512 c227476db749b85cd61bf77c9012ed4807ec1ba5221994b12a7fc1534f9e24b7c255067cb4e8bcb85800d01fa4237f6ced15cdea65ab8db4d86fe5505e99184c -EBUILD LuaBitOp-1.0.2.ebuild 612 BLAKE2B 2c019f29af3ae8fd6048a733c48fc768990943b7d1b923c4c2f616a3bb702c24b20d837edf9c52285e76500c0584eecaa6794ef06cb7a7cdac22e1e788c9784f SHA512 12b76d07cb530a957097c3683d30344b657a85855968116af9be39b0317f41e2165d70b399a5eb0dba6fae2a6347043ac8775ee3bd20798c640176a5cf252078 -MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 +EBUILD LuaBitOp-1.0.2-r101.ebuild 1631 BLAKE2B 2c52919195e7da8c81e2b6427fbb693af05318f8077f0272d12589d40bd806ef02e113d708df689c7bab9aa2aca036a6bfe8ed6006c40d203605a3ed31a4648c SHA512 f073997ad8187b8ae4594a12c37475d0923dec5b497354065648ef0ab35fef39f7b94945642224686f8b2974fbec72e349bb9be55a449cec0716e8b9170d94cc +EBUILD LuaBitOp-1.0.2-r2.ebuild 917 BLAKE2B 704b906d79e32b01ec82e5fddeb95cabd2edddc1fcb9069f893a34a088bb198c8b277b42e748bfcf5893f5cf6c8b39662b5548f5c0b01807e7c331dca74a6ed3 SHA512 b1cb3b831bc3a60f5dbb840158100c97b91c0cc9fc0f902f60921852c93296116b3977f1d197fa61aac0f562cc4c76f1290ba711e2ef03dadde8eef2336197fb +MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a 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 c36c37139fad..8105c04d111a 100644 --- a/dev-lua/LuaBitOp/metadata.xml +++ b/dev-lua/LuaBitOp/metadata.xml @@ -5,4 +5,8 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> </pkgmetadata> diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz Binary files differindex ffeb354da2e8..acc5743f111a 100644 --- a/dev-lua/Manifest.gz +++ b/dev-lua/Manifest.gz diff --git a/dev-lua/busted-htest/Manifest b/dev-lua/busted-htest/Manifest new file mode 100644 index 000000000000..1cb0951a258a --- /dev/null +++ b/dev-lua/busted-htest/Manifest @@ -0,0 +1,4 @@ +DIST busted-htest-1.0.0.tar.gz 4347 BLAKE2B f1d30a305cb9691588b18f67842b536d3de9430d22c51ec292202e5aca5784447cd525ae8b1f1da42a3d3792344419efbfe1d03fe29823b445a7c1ead0fe577f SHA512 001f494949c04445004e8b06fde62727cab85a320673748d18714b82d7b2b9aea43316f6119e669c569f31578b787f4e5ca5d19da3f33fe28df572aaa41c75bd +EBUILD busted-htest-1.0.0-r100.ebuild 660 BLAKE2B 99818fce2a5f16ecb7950ff57232deb71dac7cbceb238315e8ad6349cfff37b0662859e8c8907badaa7db38cb934b964ebbb6499050e98b40665fee875796f30 SHA512 64a307d432b249d0c63cc3d9fad42c384aa999888afb31e6c97359525a7e1b1f4ff545def8b5db7f4f22aaf945217931477af5feec0d4ec79287825c63148a86 +EBUILD busted-htest-1.0.0.ebuild 689 BLAKE2B a3b1e62aed5e4c9191e07c7a7c00833a4213002ecb5356c0de236b27223df40fe3d3acab2dfe328347932c617e94ae2b4f3f8ad137e173e29aa87eb09acb2e0c SHA512 e0f268246b55e23c144e992aea4033a94c66e78120e829c80222dd99706f7551cc346801d8955eb6c06df73dd7612da4d6ead4f439f6cd47c498fc09266b9283 +MISC metadata.xml 445 BLAKE2B d93949e732dacc208367a75c8a25a742a01e4c4f4fa489341ca788749164c34407f730c907629b85cf24df8d0f18840f5b7c65f9f215116987c287b850b58d96 SHA512 c1e94898a7dfc55ae498125a643dba08184f5d5cf0a8aa6cd935b90fee365cd5c59c21f3ac4918d12d2b805beb461248d061c9d2101ce561405e130e95177262 diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild new file mode 100644 index 000000000000..66a5ea1eca4a --- /dev/null +++ b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~ppc ~ppc64 ~x86" + +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/busted-htest-1.0.0.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0.ebuild new file mode 100644 index 000000000000..7007e6d3c37a --- /dev/null +++ b/dev-lua/busted-htest/busted-htest-1.0.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +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 ~ppc ~ppc64 ~x86" +IUSE="luajit" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:0 ) + dev-lua/busted +" + +BDEPEND="virtual/pkgconfig" + +src_install() { + insinto $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua')) + doins src/busted/outputHandlers/htest.lua + + einstalldocs +} diff --git a/dev-lua/busted-htest/metadata.xml b/dev-lua/busted-htest/metadata.xml new file mode 100644 index 000000000000..6f305be11e6a --- /dev/null +++ b/dev-lua/busted-htest/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <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 bddf34b58528..20cba9f03e6b 100644 --- a/dev-lua/busted/Manifest +++ b/dev-lua/busted/Manifest @@ -1,8 +1,8 @@ DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf 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 -EBUILD busted-2.0.0-r101.ebuild 1298 BLAKE2B f609e4d50f28cdedb8cc7201e20bd335a583f729f4547bf9d43d7aaa4e451148a5e67a17beb556a0535a18ec02fe8a4e502cb9c243e9359544bf3e9b24f0bca6 SHA512 bca19ddadf2ac1d743f2d7b269dd9ca618410e0561fbea3f63df4d82ce7a8bfb4edad37306e5eee3518e9c6a7884d71bdfc1c6b11d5b70028fc734c743269194 -EBUILD busted-2.0.0.ebuild 961 BLAKE2B 36bfd4e16bea39fde179a7da04840a3bd151a95a18041b9c5b83c59547090dded90183e88a546f32bed1c67804a33128231792702a1196445acb9a64ea169ec4 SHA512 3dbe619392c2e60581aafa1811ce7e130f03cbed10fcac6c4c36b5aef0849166d5c8850dbdbeab26f9c2a1bfdbc6cc2da3ac8c60afef39f5858b64d3318cc93a -EBUILD busted-2.0_rc11_p0.ebuild 1021 BLAKE2B 6be1c981d3259907dcbd7878c11f6eeb9894ebddd9eda8559881c087bec7e4a1f7d8016765920148defac4644bef46f82b107b4136866e1377c7465f184431cb SHA512 47e1e443cbce25838a3647d2aadcdf244219abff50be7a4cac51906a65ee8dbe2b122145de4c84cd18384c5aa1c4b818d308bb733a4af77e16bff9cf15b16ffe -EBUILD busted-2.0_rc12_p1.ebuild 1037 BLAKE2B 51659b876392952b2a23b9dd99cca97e1b7ef48b0e23760206a0f282a4e4892afe93f743b611732a95096431627c4196119115af8fd3f7c3030b3588744ecbf7 SHA512 af2b746bb71fdd39e34d82c6b056919665ae63abbc1d7fbef35610a2b65e0a9300a905771f15cb1b9a512b14737c1c524a3aba19d3b4ab4d4d29c4758ed59657 +EBUILD busted-2.0.0-r101.ebuild 1164 BLAKE2B e9471ba350b1db8aa488505150e0b7ea2bba586fa212de7871a54460d64664100e72c2652f44570f2102c1a924ee42d38168cd76862812414ace79aef8f75b62 SHA512 30c5a0554dee9e3769c4444918271cdd69ff041cf483f7e204db09272d96111318d38a59e07d24be756f034953ee1e8b1f29289408d3ff4f172db1006fa89bd2 +EBUILD busted-2.0.0.ebuild 962 BLAKE2B deddc702374b94414eb66c06d89c843f694b27b4977c637ada2364168df3ecb5108cdc94ebca9d613349e8692ed009f60c079e1456aaccb0e53742c6003595b7 SHA512 dbb41ea8200cc809b862c8f4f054da35177d2c3cddfe1a1288423c8bfcf02d97624eea4c34f8e0da2f8614a4c3e8d0f2451d695c9f40b6b0dbd39f5b9ba35f4e +EBUILD busted-2.0_rc11_p0.ebuild 1019 BLAKE2B 3d9d98c61e6d8565290db50d05403ef413072a672dfc89eedfc2ee496cff1cc6532098e8c44ec86174c47ca20319dc76c15a70fd42e2f4d387d5ac00ff9bd7e2 SHA512 d86da1777482c86b7bd51952cd4d8a1a5ba83d142c94b1b0989bdeb2569c8dd6c23c38ed5aba39a5ca4226c61fff503530f9faa74100e15de55f8f112a1d4753 +EBUILD busted-2.0_rc12_p1.ebuild 1038 BLAKE2B e6b56520879b1c9f7f1942e48dc9b2c2f7d77dbd740ac25058704b7700972a4e1b1fbdc716a5414d229832e655dfcda0bfdcf7b8e95253f8c4f167dc73416900 SHA512 8bf3f7fe65bb90793a552e2c4da52ef8b4a06303d1c3d9c46bb582ecb8bb079d7c2db8f214a366aa1a8f649f872b9739aabc0bd96b745ea17b401e6bfadacb69 MISC metadata.xml 753 BLAKE2B cb7d80aca20864ef7d138d3834011f666775dfee6614f6d233675824c1715ef5f893402532b0d8b928cd7aa1ecb53e3216150c22fbc9d6a21abf3251a10905b4 SHA512 3bae03d1b27087507aa3b8b4b4365a607256c1c0b9cfccde4bd42c946674feb5325715c0dea925aebfd941ab62c6a2b4bc4bd7a5f0c0211f49c4e2fb45ead48c diff --git a/dev-lua/busted/busted-2.0.0-r101.ebuild b/dev-lua/busted/busted-2.0.0-r101.ebuild index 22652c4ffdfc..4ccbce376e4f 100644 --- a/dev-lua/busted/busted-2.0.0-r101.ebuild +++ b/dev-lua/busted/busted-2.0.0-r101.ebuild @@ -19,15 +19,15 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lua/lua_cliargs-3.0_p2-r100[${LUA_USEDEP}] - >=dev-lua/luafilesystem-1.8.0-r100[${LUA_USEDEP}] - >=dev-lua/luasystem-0.2.1_p0-r100[${LUA_USEDEP}] - >=dev-lua/dkjson-2.5-r100[${LUA_USEDEP}] - >=dev-lua/say-1.3_p1-r100[${LUA_USEDEP}] - >=dev-lua/luassert-1.8.0-r100[${LUA_USEDEP}] - >=dev-lua/lua-term-0.7-r100[${LUA_USEDEP}] - >=dev-lua/penlight-1.7.0-r100[${LUA_USEDEP}] - >=dev-lua/mediator_lua-1.1.2_p0-r100[${LUA_USEDEP}] + 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} " @@ -36,7 +36,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig test? ( - >=dev-lua/busted-2.0.0-r100 + dev-lua/busted ${RDEPEND} ) " diff --git a/dev-lua/busted/busted-2.0.0.ebuild b/dev-lua/busted/busted-2.0.0.ebuild index 1c6f0435f521..656795600611 100644 --- a/dev-lua/busted/busted-2.0.0.ebuild +++ b/dev-lua/busted/busted-2.0.0.ebuild @@ -16,7 +16,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lang/lua-5.1:= + >=dev-lang/lua-5.1:0= >=dev-lua/lua_cliargs-3.0 >=dev-lua/luafilesystem-1.5.0 >=dev-lua/luasystem-0.2.0 diff --git a/dev-lua/busted/busted-2.0_rc11_p0.ebuild b/dev-lua/busted/busted-2.0_rc11_p0.ebuild index 7ad217bf0d5b..7a9e382fe5a1 100644 --- a/dev-lua/busted/busted-2.0_rc11_p0.ebuild +++ b/dev-lua/busted/busted-2.0_rc11_p0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} diff --git a/dev-lua/busted/busted-2.0_rc12_p1.ebuild b/dev-lua/busted/busted-2.0_rc12_p1.ebuild index baef07948bfe..007ce37f4131 100644 --- a/dev-lua/busted/busted-2.0_rc12_p1.ebuild +++ b/dev-lua/busted/busted-2.0_rc12_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest index 5c89d0835cd7..53617a49ef29 100644 --- a/dev-lua/dkjson/Manifest +++ b/dev-lua/dkjson/Manifest @@ -1,4 +1,4 @@ DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af EBUILD dkjson-2.5-r100.ebuild 902 BLAKE2B 9ddb8a911be85a491e9ecc5d429a78660ff456a635c5db1187c15ca8ad54508bc660cecacd8cd3b96b5dc4e48804648207cb0808be3c32db414b09531cd8cba6 SHA512 f5e74c8bdd4b2551893e95fed020346ac03bd3caf19e656309ba55a3dc671fb5bb98a2e5f0a87632053591067f3a1eed7e1dca87e0b1cec4b0d7cd08eb1ea0fb -EBUILD dkjson-2.5.ebuild 648 BLAKE2B 7fbde9421fab2cdd933a8eda2b095ee832198a350d4fae0dc964d000785f3af1e84f8e9ad4c8c0ee48e8523aac470e1a0b82456e39801f6b8cc42c4c1d9b8112 SHA512 32508645ad71565d249e4579f5121a59cbdd534fb892209336173bafa03e066fe00e254fe3b98a3c960a803f6d3aa956bedbf5caa3231ca9a821361a5ab9fb42 +EBUILD dkjson-2.5.ebuild 649 BLAKE2B 7aa8243692aae910814ea3f563f38f935a155003a5dedb4c4f12ccdd9777a63bfb0a1107ef630e26883da05e229f1a436afb948f5a369e9a6985738534f48572 SHA512 4df3da6f64024447e403d1f9e930d0390ab78e6f766ef0261efaa7524d01c76312d7d4d1710258169c27d7409ed80174cc93c206a4c95e7c54b75a8c2ee7f2d4 MISC metadata.xml 721 BLAKE2B db84f905a38fcc1a3b8a19a2fd94dcf66858fe34e0f751bffc0163e4011a3457a8064d36d5cf84366f98e63e2f6b1a0fbe49846412318caed9a37c5c1651910e SHA512 01b562a7ecb7f86455a1934d85ebadd6932f69ae22c642517bbbf6abcd5d6ae28596be99ad4909588d9f22831c834b1c638ba33ec4ec24b4fdeabfe71a215eff diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild index 9a02e01dcbce..d39eb62708c8 100644 --- a/dev-lua/dkjson/dkjson-2.5.ebuild +++ b/dev-lua/dkjson/dkjson-2.5.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:= +COMMON_DEPEND=">=dev-lang/lua-5.1:0= !>=dev-lang/lua-5.4" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" diff --git a/dev-lua/inifile/Manifest b/dev-lua/inifile/Manifest new file mode 100644 index 000000000000..3cc7f2a0814a --- /dev/null +++ b/dev-lua/inifile/Manifest @@ -0,0 +1,4 @@ +DIST inifile-1.0.tar.gz 2611 BLAKE2B cdda6d9b2de45b4bec4695029018e37fe22a993afe5a54df4f4c519457d00267338de5aa3379a72dc7ab962260cd39f49674c2685799e4ad5544fed938c1080b SHA512 d0a9aa825cd5cf4a3b0b562853f3593141f537388c3e3a4334317b2536aa2dd695bdea37058d3d907aad10162bb71ef5b324c769e65cbd18e4526e37275cb970 +EBUILD inifile-1.0-r100.ebuild 645 BLAKE2B 56872cb0ccc71574d19ab5f44acf2eccd10f4ee2feb39e2c2bb409c5867a451a4abd965aca6e10c6045aefbff3e31ed406f07dbec63127112669d502e7b1f93a SHA512 8f5844e8aa6936a8c702ef8f1d1734895395346858f01983e0843895d4837f230350547aa331c58be9a20df589202184f2598e5a962cf04c1c67c0e1a46e47cc +EBUILD inifile-1.0.ebuild 696 BLAKE2B 4f35c46a80b51447abb363ae09f1606865cb02c2abdfb418ea5f370826063c783234e4075728518f11c951423cf53c2fabf2a39b696aac0f7725484595bd5540 SHA512 5aff526d305006045861a5794b6d648553ceb14322d7976dd892a9f1568cf73e24071229de32224e6dbc49d169e24958cead64da07139d538812130ecc3437eb +MISC metadata.xml 330 BLAKE2B 950a8b8109efc12fe3c96d1a3a2d58371849a984e9894325b36155a3d734e8c2e644b974553e31e029d8622972d6f932a58879525e5179ad4eac9d19c0f70a6b SHA512 0bd7146b86660e03f10927c0a2efa7d6298d2345483a16dcad46fb8f2e0e8b9cdbceae2b8d9dc7c282987ee8e82210f2c27d01df4a958e6c981e807bcb4ce7c3 diff --git a/dev-lua/inifile/inifile-1.0-r100.ebuild b/dev-lua/inifile/inifile-1.0-r100.ebuild new file mode 100644 index 000000000000..89a8791ca127 --- /dev/null +++ b/dev-lua/inifile/inifile-1.0-r100.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) +MY_PV="${PV/_p/-}" + +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 ~ppc ~ppc64 ~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/inifile-1.0.ebuild b/dev-lua/inifile/inifile-1.0.ebuild new file mode 100644 index 000000000000..05056d9afbd7 --- /dev/null +++ b/dev-lua/inifile/inifile-1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV="${PV/_p/-}" + +inherit toolchain-funcs + +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 ~ppc ~ppc64 ~x86" +IUSE="luajit" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:= ) +" + +BDEPEND="virtual/pkgconfig" + +src_install() { + insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + doins inifile.lua +} diff --git a/dev-lua/inifile/metadata.xml b/dev-lua/inifile/metadata.xml new file mode 100644 index 000000000000..9da69fdb9869 --- /dev/null +++ b/dev-lua/inifile/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://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">bartbes/inifile</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest index dad72528e1f5..7851243e0e6d 100644 --- a/dev-lua/lanes/Manifest +++ b/dev-lua/lanes/Manifest @@ -1,4 +1,8 @@ AUX lanes-3.10.0-fix-makefile.patch 855 BLAKE2B 4505cb94476ffcc1100917a660d5b8d9aa062c2a87fa463cc98bcf84190239ceb5ad53bb0c9db57b512db5590dc128f102c1af4b72c02442953220a1ed12e46e SHA512 877e3ad24d9192c2b87de7e684f77c7db725d929d1f2709b531929cf343e1da9b0396a79dd0763d2fa36a492d7920937553f533d9a75dfb353ec2ab4466c2e80 +AUX lanes-3.13.0-makefile.patch 2909 BLAKE2B e2325494fdf3f54923ed29cc66e80443a22be26cb7352b1fcbe46d0df7983bda958874e5a8a4156a65c9f2cc019fb7a6b6ed8da8652aa6d45af63f787ccf828e SHA512 ad3b7456a6c68043974ffcc1e1955b96364461b90b1edfa32f50ad48a3aeae9755ec8f756303f5e7c009f6c3e07f2d2c6bcfadc7e484d7a6e140b59e55b5d5a7 DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b -EBUILD lanes-3.10.0.ebuild 755 BLAKE2B 9034cc6d8f6f0124e9e18d1ebad67d33a798b62dd286a2d7b16d2940c44c3c55827e8343da6a19fca663b73a1ebde60845170917f287cecb264fff353bd07938 SHA512 e3dd7ab1960a3fa2e9f90123b1f6d52ed90215c167b504c1d5986d0b2adcac3d279292c26628e8cc8d30d98c95d81acc7f9a0973333451c0173c785b08b0c679 -MISC metadata.xml 327 BLAKE2B 7b9f8e7dd81f276b8f95697a22412a955efc368172847c3fd2b74baa34cd0f65e3f0e1fe16a450bdbd811dafce036b374e8ba9956ad80f94e866e3a3a840651a SHA512 b7a1e293faa34fe5bb51e15dfb1537be01bafeeb1a48b36847e96e45ed8bf82364f9154332fc615c3b3dab8f93d1b2dbf9662ffbd8cb117ac22f481daed44a2d +DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5 +EBUILD lanes-3.10.0.ebuild 755 BLAKE2B bf7d14cfce83787e7c3100fe4ca311bf3312a55c9cd82a0b30f7f95e39ae9ef20f6274cf5a6f396c46cd3ac4f926b039c462169e49fb93a2ca2bc4f1f0ec85d0 SHA512 614c5a5e21b33a25edf3e34e41e993705008918afda3f60d542f197f229068a3b15eccc17a2ea5ea731d93b71ca90ae864d11a73a5d24f9e738e8d4b2ba1bf0e +EBUILD lanes-3.13.0-r100.ebuild 1404 BLAKE2B b96e9fa333fb440ac806e6213b210d77e74c7cfdc56d537f36f2f147ae5a8bef0ee74bedbfcb0b9f0a04e7895d4b14d38c44ed658818e022755f8f4a3fbb1379 SHA512 d1b9b4f665b87796b4b7219668955965587ea94c568c43e4ca8e15c87eee7abddca000b628cb735fbac6e200f8ac89d856f93746a8ec21afa3ea228aaf7f9172 +EBUILD lanes-3.13.0.ebuild 1312 BLAKE2B f130e3e5faaf31d3d0e639199f322e18bc8ff5802e83d1ca59b31b3b3199ddfcbfc6c8df497ef3964f805251abb6d58f0c0cdb6565ecad8da89518bccd165182 SHA512 510b94480af415b9046cba4da7740e9d8eb6514b6630bafe4131c0b84da911e654893bf45548f44c33105c072f1088f92ad7fc3496ba93b8023d2c0f0ea7747b +MISC metadata.xml 438 BLAKE2B 7edf60b96d12fe2b577ca5665bbfe053830e53f4821f50b14467e025472db68cdb0d7c4874ff03c882d710d9180ac170beb9f5b07e1f021dc9c576645d2606a7 SHA512 d9258d0d00639649436ae8877e4856309332ad07cc765f228f17b1be79fd2c876fab0bd5a303e1a77f64b9951d5e109126dc6baa5cd92da197202895d9528138 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..257c9efca466 --- /dev/null +++ b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch @@ -0,0 +1,93 @@ +--- lanes-3.13.0.old/Makefile 2018-11-30 13:28:50.000000000 +0100 ++++ lanes-3.13.0/Makefile 2020-11-30 21:28:36.769384766 +0100 +@@ -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) + +--- lanes-3.13.0.old/src/Makefile 2018-11-30 13:28:50.000000000 +0100 ++++ lanes-3.13.0/src/Makefile 2020-11-30 21:40:06.399382894 +0100 +@@ -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 index 0db398773e8e..b801dd2bd239 100644 --- a/dev-lua/lanes/lanes-3.10.0.ebuild +++ b/dev-lua/lanes/lanes-3.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild new file mode 100644 index 000000000000..3c7d429b112e --- /dev/null +++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( 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}" + ) + + 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.13.0.ebuild b/dev-lua/lanes/lanes-3.13.0.ebuild new file mode 100644 index 000000000000..e3c4a87c18c9 --- /dev/null +++ b/dev-lua/lanes/lanes-3.13.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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 ~x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" ) + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA=$(usex luajit 'luajit' 'lua')" + "LUA_FLAGS=-I$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))" + "LUA_LIBS=" + "OPT_FLAGS=${CFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + emake LUA=$(usex luajit 'luajit' 'lua') test +} + +src_install() { + local myemakeargs=( + "LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_SHAREDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml index 5d8223a9b7be..b2c291b1b2b1 100644 --- a/dev-lua/lanes/metadata.xml +++ b/dev-lua/lanes/metadata.xml @@ -5,6 +5,10 @@ <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">LuaLanes/lanes</remote-id> </upstream> diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest index d674a9cce648..033ca44ae979 100644 --- a/dev-lua/ldoc/Manifest +++ b/dev-lua/ldoc/Manifest @@ -1,4 +1,6 @@ AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a +AUX ldoc-1.4.6-slotted_lua.patch 732 BLAKE2B 52bfd5770b47a082d8f4d0706050bc75766af92d120ab1b95c5359e13c85fe9a0131a40b20cbebe318b0eab42c6f7877749248687c3bc8570c81df08c5af8f51 SHA512 5b226521e5c3af4b23e6f0ffd74cd332a214f1d4bfcef14c1fab170149b669045ec1439d6f2a3bfd40ff3699cbdfb3981e9641d6a44a88d2210f83fa2c5a2cba DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af +EBUILD ldoc-1.4.6-r100.ebuild 805 BLAKE2B 07ed739e790470030de9de95adc29263beedd1447d6e22859d8a6c4c705d6953d78a469204a6c99622bac432177c19e656a9b1fba0201b0b3341d4ccb5770d45 SHA512 1b98caa30dd79bae63662983c7541b74f509a3f257337a71a9cf1a545d048bde695eafb61b9429bffe7768b7c66b564ab0816c22430fe89eb892f5b4c434d2a1 EBUILD ldoc-1.4.6.ebuild 519 BLAKE2B ec1a59beaba803f512cc892c6856dc5b09c71ab48ebd9c093f8592bf3822e3ee16836db7abc6dac67360171b4d4ee56727c482fe0398621d61b95c7a6e296e13 SHA512 1638c24f53578d1bca5253a32e8f761b4a1cebf2297495568349e5f95b459b680a2896e9c390259a52738f9c81361de69c971a4d2335d871412e35b0c4c02df6 MISC metadata.xml 247 BLAKE2B b8d9d5b8d0cd042320e566bfe90f610a133b5c5ebd712026f81661caccfb4bffea14e1d1256b363c9ab422404a65bac2ef9b265f7489129d0bca46067022e73e SHA512 4dd0700f6354ffd28980a6782be85efd6d47a505029f6a781d7679ec2bad2bfe86e218a48ae8e197c3db00dc6d5b222d08197d35ddc7271752510b61cb3dc959 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..5486df73038a --- /dev/null +++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 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/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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/lgi/Manifest b/dev-lua/lgi/Manifest index eade3afaa91d..a6ec2e4f3c69 100644 --- a/dev-lua/lgi/Manifest +++ b/dev-lua/lgi/Manifest @@ -1,3 +1,4 @@ DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335 -EBUILD lgi-0.9.2.ebuild 1373 BLAKE2B 4bde8c79ed73ec22ce73d2c4fe0f4cafb468e077e84d8f01ab5b02941e938241cd3608971bc936ffa17681fe0de5eb08c0db17a4d09a9c687f51bb05b59f4309 SHA512 d4227622ea9f1b858d38bf1301e12235718468b8fd4e62ecdf4b76840b82845b41d463e0894e5c02eda044fee2365579f1aa0fc26b0ee31c3766d27507792ecd +EBUILD lgi-0.9.2-r100.ebuild 2551 BLAKE2B 8ac666e9640fe20642da7e0abff1ccd9279e6789db1d70fdedd8fe8941afc785ee60734398aeedee8051154947b1879ba2441cb9c1d34af850487c810c83e1a7 SHA512 fc2ba268ce95582ba7d81c917d3723cf3d097a6d2aa5ca5094b877916746592267a8a52670cb793e3ca3cac366b9e0d89635fe275effaae26dd3292862484a55 +EBUILD lgi-0.9.2.ebuild 1374 BLAKE2B f5133eb162c385d7c00e5bc037219781329449abeaa09bec7ddd9990f6f18f4f72df7d98f8b62cf30019f947ff81f165bdbb21c4030d285afb1b57179907b5af SHA512 f7ceabdf5190a744af5e5325e04d205f3782756493849d234b7ede4cda5af8019fa816cf780d1125137404b8b91fe8f8a3e508716e6bf5217f215a18a847cc85 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3 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..908e5804dfbd --- /dev/null +++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VIRTUALX_REQUIRED="manual" +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua 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" +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} + )" + +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 + virtx \ + lgi_emake_wrapper \ + check + 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/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild index 6c84cc232046..aa535b2deae0 100644 --- a/dev-lua/lgi/lgi-0.9.2.ebuild +++ b/dev-lua/lgi/lgi-0.9.2.ebuild @@ -18,7 +18,7 @@ IUSE="examples test" RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-lang/lua-5.1:= +RDEPEND=">=dev-lang/lua-5.1:0= dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0=" diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest index dc05310b1519..2115846ab578 100644 --- a/dev-lua/lpeg/Manifest +++ b/dev-lua/lpeg/Manifest @@ -2,6 +2,7 @@ AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca76 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 -EBUILD lpeg-1.0.1.ebuild 1249 BLAKE2B 1759f35c89ed3331c8051f5de6b9085c94c3ecc97ce53f0186f6dea4dd371de8234ffcd014ec014aefffe4e3f438fc4828e8c9302653db5c99e702d3ca66a6cf SHA512 24acb31792144e36961425fd0da8512f30bfe11a39e7601feae18468d49aa1da5b6ca7774c37c9673595589f7c3afc3eb910422c2fa3564f73543c3c521e881c -EBUILD lpeg-1.0.2.ebuild 1248 BLAKE2B b3339c1bf3510be64ea7062d84293a75ca7f9fcdf3fe360ea0de1176ade94001acc171189f3c8a23f3be35e40245df799cccf355cf07461664d98977f98eef7b SHA512 067e95f7df82997c7fa4ba0c69648ce51b28d4aa590cb8017c2888576762e018e8b1527fc03d01b842dd8c60d0062cbbf986d14ae8050781fecddf003cb19fdf +EBUILD lpeg-1.0.1.ebuild 1250 BLAKE2B 8347a85fad87c1a3b97b296c28096993a6d1bba661baf24166540dd878c60d51e768dd5e359de69372f50930dd362058f4965456c4b0ce398b704fe6ab4781ea SHA512 9132dc63bc9786e444e30196241d2e6ec4a9d91b89b20b3e81b73513d16571118be701e0de44b9109c191620fbeb1ac91e293ab0dab8f943b0f81a63edbed15a +EBUILD lpeg-1.0.2-r101.ebuild 1537 BLAKE2B b75e317be864dccaa694d84d141b8239012786a141269daf2d780f511a00c3c2ddedd1fa5d4417c63aec5f87156a3ec537e1579a68a2e35171cfa73cf7603080 SHA512 c2a13abc6c681af638cb783c2395544629ff7c28cc1cb1d9ceb20d6bbd22f3d556b15eec28e2fb2f073aafd4a8c0cc7227ee3c3e9888eeaffc529445e98c713d +EBUILD lpeg-1.0.2.ebuild 1249 BLAKE2B eaad9865b67b3dca0b873cbb489ef0dde90b858c4bd715db88a0fdd3dec3f20aa7a08c520e88dde44a17c7a0689160e8cafa265f3c2d8649cac0b204dbe2b159 SHA512 0c8fb8c38a73ae74159962d08a4586377b5746545f49cbc065086a823775fd3c07feedc17341580d3bc05a354f65e19312aa65fb453fbd522f4903d0180ca279 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4 diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild index 8b2a23d8b937..87761dcecf3e 100644 --- a/dev-lua/lpeg/lpeg-1.0.1.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86" IUSE="debug doc luajit" RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2= )" DEPEND=" 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..10a6b94a1b47 --- /dev/null +++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~sparc ~x86" +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 + lua_foreach_impl lua_src_prepare +} + +lua_src_compile() { + cd "${S}.${ELUA}/" || die + emake CC="$(tc-getCC)" \ + LUADIR="$(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 +} + +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 index 1bd23c851d9d..3297c2ab4fa5 100644 --- a/dev-lua/lpeg/lpeg-1.0.2.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug doc luajit" RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2= )" DEPEND=" diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest index 5d8d8f090ab5..95968685197d 100644 --- a/dev-lua/lua-argparse/Manifest +++ b/dev-lua/lua-argparse/Manifest @@ -1,3 +1,4 @@ DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1 -EBUILD lua-argparse-0.6.0-r1.ebuild 1134 BLAKE2B a543609ce07cb64b520839ba4b86523a447e265429a90635c92d0b4c8cdf21389d42832abb8a1aa34e0b1e3d7436f40ea42259a8118c6c83c262828dad61ea4c SHA512 971a7df7732c2a0e01bb3ba3cff8a6240a737e1c2ff4c22ff573d228a66fd023ab21435dabd7402e1e572cb4155292656b8b98f2cad226f48b42334c0131556e -MISC metadata.xml 751 BLAKE2B f75d9b07c3ed56932062de304c0df556f31d34afb4254705acda96ff7c535fe8c85c0740c4cb704eee552d53a1dde6f5d9810e132ca17df4edd619992f055d6b SHA512 7e797e99ee38995fb576f7270fcf69d736195809a1e55a4f09364ad6a4a2dbd2614aba7c5823e70716e0ef81021d020ee0d56927f9ea85b08163ff9554faccac +EBUILD lua-argparse-0.6.0-r1.ebuild 1147 BLAKE2B 0f32e7c5dae1b3003b81d520ad5f4bb1c9c95489770ad8c1ac5f43be557081a44d24254ee47574f7e7a19c34bd73ccbbcf0ead203a1bad0768edd0a1833c1854 SHA512 3f9d982b3521430c5ed1ed63947cec4dc037de2e9fba6e86776b458f5e7cdd4bffe0027fa485539b22322d1be4dfd010c640cead899b23197d308f365781510e +EBUILD lua-argparse-0.6.0-r100.ebuild 1138 BLAKE2B ada852b0d22da5c1dda57dca8042d65312785550c4e1e4210178f04f695d1a2e0eed1c89ffae1ae0b94167aea1a9b4b95325e51fd806e69c7f8d8bd4d48e5388 SHA512 b89d6782f57a4798b0efcf209853c9e9d9cc9c820f5d307260ccb9f84dd1475c27a554722a60d01c14cb9da6096fffd5b4f619d8040c8fee4436a073a7cfbfe4 +MISC metadata.xml 862 BLAKE2B c7ef04527672d2faaf171382d0a9860d94f881545141212212b55ab627e6ef0e681a0118fe9f92c5799578340b9a436de3fca41b47ae06bd998c5cb66ac85eb6 SHA512 53d6abef7c0a9085ad75ee1abfa079e6acbb3a9b9f69fb361e961f7e9cc0d294db1a35bbe33b05684888b782ec37609cb549a2f13c474c08949e0538d99ffa0d diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild index 622008feceda..0a45d921f67a 100644 --- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild +++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild @@ -10,13 +10,13 @@ SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="doc luajit test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lang/lua-5.1:= + >=dev-lang/lua-5.1:0= luajit? ( dev-lang/luajit:2 )" BDEPEND=" virtual/pkgconfig diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild new file mode 100644 index 000000000000..db9fce9d4ced --- /dev/null +++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Command line argument parser for the Lua Programming Language" +HOMEPAGE="https://github.com/mpeterv/argparse" +SRC_URI="https://github.com/mpeterv/${PN/lua-/}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN//lua-/}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( + dev-lua/busted[${LUA_USEDEP}] + ${RDEPEND} + ) +" + +src_compile() { + if use doc; then + sphinx-build docsrc html || die + rm -rf "${S}"/html/{.doctrees,_sources} || die + fi +} + +lua_src_test() { + busted --exclude-tags="unsafe" --lua=${ELUA} || die +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + insinto "$(lua_get_lmod_dir)" + doins src/argparse.lua +} + +src_install() { + default + + use doc && local -a HTML_DOCS=( "html/." ) + einstalldocs + + lua_foreach_impl lua_src_install +} diff --git a/dev-lua/lua-argparse/metadata.xml b/dev-lua/lua-argparse/metadata.xml index 3af620136775..d44082c8ccab 100644 --- a/dev-lua/lua-argparse/metadata.xml +++ b/dev-lua/lua-argparse/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="person"> <email>vpayno+gentoo@gmail.com</email> <name>Victor Payno</name> </maintainer> diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest index fb73a0212ed6..f07a0d22a892 100644 --- a/dev-lua/lua-cjson/Manifest +++ b/dev-lua/lua-cjson/Manifest @@ -1,6 +1,11 @@ +AUX lua-cjson-2.1.0.8-lua52.patch 3588 BLAKE2B 989bd667dd62cf7b39c0188c1fcf94d6890e9839c662e75782bba26faf9fa35c7def97c172c74ec8cb3eb07a0413aa66e7b860d07c2caf459be52ec37450dd1f SHA512 9f16ae9d7885d835252a49208e00199ee8d4bf10790a9b2e696026171831b4a579938ecf7f980631f3fccee55f1d000212dfea80d1ebc22743550847d43f1d26 +AUX lua-cjson-2.1.0.8-sparse_array_test_fix.patch 1084 BLAKE2B 3f6e439b54602a8fb07badb87bd53ce8affbb53f7434a32677b1de0cfc92b6f9f75f21a7c09763649c5cbadf59a8647d704cce1e0e98207e72bb696c9cb8ddbe SHA512 31358192ecff4a06ef045cf8b3d8f717e65674752e1ae70a8e87a487e89a4819448285c537ef5393b05bbb285a0708be37bd7dafa9b8bacbf4bb0e8bdd9fdb67 AUX sparse_array_test_fix.patch 1643 BLAKE2B 6967eefee4a1bf3bdf14f7c2cd56814642adf4321007fc3a9b7f5e4022f468006e8674e6832d3a5fe1ef995b360de6e60bf738a6c3664f78d80d1000380939ae SHA512 597a4eeb180177ccb72f025b9abefe339b845ad188cd6287036905ab613aa36df24f0b51a515bb1718a0286e64b5b12a0cb8864dea2203b69407f9bc665ce393 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.8.tar.gz 77211 BLAKE2B 227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0 SHA512 577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580 EBUILD lua-cjson-2.1.0.6.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771 EBUILD lua-cjson-2.1.0.7.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771 -MISC metadata.xml 678 BLAKE2B fa30839c521f01f875cc3eb8d0a4904975306436464e475acc0aee9acc2f856fc8895444344acda575a69be8d9e35a25f1bd8f4efccb0f174621f54aaa5e1775 SHA512 d4ed2bdea1df6a8ca3a0d4d1405f2e2c1ecd38d0229d6b5a3264c4ffabc4487a52e558fd56cf2903ff7ada9a7cb7204245bf5288a0834ff520a111c814b1e0a2 +EBUILD lua-cjson-2.1.0.8-r100.ebuild 2011 BLAKE2B 5aafff2cd5201a5db81f1ba16f22f2a7e60a8ec94f352231d34fa0ff04b63f0e90b0714f42084ee9bfbdffba27f045eeec21319ac586b95833ebf17b7b9646de SHA512 08abb466a3e4fdf7a07ac8e64d9c86f76a99ccad21b7cacae3c13b1db0c09b832c1017589423dcfa2fc20ad1092982ea9c525d9703cd94a5be793adbb1a68fa2 +EBUILD lua-cjson-2.1.0.8.ebuild 1660 BLAKE2B 601d00a060462cafbc1107947387fd73c9ceefcb1aa8e901e16ee63d526192459ec900bdcea19a8f25aae3c87d53915c6a846bbaf5cc564ae15f14f0a352ca6e SHA512 2cacc3460386d732aa9be52ba12a165166d0634a2c8e74bf26c6dba156eccefe060bbe9648256c2dd7b1c0e664e4ccf5b2d3f1ed979ab9b565a400478c78ec0a +MISC metadata.xml 779 BLAKE2B 605a71234ea6e3f8eb770b56cdd725cdc244b643c9676afa4552b3f2ef24d6a1c6d96c0468768b16412a8bbaf5ba29b177a57aec6c7a3c006f16da955d952dd7 SHA512 be9492a64cd4be16f395ec49aa031fed8dcddf844df243cd8456452f002098a2cb47ce1e99dffa0843661986ec5352f4feb749578ee5a63a8b47624c3ffae022 diff --git a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch new file mode 100644 index 000000000000..8f8c98243f1f --- /dev/null +++ b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch @@ -0,0 +1,143 @@ +From e8dddaf2c9c370f3676441304955d81543c5cceb Mon Sep 17 00:00:00 2001 +From: leaf corcoran <leafot@gmail.com> +Date: Sat, 21 Sep 2019 17:31:38 -0700 +Subject: [PATCH 1/5] support lua 5.2 with LUA_COMPAT_ALL + +--- + lua_cjson.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lua_cjson.c b/lua_cjson.c +index 2a69699..83118b1 100644 +--- a/lua_cjson.c ++++ b/lua_cjson.c +@@ -36,6 +36,9 @@ + * difficult to know object/array sizes ahead of time. + */ + ++ ++#define LUA_COMPAT_ALL 1 ++ + #include <assert.h> + #include <stdint.h> + #include <string.h> + +From 2b3c3c866701a0110a6ac50a9bec9f23adc2956e Mon Sep 17 00:00:00 2001 +From: leaf corcoran <leafot@gmail.com> +Date: Sat, 21 Sep 2019 18:01:05 -0700 +Subject: [PATCH 2/5] support lua 5.3 with LUA_COMPAT_5_1 + +--- + lua_cjson.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lua_cjson.c b/lua_cjson.c +index 83118b1..9d25f7c 100644 +--- a/lua_cjson.c ++++ b/lua_cjson.c +@@ -38,6 +38,7 @@ + + + #define LUA_COMPAT_ALL 1 ++#define LUA_COMPAT_5_1 1 + + #include <assert.h> + #include <stdint.h> + +From 639c4a38bf0b1bddef4bfdb22bb6a3f8493cc3fe Mon Sep 17 00:00:00 2001 +From: leaf corcoran <leafot@gmail.com> +Date: Sat, 21 Sep 2019 18:18:27 -0700 +Subject: [PATCH 3/5] Lua 5.2+ unpack support + +--- + lua/cjson/util.lua | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua +index 5d80106..48fa33c 100644 +--- a/lua/cjson/util.lua ++++ b/lua/cjson/util.lua +@@ -1,5 +1,7 @@ + local json = require "cjson" + ++local unpack = unpack or table.unpack ++ + -- Various common routines used by the Lua CJSON package + -- + -- Mark Pulford <mark@kyne.com.au> + +From 9163dd3c431bd7ab45bdb218c32c8c9633ddf2cc Mon Sep 17 00:00:00 2001 +From: leaf corcoran <leafot@gmail.com> +Date: Sat, 21 Sep 2019 18:43:47 -0700 +Subject: [PATCH 4/5] Lua 5.2+ maxn support + +--- + lua/cjson/util.lua | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua +index 48fa33c..2405257 100644 +--- a/lua/cjson/util.lua ++++ b/lua/cjson/util.lua +@@ -2,6 +2,16 @@ local json = require "cjson" + + local unpack = unpack or table.unpack + ++local maxn = table.maxn or function(t) ++ local max = 0 ++ for k,v in pairs(t) do ++ if type(k) == "number" and k > max then ++ max = k ++ end ++ end ++ return max ++end ++ + -- Various common routines used by the Lua CJSON package + -- + -- Mark Pulford <mark@kyne.com.au> +@@ -194,7 +204,7 @@ local function run_test(testname, func, input, should_work, output) + local result = {} + local tmp = { pcall(func, unpack(input)) } + local success = tmp[1] +- for i = 2, table.maxn(tmp) do ++ for i = 2, maxn(tmp) do + result[i - 1] = tmp[i] + end + + +From c390998582b959389d0fc039743c96e861902587 Mon Sep 17 00:00:00 2001 +From: leaf corcoran <leafot@gmail.com> +Date: Sun, 22 Sep 2019 13:43:18 -0700 +Subject: [PATCH 5/5] use macro instead of header defines for Lua 5.2+ support + +--- + lua_cjson.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lua_cjson.c b/lua_cjson.c +index 9d25f7c..718a5b9 100644 +--- a/lua_cjson.c ++++ b/lua_cjson.c +@@ -36,10 +36,6 @@ + * difficult to know object/array sizes ahead of time. + */ + +- +-#define LUA_COMPAT_ALL 1 +-#define LUA_COMPAT_5_1 1 +- + #include <assert.h> + #include <stdint.h> + #include <string.h> +@@ -105,6 +101,10 @@ + #define json_lightudata_mask(ludata) (ludata) + #endif + ++#if LUA_VERSION_NUM > 501 ++#define lua_objlen(L,i) lua_rawlen(L, (i)) ++#endif ++ + static const char * const *json_empty_array; + static const char * const *json_array; + diff --git a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch new file mode 100644 index 000000000000..e031672dae33 --- /dev/null +++ b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch @@ -0,0 +1,31 @@ +--- a/tests/test.lua ++++ b/tests/test.lua +@@ -10,6 +10,17 @@ + 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 @@ + 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"}' } }, diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild new file mode 100644 index 000000000000..c7ff3172c0be --- /dev/null +++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~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" ) + +PATCHES=( + "${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch" + "${FILESDIR}/${PN}-2.1.0.8-lua52.patch" +) + +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() { + if ! [[ ${ELUA} == "lua5.3" ]]; then + 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 + else + ewarn "Not running tests under ${ELUA} because they are known to fail" + ewarn "See: https://github.com/openresty/lua-cjson/pull/50" + return + fi +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "DESTDIR=${D}" + "LUA_CMODULE_DIR=$(lua_get_lmod_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.8.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild new file mode 100644 index 000000000000..2b1199417496 --- /dev/null +++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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 ~x86" +IUSE="+internal-fpconv luajit test +threads" +RESTRICT="!test? ( test )" +REQUIRED_USE="threads? ( internal-fpconv )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" + +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-lang/perl )" + +DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" ) + +PATCHES=( "${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch" ) + +src_prepare() { + default + + # Don't install tests + sed -e '/cd tests/d' -i Makefile || die +} + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "CFLAGS=${CFLAGS}" + "LDFLAGS=${LDFLAGS}" + "LUA_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + cd tests || die + + ln -s "${S}"/cjson.so ./ || die + ln -s "${S}"/lua/cjson ./ || die + + ./genutf8.pl || die + ./test.lua || die +} + +src_install() { + local myemakeargs=( + "DESTDIR=${D}" + "LUA_CMODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_MODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + "PREFIX=${EPREFIX}/usr" + ) + + emake "${myemakeargs[@]}" install install-extra + + einstalldocs +} diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml index 5b6408370bec..a4d07bda238c 100644 --- a/dev-lua/lua-cjson/metadata.xml +++ b/dev-lua/lua-cjson/metadata.xml @@ -5,7 +5,11 @@ <email>gyakovlev@gentoo.org</email> <name>Georgy Yakovlev</name> </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <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 277fb994bdaf..b4ef7a6e5fd0 100644 --- a/dev-lua/lua-openssl/Manifest +++ b/dev-lua/lua-openssl/Manifest @@ -1,5 +1,6 @@ +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.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5 -DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4 -DIST lua-openssl-compat-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.gz 51950 BLAKE2B 16dbf5eb444393f093a5f2cc0fa2a8b394a8b2d62ca36882d02202304a2906b4e2bb87814c1ca198e4b77a9bc27d85627da75244ce9c68c3fd1e06e9262fa970 SHA512 2a8e1d3bb6475225f311995f70417c0620c5efa7384400b2002166daa6fc1baedb32f492dc65cc5b92bf63e850c293a36c1f8aed6e7cf0985e582aa0e52141a8 -EBUILD lua-openssl-0.7.8_p0-r1.ebuild 2221 BLAKE2B 108f0be285519ace2a4216f920a714661c8988213f3d47a3f488fc0ebb596e00b294e2a8f6e0560b29bdbe31253cab050e1653fe9685406203bc56ce791f0320 SHA512 2f75a5b7af5819431ffd301bd79a78da6cf9c037e68a1b097c2427f653f1039f19d4a9dd34ddbf9b48958c83be4e5c9859a4ccd67a63c08ea86442ed55a8ffdf -MISC metadata.xml 444 BLAKE2B 10922399060a76c4ec3dbb4c11925c2674a65d5bc23d06d76d51aeafe8f885620d647e0054ffbfed39083f8bd54972486dbc1a1a019a1206d8966918aa336ef9 SHA512 248cd6f3e2ca5ed82b4f571aa8c3fc642ea7b0cd94ed14e012bddd81b00363125cadb235261fd45e2366f72d34135fe8476b33d7d2d0d2ce1e1dc029702cc8d3 +EBUILD lua-openssl-0.7.8_p0-r100.ebuild 2449 BLAKE2B b7469b721fbc35db1e2bc9bccfa4f92e4b6b6b3ba18af5821e1ff973d5b550538f90a381a79bc0b07345e691e497f9f33dfc67cea36df85577856f32e41fb9db SHA512 20d039165bc638f24ab7275a02cfbb64f887fdf25a05613094450e27cc122e3dffb2238766ffadd98e2d65d041cae20fff1ac5c4a1798f50c57330772e2fdd3a +EBUILD lua-openssl-0.7.8_p0-r2.ebuild 2510 BLAKE2B baf5e8d6b7015c761ada5e63a4c219b7efdb6b09012b298edab2db61f9c855c72147a4863bb9ae43feab4718b837b780dd2c50dd59c32949fc0fa56e5bdb8241 SHA512 c8bf27ce0796c1ddfb59c78308713865913a49c4f87ca7776541112aea85a6973292959944de034eeec2e122b0f3e07435a5fd29cb6976be4db70ac76a13b185 +MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202 diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild deleted file mode 100644 index 3f4cf467fa9a..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PV//_p/-}" - -DESCRIPTION="OpenSSL binding for Lua" -HOMEPAGE="https://github.com/zhaozg/lua-openssl" -LUA_AUX_COMMIT="b56f6937096acea34ddf241ec7ea08ac52414d18" -LUA_COMPAT_COMMIT="a1735f6e6bd17588fcaf98720f0548c4caa23b34" -SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${MY_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 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0=[-bindist] ) - !dev-lua/luacrypto - !dev-lua/luaossl - !dev-lua/luasec -" -BDEPEND="virtual/pkgconfig" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - rmdir deps/auxiliar deps/lua-compat || die - mv "${WORKDIR}/lua-auxiliar-${LUA_AUX_COMMIT}" deps/auxiliar || die - mv "${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_COMMIT}" deps/lua-compat || die - - # fixes: deps/auxiliar/auxiliar.c:11:10: fatal error: c-api/compat-5.3.h: No such file or directory - ln -sv lua-compat/c-api deps/c-api - - default -} - -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}" - INSTALL_CMOD="$(${PKG_CONFIG} $(usex luajit luajit lua) --variable=INSTALL_CMOD)" - INSTALL_LMOD="$(${PKG_CONFIG} $(usex luajit luajit lua) --variable=INSTALL_LMOD)" - - export LUA_VERSION LUA_CFLAGS LUA_LIBS -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_test() { - TZ=UTC emake CC="$(tc-getCC)" test -} - -src_install() { - emake PREFIX="${ED}/usr" LUA_LIBDIR="${ED}/${INSTALL_CMOD}" install - - # install lua code as well - insinto "${INSTALL_LMOD}" - doins -r lib/* - - einstalldocs -} diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild new file mode 100644 index 000000000000..f8e40f03140f --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" +LUA_COMPAT=( lua5-{1..3} luajit ) +MY_PN_AUX="lua-auxiliar" +MY_PN_COMPAT="lua-compat-5.3" +MY_PV="${PV//_p/-}" +MY_PV_COMPAT="0.10" + +inherit 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 ~x86" +IUSE="libressl test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-lua/luaossl + !dev-lua/luasec + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +DOCS=( "README.md" "samples/." ) + +src_prepare() { + default + + # 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 + + local myemakeargs=( + "AR=$(tc-getAR)" + "CC=$(tc-getCC)" + "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_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_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" install + + insinto "$(lua_get_lmod_dir)" + doins -r "lib/." + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild new file mode 100644 index 000000000000..c8c126b8cb44 --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" +MY_PN_AUX="lua-auxiliar" +MY_PN_COMPAT="lua-compat-5.3" +MY_PV="${PV//_p/-}" +MY_PV_COMPAT="0.10" + +inherit 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 ~x86" +IUSE="libressl luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-lua/luaossl + !dev-lua/luasec + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:0 ) + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +DOCS=( "README.md" "samples/." ) + +src_prepare() { + default + + # 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 +} + +src_compile() { + local myemakeargs=( + "AR=$(tc-getAR)" + "CC=$(tc-getCC)" + "LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" + "LUA_LIBS=${LDFLAGS}" + "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + local myemakeargs=( + "LUA=$(usex luajit 'luajit' 'lua')" + "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" test +} + +src_install() { + local myemakeargs=( + "LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" + "TARGET_SYS=${CTARGET:-${CHOST}}" + ) + + emake "${myemakeargs[@]}" install + + insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + doins -r "lib/." + + einstalldocs +} diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml index d0cab8078d2a..d23128cb52b3 100644 --- a/dev-lua/lua-openssl/metadata.xml +++ b/dev-lua/lua-openssl/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="person"> <email>vpayno+gentoo@gmail.com</email> <name>Victor Payno</name> </maintainer> diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest index 8251b8cf628b..0f4d8585ca3c 100644 --- a/dev-lua/lua-term/Manifest +++ b/dev-lua/lua-term/Manifest @@ -1,6 +1,6 @@ DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31 -EBUILD lua-term-0.3.ebuild 1046 BLAKE2B 77c1acb0eaf7cad9e72c6d4e09e52a60078ffe2e8da1d8d119c5083d6fe3b0c493cee7aba008562dc56997ebda0f1713151354ed633dbd7d27389755bfba841f SHA512 060e77c10f7a78844361be521ffdd0996b090bf7a7413b8c85dcf8f4488cd3cec1c1d61991a64c6f3d64e22c092aa5cbac00b465c91f8b2c06a2791daddc7f39 -EBUILD lua-term-0.7-r100.ebuild 1404 BLAKE2B 538ec3a437ae5c8c6e4b5628aaa0b0358b13ad8497a2a2e8ea6a08e603ee6be9fc65830231accca822be3fff12dbea4e246714a12e1d6eafb6969bab67afeb92 SHA512 cd0dff45ac0674a9173ffab7feb2572dfe17075712de1ef70d6d93abd3c1a436514dca3c9f1906122842026e90dd2e67939f11de766b6b73e177e0aebf97f4aa -EBUILD lua-term-0.7.ebuild 1025 BLAKE2B 6f944135685b719759ea38c09f5edab3b0af7971e344cefec7eaee5cbb0f987a8281a9059e2e2f3938b869e23c54b658ebfe284acac163b4d6c7950c0e685500 SHA512 f32f339a978dac960affffab32db40df7e4dfc62fe811a2b4730ed777f8a750d4d824aa584be41a4b336f182e94ec5077686b230997e2ad047c45fb0752d3efa +EBUILD lua-term-0.3.ebuild 1047 BLAKE2B 89ea5e2764d940d84af29fdffef96188bfb5fe63122ebcd23adb2d7ebae3bc3c38c915164822baff66f1b359bb8d152475e7dabd064f58c6c4766fec03ac6620 SHA512 bef1d40048b56a9b0c39a2a53c600ed3cab9961584909bfaa7ebcf57ad1ea8150fe25978f8ccedf93b45d869bae70728a5f008d483e6f3007d83a15618b8072e +EBUILD lua-term-0.7-r101.ebuild 1176 BLAKE2B bdecbcf3fbdc5a3e2ccf3ea356bbc1745a3f0d44cdac82d520bd279dafd4d579ffbeb4213726c4d4d744b37b699fa5a13d6e354f2f94afae299f443c93fe6ea5 SHA512 1df0ee36917b1a03395c21bca99dea1e258dbe7ce48f2bbda71ae564df2ed0dd020e363c6fedefd484372ed340a667f43959473697ab7084e38b5c9e15ba642d +EBUILD lua-term-0.7.ebuild 1025 BLAKE2B b73c52e43f438101faae494555e4c9b410cbd314a91c943b4bb89a2fb42d373f6a7985ca6e128f7d13253fdb88d4cf64b9c5e55c2de3e7be3ad36ffc44248770 SHA512 739cebf5b6713db406dc1d5ecd118769d329dee0eaad044c23143d6c70e45338cef96b4d88139aff8bfb680c2c14683b5c7311d1cc5af4dc1e108c1e214383e1 MISC metadata.xml 440 BLAKE2B 7578e30f2b7c2b37df1fd563325189efd987df03c42fdb06cfe334a74a7d596b2ef9bb3b1ed2adb9f6aae8aed072cb89df8898d57cab40db23933a54a0963612 SHA512 101ba9221fad8bed21cc6fa169d8063e58cb303f45177a355859e9d3dded2489e22082bfd3104763a5f92fc3d0325b344d4758b5afef7d50d22684fae752de43 diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild index 2ec69903c2c6..ad390ac5cac6 100644 --- a/dev-lua/lua-term/lua-term-0.3.ebuild +++ b/dev-lua/lua-term/lua-term-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/lua-term/lua-term-0.7-r100.ebuild b/dev-lua/lua-term/lua-term-0.7-r101.ebuild index 5ced1bbb4f1a..d9f090f2e7e8 100644 --- a/dev-lua/lua-term/lua-term-0.7-r100.ebuild +++ b/dev-lua/lua-term/lua-term-0.7-r101.ebuild @@ -5,7 +5,6 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} luajit ) MY_PV="0.07" -MY_PV_SO="1.0.1" inherit lua toolchain-funcs @@ -28,11 +27,12 @@ src_prepare() { # Respect users CFLAGS sed -e 's/-O3//g' -i Makefile + + lua_copy_sources } lua_src_compile() { - # Clean project to compile it for every lua slot - emake clean + pushd "${BUILD_DIR}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -41,8 +41,7 @@ lua_src_compile() { emake "${myemakeargs[@]}" all - # Copy module to match the choosen LUA implementation - cp "core.so.${MY_PV_SO}" "core-${ELUA}.so.${MY_PV_SO}" || die + popd } src_compile() { @@ -50,8 +49,7 @@ src_compile() { } lua_src_install() { - # Use correct module for the choosen LUA implementation - cp "core-${ELUA}.so.${MY_PV_SO}" "core.so.${MY_PV_SO}" || die + pushd "${BUILD_DIR}" || die local myemakeargs=( LUA_LIBDIR="${ED}/$(lua_get_cmod_dir)/term" @@ -59,6 +57,8 @@ lua_src_install() { ) emake "${myemakeargs[@]}" install + + popd } src_install() { diff --git a/dev-lua/lua-term/lua-term-0.7.ebuild b/dev-lua/lua-term/lua-term-0.7.ebuild index 0bb6b8e50b15..73309626f4dc 100644 --- a/dev-lua/lua-term/lua-term-0.7.ebuild +++ b/dev-lua/lua-term/lua-term-0.7.ebuild @@ -16,11 +16,11 @@ SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-lang/lua-5.1:=" +RDEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest index 174b2134c38e..be47345b4118 100644 --- a/dev-lua/lua-utf8/Manifest +++ b/dev-lua/lua-utf8/Manifest @@ -1,4 +1,4 @@ -AUX lua-utf8.Makefile 1099 BLAKE2B 5a704cb815f41cee6a5d681ec80f9c3ceab97c6711fddcd91581aaa39d033a418bccc0c59e1c41c1d7f5ada1b85615566d3443f2dcf02e57c8dec88c5480fe41 SHA512 f7a2b59c22cd92b7560a24ac469ffdd24641ab9907c26a8c22d944e75f26b3fe2d80298d70138fd6bdfc5da7a87b1a52cb7243106b47f6daebb237a17fdb06f4 -DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B 99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471 SHA512 e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897 -EBUILD lua-utf8-0.1.1.ebuild 1034 BLAKE2B f10339a910b503ba834c10f751b9f41d9a5b3f6ff0dc51eaeffd475bab04bbed9a0e3f1076580a640b257e359ce3cafec91e1b896b44ada7c2fc6655b55ca4af SHA512 067eb57332bed9152f09e1776dfb6e4b4727f2a8b14ad38ea91708a176ccaf84f3fd2d3ecd3a3bd67be27ea90a4eeaf78e46d67e6b108124afce767b59c48212 -MISC metadata.xml 639 BLAKE2B eaf42f0f69767063b2e0c4745bd49529dbe1c8edd62dc22422a1af9363321f610625ad138f6a7a6828ebdfef0ade15577ed062f4de2817d99dfc2864c305ae09 SHA512 785c2139f6715e4b177d1d97f7ec13988f59af95461af9400e6085388cac83fcb99e3eb65cbf47449be9ff60ee4d0662316ea82b5fb761a22b3d8207b27b465f +DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29 +EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e +EBUILD lua-utf8-0.1.3.ebuild 1349 BLAKE2B 7a294e8656fec4bb7c97f54d097927c64d4696cb57d720de37ca191c9200baf13dc4cc938ca65ba1cc09bfc875bc6c13c522552c11be4aac41d7c5afe7b296d8 SHA512 32afd12f4c12dea25be60c0006058e78f9097598530eca2f01abc0a062e021fc1651c5a897336e287003b3e1d1db0898a3219e557a3061966679752d66c19d2d +MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile b/dev-lua/lua-utf8/files/lua-utf8.Makefile deleted file mode 100644 index 456c52f4aaa0..000000000000 --- a/dev-lua/lua-utf8/files/lua-utf8.Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# this file builds lua-utf8 - -MY_USE_LUA?=luajit -PKG_CONFIG?=pkg-config -PREFIX?=/usr/local -DESTDIR?=/ - -LUA_LIBDIR := $(shell $(PKG_CONFIG) --variable INSTALL_CMOD $(MY_USE_LUA)) -LUA_INC := $(shell $(PKG_CONFIG) --variable INSTALL_INC $(MY_USE_LUA)) -LUA_SHARE := $(shell $(PKG_CONFIG) --variable INSTALL_LMOD $(MY_USE_LUA)) -CWARNS := -Wall -pedantic -CFLAGS += -I$(LUA_INC) -fPIC $(CWARNS) -LIB_OPTION := -shared -LDFLAGS += $(LIB_OPTION) - -SONAME := lua-utf8.so -SONAMEV := $(SONAME).0 -LIBRARY := $(SONAMEV).1.1 -SRC := lutf8lib.c -OBJ := $(patsubst %.c, %.o, $(SRC)) - -FILES := parseucd.lua - -all: $(LIBRARY) $(SONAMEV) $(SONAME) - -$(SONAMEV): - ln -s $(LIBRARY) $@ - -$(SONAME): - ln -s $(SONAMEV) $@ - -$(LIBRARY): $(OBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc - -install: - install -d $(DESTDIR)$(LUA_LIBDIR) - install $(SONAME) $(DESTDIR)$(LUA_LIBDIR) - install -d $(DESTDIR)$(LUA_SHARE) - install --mode=0444 $(FILES) $(DESTDIR)$(LUA_SHARE) - -clean: - rm -rf $(LIBRARY) $(SONAMEV) $(SONAME) *.o diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild deleted file mode 100644 index d3dffeb9e9fa..000000000000 --- a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="UTF-8 support for Lua" -HOMEPAGE="https://github.com/starwing/luautf8" -SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64" -IUSE="luajit test" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:2 )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN//-/}-${PV}" - -src_prepare() { - default - - cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die -} - -src_compile() { - tc-export CC - emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" install - einstalldocs -} - -src_test() { - LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die -} diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild new file mode 100644 index 000000000000..48e0614d06d8 --- /dev/null +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild @@ -0,0 +1,82 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~ppc ~ppc64 ~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/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild new file mode 100644 index 000000000000..f41c166ac3aa --- /dev/null +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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 ppc ppc64 x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + local compiler=( + "$(tc-getCC)" + "${CFLAGS}" + "-fPIC" + "${LDFLAGS}" + "-I/usr/include" + "-c lutf8lib.c" + "-o lutf8lib.o" + ) + einfo "${compiler[@]}" + ${compiler[@]} || die + + local linker=( + "$(tc-getCC)" + "-shared" + "${LDFLAGS}" + "-o lutf8lib.so" + "lutf8lib.o" + ) + einfo "${linker[@]}" + ${linker[@]} || die +} + +src_test() { + local mytests=( + "test.lua" + "test_compat.lua" + "test_pm.lua" + ) + + for mytest in ${mytests[@]}; do + LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua') ${mytest} || die + done +} + +src_install() { + exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" + newexe "lutf8lib.so" "lua-utf8.so" + + insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" + doins parseucd.lua + + einstalldocs +} diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml index efc3ff445600..e9b8d834be80 100644 --- a/dev-lua/lua-utf8/metadata.xml +++ b/dev-lua/lua-utf8/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="person"> <email>vpayno+gentoo@gmail.com</email> <name>Victor Payno</name> </maintainer> diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest index 8ed790923bc8..c500fec3be76 100644 --- a/dev-lua/lua_cliargs/Manifest +++ b/dev-lua/lua_cliargs/Manifest @@ -1,8 +1,8 @@ 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 -EBUILD lua_cliargs-2.5_p5.ebuild 876 BLAKE2B ba627334a770918356cd474f97b7b8f39bad574cd26ecc7de552db033920797a709d78285dbb7940c4800a690133a06d239b618c9635ecde5c2e2367b65c651c SHA512 00571f5fc51ba97a5affd68efa419c47e8646e9cb0ae1d99f085b0a0032dcfcf42b58e4405b7143a7f4bf114b136013ad5e8e5a7986537439a3517a2fc3b98a0 -EBUILD lua_cliargs-3.0_p1.ebuild 906 BLAKE2B 8e1c46a73b29fd61fb06a5fa8fcb202d91df30748e6ab0fa24b2e3befb930c051c451aecaff0847f4156c68b82dc26a87c55dc61a25d91eedf84fb3e3dd451ec SHA512 24b3b938bf998a0c12a48854356d6854c40ce06c73f9dad9c276f1cc69cbee7cf9612440ec045e8584bfe0b7908dafdf6c49a216ff2febbd6630c3d2bbb684b2 +EBUILD lua_cliargs-2.5_p5.ebuild 874 BLAKE2B 2584944e83c43a79113ff69476e94c16831695fe3fcb745fbec0efb51cc432032a2cc391a4e898e58e1caf706a4bf8a8fc9c970888049a05d8d066170330ddea SHA512 c7f3758ab7fd4e99e13e109b9a2d244471da037ee5b0a625c0578549d926ec7f67582f851d7520604fa1e06065e01e3d5d0b0394d998bb8de2632b6754987ff8 +EBUILD lua_cliargs-3.0_p1.ebuild 907 BLAKE2B 45f6593655405c628fb4396b76a37c5861f7612c34fec21dbf53fa390339486a371584590d5fc141e553c1e740932584445f371f9cd280672c0e91dea5588658 SHA512 c6da49a9e1e151072fdafcfe06ffd4613511e8ba401d4ddf992c40d6ce3626af85a4bb9f22097d1860389013b930e732c17fbef8a83f4445fca36d0c18193d58 EBUILD lua_cliargs-3.0_p2-r100.ebuild 785 BLAKE2B 44f5b4d3515c9d84f989a4cb9d85d28118697fad315ea588986fcb71dacd41d61648af38c0fc7a9bb90ca976080ca1dff1ea4637a845918909eb793f90ec11b4 SHA512 c0547e4b6fa033cfee5d481af99850aa90edeb5225dd8213993c8347f2396ff0dbc608f31e00beda69b335ac7ad4508221cb72f6d12cacb3e038bc68ca10d04b -EBUILD lua_cliargs-3.0_p2.ebuild 908 BLAKE2B 247ec30f2616cc0a5a043d85c1c8bc8f7c3098baa8554d25603130d5f082368b82cf3ed84cf747c3e670a24a8f0894737f39bdb27d81624526994bed9aefece3 SHA512 54c6ec9f7ba5c9921c4d2c9e578110b4a6e1100e77611fce95bd407030d04046f32bf0756d9f316563a9adac796122084ada7280b916b29d65c85fd59eb95ed5 +EBUILD lua_cliargs-3.0_p2.ebuild 908 BLAKE2B 858e549f2e98ff055f328fb8b338209c84041956179e512546009e80a64af69bcf4430592cc30842e68a1aaf1b3c82c788a082860d52c07dcd546ac17c7a0cb9 SHA512 e45bdef0bf583aa712d4e85a0b6b3197faeb35051c8e9355dff939fb4b68e32ee4b0da6ce245c6a2f50356b8bc9612750641b50c3d9cee7faca502d9d8dc63c7 MISC metadata.xml 662 BLAKE2B f439daeab6ac235e0f754364c7a54ebb313df50fa96288a4f47f75e259809396c9668b216d2ee0bb930413af44ff181a026247db0be3d6f482e95507c3e5e3cd SHA512 f64fe9598875b158de72f71438193fa3558199f41d5981657481a8dd103d35dcd579cdfd10520e8e30e89a0b030c48ab81d358d5f8e363337d1ac6bedab6357a diff --git a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild index 703880029899..15cdc866d789 100644 --- a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild +++ b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild index dd6a99c24ac3..d60495be4e4f 100644 --- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild +++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild index 4111aa5165e7..be2c348c046e 100644 --- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild +++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild @@ -16,11 +16,11 @@ SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="doc" BDEPEND="virtual/pkgconfig" -DEPEND=">=dev-lang/lua-5.1:=" +DEPEND=">=dev-lang/lua-5.1:0=" RDEPEND="${RDEPEND}" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest index e41482e1b190..cc05c8ebe35e 100644 --- a/dev-lua/luacheck/Manifest +++ b/dev-lua/luacheck/Manifest @@ -1,5 +1,7 @@ +AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec5eb3d073a5e907c6285a6a2a26f1563940435a111d74274dcdff76f7662d8b623c86658fa0a0b568e150cfa059d2100d82b7f65fcd293b361ec6c45bf SHA512 046cc3ad7e74435b3c6df1a5d271e82cd90a3c02c9228c5a632b13378a8b17c3cde21b00fdc84ab350493b64ec36beb10591a32d52b96010481b7d6a08655392 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028 -EBUILD luacheck-0.20.0.ebuild 1054 BLAKE2B 3e5aa98c7f3953c831904625dcbcaa24b662620b57a04f85d03c189330f44e305c33b578320aecefd1cd4fdd1aa70fbb839a8f7fbcb563bec6e4be77cb02adff SHA512 3e5c5bb402eb22c464c1d080f23dac3952bd5fbbcb7a21747badf01fb274295059c39ea33f560636be0100dca2fb55cfbdeff8d04703df9eb52c3264ba003834 -EBUILD luacheck-0.23.0.ebuild 1159 BLAKE2B 5e2f247d700f03f376f9cb6d8ed5143b35a084439c5e7ce5a7709476a4c5d27c79b2eec9b77018f2be99cb6fb113dfa3932470e29d87edd21809f4da516c7513 SHA512 11a5bc70bbcab18b03b6e4ea0060cfc8af8836d2cfefadcd851c145e81d4e30bf4a4928d04ca37c57ec3dde7f0b72f9b757506b2e2f74bd78479b6da6a827699 -MISC metadata.xml 718 BLAKE2B 6fa684f1c29b7ce764e08e6643404e461bb2def6a4e08bca778f81798147de4d1c924038d8a824276623aff9a34a5cd17c7296ccb2d3a57b5d1fe2cc1252bbb9 SHA512 2fe325b68e5bbf2977f1d6dc956080815b7cfcc54105f4138780394592f93c0b490ad21dce68cddbbb7678a62e8a79fda9795e1652e4ee72acdfd5a6650efe46 +EBUILD luacheck-0.20.0-r1.ebuild 1058 BLAKE2B 17d25640c64b9a53d97e8419636095121d5e95507ececa6872966c78e080c3eda19dce658122aebb65bba737a75c36de78599e3eb8a364eb03e452928599de31 SHA512 715beecb4032116aa52093df41e886159d1bf856ea05bbbf281926cdcb0631852ffe382f3ec387538f3f8daded32a2983d8bef29e66922c25a54296ed0e73d21 +EBUILD luacheck-0.23.0-r1.ebuild 1245 BLAKE2B 568fbade223112f4e081765806ab6a92ecc0f913627995a44b12734b978f0cbb8e6fbda427760735e713cc14a0748488957703bd1aeedf73b5f837854da20b99 SHA512 322e9564e864a389464010ab47ad8fa0f516e6efb3e463ad26714be7e4fa80352b57eb031216b402e5b976e40504310a2434dbf20bd6e4d2ef810c28794286a3 +EBUILD luacheck-0.23.0-r100.ebuild 1233 BLAKE2B 0f0c4a4a006df2c9060edfb516f39523165f057b43fa2fa133344993a7221b1a247fe682893c858b7d31f21f5b81a6cbfc5049aa88b138c445832db2d144cfc4 SHA512 cbddb5dd61591e2caae6d78f4a4b5cf04625b809f7e0717cbdfa8f4cab311426bdba711e6d215f5d5f61c4959a6594e269279d5506ca185c84ee65498a019677 +MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6 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-r1.ebuild index 070046152a0c..857d9ef215df 100644 --- a/dev-lua/luacheck/luacheck-0.20.0.ebuild +++ b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,8 @@ IUSE="doc luajit test" RESTRICT="!test? ( test )" RDEPEND=" - dev-lua/luafilesystem[luajit=] - !luajit? ( >=dev-lang/lua-5.1:= ) + dev-lua/luafilesystem[luajit(-)=] + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/dev-lua/luacheck/luacheck-0.23.0.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild index bfdbe93ecb29..bad05ff91e43 100644 --- a/dev-lua/luacheck/luacheck-0.23.0.ebuild +++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild @@ -10,15 +10,15 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64" +KEYWORDS="~amd64 arm ppc64" IUSE="doc luajit test" RESTRICT="!test? ( test )" RDEPEND=" - dev-lua/lua-argparse[luajit=] + dev-lua/lua-argparse[luajit(-)=] dev-lua/luafilesystem[luajit(-)=] - dev-lua/lua-utf8[luajit=] - !luajit? ( >=dev-lang/lua-5.1:= ) + dev-lua/lua-utf8[luajit(-)=] + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 )" BDEPEND=" virtual/pkgconfig @@ -29,6 +29,8 @@ BDEPEND=" )" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" ) + src_compile() { if use doc; then sphinx-build docsrc html || die diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild new file mode 100644 index 000000000000..d39540a1c32e --- /dev/null +++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua 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 ~arm64 ~ppc ~ppc64 ~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-2.0.0-r100[${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 dcba9d1f5774..fa1113bb8edc 100644 --- a/dev-lua/luacheck/metadata.xml +++ b/dev-lua/luacheck/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="person"> <email>vpayno+gentoo@gmail.com</email> <name>Victor Payno</name> </maintainer> diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest index 6350be172825..e7b2773ed31e 100644 --- a/dev-lua/luacov/Manifest +++ b/dev-lua/luacov/Manifest @@ -1,4 +1,7 @@ AUX luacov-0.8-fix-makefile.patch 681 BLAKE2B b3f81e28207a97a774a4da75723d006ab043bc4363757ffee44e7b456b44e5ce31e8dcea5dc6f5989595ebef98f4c546c5ae64dc52be7dbc3e2243f9bcad597b SHA512 603ac926108e30d511ac0fba66576fbbf7b98b468bed1a0026addf6f0361b38e41b9d967f983b3a8147b853055538e2ec2f87efc896542e87b73073bc0a881ba +DIST luacov-0.14.0.tar.gz 49571 BLAKE2B 2248fc00e1af0a1cdec923bbe6150ae682cc1ba814c77f21bc86269d723ea80542fb48fe62980de2527040598b7b9c87f92f146d6c62abde06651fa6733c75c5 SHA512 44ea158ce597f705d80b9768676e401804daea91b9c2afb146a8d25aae612e895e4f42a29c4b7b3438659c596fa500af5d23b66b7f3477459747ad06ca9b7ffa DIST luacov-0.8.tar.gz 33613 BLAKE2B 942c47de25dbd53de445e1ed1fa924f1be278da4c3b134e4a603f4a5ab5090f87d762c48163cf82ed9bab585e35b0528c330b3dc849e0043ccc96532107c8a94 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11 -EBUILD luacov-0.8.ebuild 747 BLAKE2B e10a473a15575943822d8991d1e3a1181f28cfa49e4fdcf433fef147ff412214685fdcd209b6da9eef7e677ad15002a22e1755454a0c86d6213a2ced860bd232 SHA512 e81255d4b67320c740e3365d06d2bd5e4f3325f01a294f65b6dcfc3af4ec07a8538870729f612178239659904566e2274995ee8fe613db57c3353f7ac81711e5 -MISC metadata.xml 333 BLAKE2B 44004b691534cc3e6c3c15893c4072e1d6f6b75efcb60e4b878623905bfe4f58f2d0937dda4d0a390e0cf1180888110a95e8d73dd6c49e12c403127be1ec80f5 SHA512 def342f3921b136c3707595b1fd7065a439c682afc0f26e8cf5074bfad07436e35e7cbe572f1d87d911916991263545348d8c68e9e035789fa3f241710ef7431 +EBUILD luacov-0.14.0-r100.ebuild 926 BLAKE2B ae2b4f00201d9a4d17ffabd7ea0d070fded35bc937a8104a4fd9c197911be780cb1c1026498bc9f5d02e4d85b1c4014ea6fa9b4ea4013bbe9bdf9839289672ca SHA512 85d48dead19eca935b1953c3765ef71095a59c05bb3dfee2ee1d4c024e68e9312fb47c343ea0834ac6adab6e8278e0f0f9daba055c10a3f49808a6e6356742ca +EBUILD luacov-0.14.0.ebuild 918 BLAKE2B ba1ac686f6c27cd20c60305d033871a32ced04a14568d964c0e0218ded7bdde382bd21c3dd27708518f3d7a5394305c369313830f59d56c9c597d2a751dcf28e SHA512 dffd8fe81badd34b30f934f920db250d5de56ce9ae4c41d3ce79b1ce0a0e588f0394dbc13c5210bd5edeb581984ba71f5a08ed14a0127ab9b698d00a3a092a84 +EBUILD luacov-0.8.ebuild 745 BLAKE2B bd3cdbb5949c1b5c1d56f44e3011cbca14bf3b44214e204fdcbf070e6afdb04b17bb381dc1c3a6835e8effff35d1708cea79be1055441660ab89f491f94e97a2 SHA512 57a4527d75deb98a74215538ebdee6ab17731c3884191f68d8556f1714187b61e5f7e4528b6d9b86526f8fa4a68e44ad261d551f65ae50a9c78c5950a4d6f278 +MISC metadata.xml 444 BLAKE2B df7d267a7898a881b15602c91495029c54b064d8a3415ed44d404cad9425ed78269470f632df654291838bfa10e0f34a3dc0deec6f3bae979d6495ea4b4b14c1 SHA512 d9238e357035e46dbb66af1ff1a7a5e1c552b31f5c9cc526183dea163637fb94058a1345cdf73682d49494d9eb9995d802c4b7bcbac54787dbbe6c2a5de42ae1 diff --git a/dev-lua/luacov/luacov-0.14.0-r100.ebuild b/dev-lua/luacov/luacov-0.14.0-r100.ebuild new file mode 100644 index 000000000000..9f9d91d40d6d --- /dev/null +++ b/dev-lua/luacov/luacov-0.14.0-r100.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~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}] + ${RDEPEND} + ) +" + +HTML_DOCS=( "doc/." ) + +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.14.0.ebuild b/dev-lua/luacov/luacov-0.14.0.ebuild new file mode 100644 index 000000000000..ab0c2bbc60d2 --- /dev/null +++ b/dev-lua/luacov/luacov-0.14.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A simple coverage analyzer for Lua scripts" +HOMEPAGE="https://github.com/keplerproject/luacov" +SRC_URI="https://github.com/keplerproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="luajit test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted + ${RDEPEND} + ) +" + +HTML_DOCS=( "doc/." ) + +src_test() { + busted --lua="$(usex luajit 'luajit' 'lua')" || die +} + +src_install() { + dobin src/bin/luacov + + insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + doins src/luacov.lua + doins -r src/luacov + + einstalldocs +} diff --git a/dev-lua/luacov/luacov-0.8.ebuild b/dev-lua/luacov/luacov-0.8.ebuild index 280c33a87c1f..97c531edf6c9 100644 --- a/dev-lua/luacov/luacov-0.8.ebuild +++ b/dev-lua/luacov/luacov-0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml index 772969c18c24..09de5599f7cc 100644 --- a/dev-lua/luacov/metadata.xml +++ b/dev-lua/luacov/metadata.xml @@ -5,6 +5,10 @@ <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">keplerproject/luacov</remote-id> </upstream> diff --git a/dev-lua/luacrypto/Manifest b/dev-lua/luacrypto/Manifest deleted file mode 100644 index 14618bace70e..000000000000 --- a/dev-lua/luacrypto/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX luacrypto-0.3.2-lualibdir.patch 299 BLAKE2B 83ec7d532aff1109b78e659abd33bf1df4eae736b3e1018f5283c74ec11be0e79b5d08354d979ae17c2d9da7426295190b203ff01d6c004de6cfde202a0bead9 SHA512 cef182827a67229396dc53f0980829065f83fdd3a1bb6069e452b3945bd74459898954a2f1b3f9ada1d3834388446a720a3d24a1f070efdb814227ad94ea6735 -DIST luacrypto-0.3.2.tar.gz 374363 BLAKE2B 043ef787f9b99f7d25bfa9a96d2495f2bfbeec0200c956b978cfc003c51f0faba99848bf290e011a3f8ba8a50d99bf5b6f9b5346addcd57f71978a4af8f4117d SHA512 4cb20d2cc348a11f140210dffb803629034c72cc7232590f4488f559d5c7233e0c41e56fcd0863959ac0b07e64c9aa79ea573e4126fdc11bc3f1b3b49d13343e -EBUILD luacrypto-0.3.2-r1.ebuild 783 BLAKE2B 0581b3b15910828b6771ca212fa407aba340d50ad4fee724e2372184111f6421bb0d039bb7dfdbd1cb49dfed7d255917758c3625e0d3df07b7d27355e8448baf SHA512 d76425f1ee2f84d879008a802f9838c3f0c9706746b1c46b053e3e449723b2431f571355e1d9bda500ec0ecc492ebfbb6ca528f820c0dcf26c2e33db309ff090 -MISC metadata.xml 255 BLAKE2B 2bf4f730b919a8331ebff73c5bfcf38c49a55714816935d0ad50d95736da91b3984399501e02ad6d50a6bba120cc0c1e70b115e3704215f589616994e23e305a SHA512 2cac273dcf66f34dd2c722aebdac845b9e22f513915d2ad8a0cf7e850b343bbf2724ae8dfe151b49dc57a87c85214d70e4ec081237e8ce8ba2c7d9dcd1675ce3 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 5dadf1c93111..000000000000 --- a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools ltprune - -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 dc48755cf79c..6a86b46dee61 100644 --- a/dev-lua/luadbi/Manifest +++ b/dev-lua/luadbi/Manifest @@ -1,5 +1,5 @@ AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9 -EBUILD luadbi-0.7.2-r101.ebuild 1797 BLAKE2B 2bd8f4fa6c4af9cff7520eadc714ae84ffa2ed58133f540ca80071724db3d7ee82497a69ccf647969bc014f6e46501a4444d7432ff3a713c51e46d36c5fe5f18 SHA512 d15563be1d3f6dc22ec444a3988ec83aa73200e9a4e38bf767a72664a2dbad9cadf2cd541f3114f09c64207cb31dfbc8a80e6c15f80e5a7f72ba3b27c999e303 -EBUILD luadbi-0.7.2.ebuild 1579 BLAKE2B fa7b1bd1ae6913826966f6687ae8af24f62f3cc4771133ddc17cf72b1b2ff87dfe6a7b0034defe931e7cf5062efcb101609664e6be1a2de04648360141bff7b6 SHA512 923534935b8aa20d437fcf65b62a75853e7c80c00b43f48455ffe9f050cf0fef3e2828afee2b402faa7713c035c484f6dba982357f42a344ba6800cf147e09df +EBUILD luadbi-0.7.2-r101.ebuild 1784 BLAKE2B 363d75d53e1ccd55d89ecf9f1961957c2bb8b7ff2d3b54dc886dec1b0cca608ca5a2414b08f77c6f0932c63f86a0641ab7aa0b905ac133e9ba2f93ef48c29ebb SHA512 4d5c703f8b7268ee0304736af83ae2fc8d5ab30c3e2a5d5bec7a4a0a65d877a09cbc8b1e5ca60e2901f375047cae092554c60d6cbfd09bcc1b819d834e6679c7 +EBUILD luadbi-0.7.2.ebuild 1580 BLAKE2B c496005647a4783c57f2a7cd7482a46dc92e5efbc8e1760e26255270f04d2bfa5947b8d7792bc8a8d3f6ac75d2db89ce36841e3f5a8094670f95a31da60ec513 SHA512 135ad359cf5c5e4a3ad2cec2c436f624d52e49954f6fd44f2b28a58733c14a63eb145574f1a5677cf3063c737a21cb25648fcfe32a01e2ca7ca6707b89b65eba MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030 diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild index f19a4a0b67ff..03742f998777 100644 --- a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild +++ b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild @@ -33,7 +33,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig test? ( - >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] + dev-lua/busted[${LUA_USEDEP}] dev-lua/luarocks ) " diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild index 338881effc6e..2ddcc6056bdc 100644 --- a/dev-lua/luadbi/luadbi-0.7.2.ebuild +++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite )" RESTRICT="test" RDEPEND=" - >=dev-lang/lua-5.1:= + >=dev-lang/lua-5.1:0= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite ) diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest index c375026b5773..f79aa27f893f 100644 --- a/dev-lua/luaexpat/Manifest +++ b/dev-lua/luaexpat/Manifest @@ -3,8 +3,8 @@ AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff AUX luaexpat-1.3.3_restore_functionality.patch 3944 BLAKE2B d6e502f44039110cfc8eabc3a83405b0c72522ec43628af16f72d21d0976d617e7280818259258c15cb8582f917e5fdadd81bc2ce35c052a951fec0ccd200e5c SHA512 f6e56fc84550af781c40d8bd004c3f840021a730cccd988f5547b83e2ccc89072ebd09f49631442b25fac8a81a4d7e7f5d4163d7f62dedc876356dee94d96b41 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 -EBUILD luaexpat-1.3.0-r100.ebuild 1655 BLAKE2B 9f44f5f19c9caafe525688caa9bead4d5f2b4d171241b6198b5a84438d8876e6f52faf224a3866c044a83c89843f9d01fb3fae3ee49cd5df5c4bddff8221e3f6 SHA512 a618f92cd3cec78238166e252344493b40cacc009beb098f345772884750bc276ba565ec70ff038f7261d1d7020b21af6f0bdd484cafa6fd0ef1aae5f8a2c970 +EBUILD luaexpat-1.3.0-r101.ebuild 1581 BLAKE2B 816e833cbb778c2316bf85bb153113cb1d16ccbc820e2be64c17ea71d2c5467726d1e5e9cce7da19bb01b9608558befbb384e31dc20956201a4563efbfa22f70 SHA512 593005ef0cbea267297b0b9d124294b557392235e911b62ad3e34614874158e4b9b348b54a59196d5e0642e2e49100c35e808f1fb772c191f216324226b137b9 EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20 -EBUILD luaexpat-1.3.3-r100.ebuild 1783 BLAKE2B 3707e3ffffc44ce4c6c466513529f367964875d9d500ecb1394c203b2425f06b4601a18210ec47328c22c789e745b9f6f9e912e30bd3118c5c59ee235ce71c76 SHA512 f791c4ca6cc4416e3537dbe833eb3e7778a0050461f63627c1abb65a8afac46636bccdd15388ba275bb0a82a69e73793488f1d07b03fb3a7975d1e5b5d45fd41 +EBUILD luaexpat-1.3.3-r101.ebuild 1695 BLAKE2B 7b1dfbc44dfef10261a7c29c6ee79ba746895acf18989c6a632f93e9b3679130192777eaf862fd0a782152165ff8310416fc76a32d1430df34d04453991ecce1 SHA512 5445507e3d85b63e7abfb716e62f7215bda602da4533070b5d97ad977a4a5d1c15df7bff20ac81bde1b1b1c6d0e7bbf049f7834a7e0c0c4940600855fa451010 EBUILD luaexpat-1.3.3-r2.ebuild 1265 BLAKE2B 3ddd7ae3f5a75fac07bbb465dc1477c59f6ac950b3cd3d2ef1171444122788d59b4e0e2d865590b52e4e6ecbcbbd0be67285b4137de3a41e3039344c1a6d764f SHA512 681d5ee8233e60ae96d84f6315c9886080dd211bd55c8e3ceb89b679221c0d3bc8871bf96ee8b91c24fa12feecca6f213e6e0f91de94b9b102e4308130ee208c MISC metadata.xml 575 BLAKE2B d4d3ac883ccfd199e985d1d78be584a14b0233550e41142bdfeda2243d514476daeef6b47d2ccba16525eccc58df0ec58215b810b995d0b83df53c6de58a2895 SHA512 5d1e6633bab522940d2461d230f3eff660d3c0088063ec82c7506aeca071a553d63893851968c20f4073bb2fb554e63deb2da54b405a4c75923e77f4286fe578 diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild index 28ce6e137095..b062c42090b0 100644 --- a/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild +++ b/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild @@ -33,12 +33,12 @@ src_prepare() { # Add '-DLUA_32BITS' for fixing compilation with lua5.3 sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die - multilib_copy_sources + lua_copy_sources + lua_foreach_impl multilib_copy_sources } lua_multilib_src_compile() { - # Clean project, to compile it for every lua slot - emake clean + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -47,8 +47,7 @@ lua_multilib_src_compile() { emake "${myemakeargs[@]}" - # Copy module to match the choosen LUA implementation - cp "src/lxp.so" "src/lxp-${ELUA}.so" || die + popd } multilib_src_compile() { @@ -56,8 +55,7 @@ multilib_src_compile() { } lua_multilib_src_install() { - # Use correct module for the choosen LUA implementation - cp "src/lxp-${ELUA}.so" "src/lxp.so" || die + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die local myemakeargs=( "DESTDIR=${ED}" @@ -67,6 +65,8 @@ lua_multilib_src_install() { ) emake "${myemakeargs[@]}" install + + popd } multilib_src_install() { diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild index 7674c7cd76ab..490ff8633d54 100644 --- a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild +++ b/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild @@ -38,22 +38,21 @@ src_prepare() { # Respect users CFLAGS sed -e 's/-O2//g' -i makefile || die - multilib_copy_sources + lua_copy_sources + lua_foreach_impl multilib_copy_sources } lua_multilib_src_compile() { - # Clean project, to compile it for every lua slot - emake clean + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die local myemakeargs=( - "CC=$(tc-getCC)" + "CC=$(tc-getCC) ${CFLAGS}" "LUA_INC=$(lua_get_include_dir)" ) emake "${myemakeargs[@]}" - # Copy module to match the choosen LUA implementation - cp "src/lxp.so.${PV}" "src/lxp-${ELUA}.so.${PV}" || die + popd } multilib_src_compile() { @@ -61,8 +60,7 @@ multilib_src_compile() { } lua_multilib_src_install() { - # Use correct module for the choosen LUA implementation - cp "src/lxp-${ELUA}.so.${PV}" "src/lxp.so.${PV}" || die + pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die local myemakeargs=( "LUA_DIR=${ED}/$(lua_get_lmod_dir)" @@ -71,6 +69,8 @@ lua_multilib_src_install() { ) emake "${myemakeargs[@]}" install + + popd } multilib_src_install() { diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest index 4881d745ac57..1b5621a0b987 100644 --- a/dev-lua/luafilesystem/Manifest +++ b/dev-lua/luafilesystem/Manifest @@ -1,4 +1,4 @@ DIST luafilesystem-1.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247 EBUILD luafilesystem-1.8.0-r1.ebuild 1074 BLAKE2B 5fb971448dfb2fd52e15d05dccbed4a685eee4501d23ae260ea42747dcfe8923c22153f3bc9d8cd3fca4051477d2721b8e050607c2ef287592c55f460f8f5105 SHA512 0a7636dd88865d9b0139a376e0129e48ca83f422401ac598b47c118fe3fb7eb79a87280f5f8fb8963d2fb88145155180521e0519b58fb580c0a5a8b078c1a94b -EBUILD luafilesystem-1.8.0-r100.ebuild 1622 BLAKE2B 184a8f9b5e4c847d4b3cf9915e773b99082308e4b8d5b4659bf2c80085d0d5002f63221820d36aadfc2a6430b80eea900753c34f398691f22e1947b05cba42d5 SHA512 f28887f4a48c54bf5f6a1abe3b8e3133ac8c5b7247f0eca26d12a1ee8ebc8d4f33c601cb8f0816382cf5c32e15275a6cd716de6f0b353705c4ca52ec2c8ff26a +EBUILD luafilesystem-1.8.0-r101.ebuild 1515 BLAKE2B 31bf46921da517929e7039756a21d1bdf38a3a2ad8324a3304fbbe5aac787f0cd210f053557c2e3144733c707f62e03ac11bcda484f79f22dff1bc58a5138a53 SHA512 cbfb607b3513b63a98d82ae77422e78b9732b68b1ccb886e32af68e2d8c63866a9fb8f755110623ee816924cf352a5eb73e2e7dc70a4cd8780b49d2fd34348a0 MISC metadata.xml 858 BLAKE2B 6f50e96acfa2b1aa606c616eda03ac35c214902a2d39dee101ecc32a3f1fe91980d4f735e4ecf066133d573910b10dda51ca1e57421f9f5327148e74fde3212f SHA512 6816a7b67fd5c7cab8cf90b2e096877e360e482644b339214becbc47dcd6b1b6a3e49470a481493dc31fe611d8c8ff7470b7c4eb5080bcd201e6543dbf3f2a7a diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild index a1e0b4c454bd..0a5ee44a7d7c 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild +++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild @@ -31,6 +31,7 @@ BDEPEND=" HTML_DOCS=( "doc/us/." ) lua_src_prepare() { + pushd "${BUILD_DIR}" || die cat > "config-${ELUA}" <<-EOF CC=$(tc-getCC) DESTDIR=${ED} @@ -38,22 +39,20 @@ lua_src_prepare() { 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() { - # Clean project to compile it for every lua slot - emake clean - + pushd "${BUILD_DIR}" || die emake CONFIG="config-${ELUA}" - - # Copy module to match the choosen LUA implementation - cp "src/lfs.so" "src/lfs-${ELUA}.so" || die + popd } src_compile() { @@ -61,7 +60,9 @@ src_compile() { } lua_src_test() { - LUA_CPATH="src/lfs-${ELUA}.so" ${ELUA} tests/test.lua || die + pushd "${BUILD_DIR}" || die + LUA_CPATH="${BUILD_DIR}/src/?.so" ${ELUA} tests/test.lua || die + popd } src_test() { @@ -69,10 +70,9 @@ src_test() { } lua_src_install() { - # Use correct module for the choosen LUA implementation - cp "src/lfs-${ELUA}.so" "src/lfs.so" || die - + pushd "${BUILD_DIR}" || die emake CONFIG="config-${ELUA}" install + popd } src_install() { diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest index ed1d332c7ad9..64377feac181 100644 --- a/dev-lua/luajson/Manifest +++ b/dev-lua/luajson/Manifest @@ -1,3 +1,6 @@ DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2 -EBUILD luajson-1.3.3.ebuild 703 BLAKE2B c70cb25e3cb06d2577abfb8c2ac9494de6a595008e14718f6e690f74ff1c4d87b686a8004546bf329199ff9205d66d77a6ac64878df0e5a13624a65849cfdd09 SHA512 c44bdd39573ba281e6972ccf749385a2172d6353ebbe4784a2ff577ff718c894109aa203d980eb98488719e52b9eeb49c45f79e65ec5cc88562c4bbf1db3c37f +DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7 +EBUILD luajson-1.3.3-r1.ebuild 717 BLAKE2B 2979a988cec939d66bda0326af0f50c0cae2e70b546289a014966025deb3ad7e896a347ac18d518e2d6554a0e480ff2be0eef0fc516e72af2a1be3600394f649 SHA512 e932872553f077207e134bbd6c9e524984b7b80c38780ff0b61d1957e8820ddb4a97a849d614845d20c53ee58f5e0c8ab3f9f1db899728834bc349c89edc925b +EBUILD luajson-1.3.4-r100.ebuild 829 BLAKE2B 9ea935a008b6c54953e9c7588de28b93f1fb2f2bdccc36cb5ed005b34ebb58caa6271d722f566ed69e41c104eb1218e893559d13d45b2351e5373391cab8ccb4 SHA512 d5aa6b0af940b30ca1439537f886ee4597e42e12c110cbcc947edc1e78ca41dd3b86039667db1c45b85f4ef99c0609e22e1184b87ef9394600f0e19aa9f52bfe +EBUILD luajson-1.3.4.ebuild 883 BLAKE2B f979c521af83e134b7773dfab4b90f3738e72fe9d5b402db2a4c6124109c0db98003b13d80916519b2616c7f2825c4bc123f642c11c19aab9d263d96d3ecfd43 SHA512 f6c7695856cf28abf436e2177f58b1d084d08a8d94144594bb50ed1b5ca210e9af0783a4f4a9123e8ce3838f373ab2a417998e4e2b210a3c05df40528ce8d86a MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c diff --git a/dev-lua/luajson/luajson-1.3.3.ebuild b/dev-lua/luajson/luajson-1.3.3-r1.ebuild index 78c00286a7b2..48f67efbcaae 100644 --- a/dev-lua/luajson/luajson-1.3.3.ebuild +++ b/dev-lua/luajson/luajson-1.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="test" -RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) +RDEPEND="|| ( >=dev-lang/lua-5.1:0 dev-lang/luajit:2 ) dev-lua/lpeg" DEPEND="test? ( dev-lua/luafilesystem )" @@ -23,6 +23,6 @@ RESTRICT="test" src_compile() { :; } src_install() { - emake PREFIX=/usr DESTDIR="${D}" install + emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt } diff --git a/dev-lua/luajson/luajson-1.3.4-r100.ebuild b/dev-lua/luajson/luajson-1.3.4-r100.ebuild new file mode 100644 index 000000000000..f06cd069d628 --- /dev/null +++ b/dev-lua/luajson/luajson-1.3.4-r100.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~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/luajson-1.3.4.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild new file mode 100644 index 000000000000..23394e143028 --- /dev/null +++ b/dev-lua/luajson/luajson-1.3.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +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="luajit test" + +# lunit not in the tree yet +RESTRICT="test" + +RDEPEND=" + dev-lua/lpeg + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-lua/luafilesystem ) +" + +DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt ) + +# nothing to compile +src_compile() { :; } + +src_install() { + emake DESTDIR="${ED}" INSTALL_LMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" install + + einstalldocs +} diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest index 4313ab8e63fd..70b16ed6468e 100644 --- a/dev-lua/lualdap/Manifest +++ b/dev-lua/lualdap/Manifest @@ -1,3 +1,4 @@ -DIST lualdap-1.2.0.tar.xz 12380 BLAKE2B 42bf8633a5ccd60f6082b8729b9ba77c8f5486a7bab6cf727fc011856fec244de9f0fa96dd53c23a3fb5932a1670bbb621739c965618671c2c856c41e3faffbb SHA512 02cd3089dc6ca1f60957fa4733dae3cbfb2e13c25b068ddeb51b059701278eb86e359d56a6ef1df28cf514193311323255b36ff036bafda9fcbae0676d90a238 -EBUILD lualdap-1.2.0.ebuild 480 BLAKE2B d7f2260aa801536ec51588632cb09200d7e1c36569224e6670f2fc2d23f673e31fc3243e1446f2459039072fd2c191e3651a73fe0eadb4f449127137ce5afc30 SHA512 0f4f9b83bf358463ed1d9c6484487bd70467ad72d2bacc25dfbb22a9d6a69732673c0d0856c05228561c74b894223cda9459f9eda67826a726f6d6fe3a0e14c4 -MISC metadata.xml 356 BLAKE2B 0f578759801098220f27f47d45f12ffaf8b354c28323ac8fecbc38a52fd69464458eade8a95884093fd68e3c4dccc1e7a26c12c9a8a36a374cd8b7d63647988f SHA512 7d3ae5848accbb89d176bad4960ef96272151ff2b6ae02c1f32608216a19b461a9bcfd8c27a7ea755ef531969404e1e8865b4d9e81c8d292e2e482419d9140d5 +DIST lualdap-1.2.5.tar.gz 85920 BLAKE2B 14015fe258fa391e08fc9b6bdb7a71dae10fbd84636cc3d84c446d67f9d0ea925c0086343a29ce21b81f77c87da37040560c631cdf3df7c8d3c255e5913fd985 SHA512 4fbd7bcea2e55a3b165a7316e4f6c45aee22506915c4cc204d1b5006adbf95611ebf4558c1ef1511f90d7142571cff37ea24952072dc7ecb13bbbe06aef32e72 +EBUILD lualdap-1.2.5-r100.ebuild 1445 BLAKE2B 83928ee3e5d1f7fb97ac5687c8d01a4c22eb8422d9de089492dc8b217a009e6610d8c1104f90d98f1718e75bcdcc3b4e8d9ae52c90652710606051c0c8c93994 SHA512 3b4b758d7a9b1bb436b2bdb59de6f8f7804217b14edefe9575ad77610cf729e8ef0b07f2cb5ac7987a88b00e2dea35eae90dc8b2ea5445c463a98d524e13d148 +EBUILD lualdap-1.2.5.ebuild 1292 BLAKE2B 6a7d2f6dbdcab3305591b316ed8bf5d52bdbd6c46dee9b543cb49c04c53b4c32b504553ee0e60e31166d8f1a38036891bd9f336cfa84a2955992a9a0d3de3e2f SHA512 d6d0cb3ae13eb7b562b515805b3bcc5bdf1fdc17b50aadd000bd8fbb2d6cf4363d72d242ddf944cd05d93620e3e5dcbea5a5d0c8499767e4c4865efc4d8cb5a8 +MISC metadata.xml 547 BLAKE2B eac91a6aa0723c8442142daad10af992c7142bafbe29f9ec748418b49eac2dc4bbd034ae4994026238eb8f7339f9d86e7c823f3c33a54a4fbde13e8f2fe8ddff SHA512 d893b983ca2b1bba4de32a90f9b0df79fdb30ee937d978ae506b2c07c7ae6d9d0d8c4e9ecbf09f6e2b4d54e95bef8482035b63672a41119e30d74244674c3f10 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.2.5-r100.ebuild b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild new file mode 100644 index 000000000000..af582b86b150 --- /dev/null +++ b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~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=( "doc/us/." ) + +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)" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua + popd +} + +src_install() { + 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 +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lualdap/lualdap-1.2.5.ebuild b/dev-lua/lualdap/lualdap-1.2.5.ebuild new file mode 100644 index 000000000000..9d530b5b471e --- /dev/null +++ b/dev-lua/lualdap/lualdap-1.2.5.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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 ~x86" +IUSE="luajit test" +RESTRICT="test" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) + net-nds/openldap +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "doc/us/." ) + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "LBER_LIBDIR=/usr/$(get_libdir)" + "LDAP_LIBDIR=/usr/$(get_libdir)" + "LUA_INCDIR=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + LUA_CPATH="${S}/src/?.so" $(usex luajit 'luajit' 'lua') tests/test.lua +} + +src_install() { + # Workaround, as 'make install' does not create this directory + dodir "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + + local myemakeargs=( + "DESTDIR=${ED}" + "INST_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml index 485a025884ba..aa61238027f4 100644 --- a/dev-lua/lualdap/metadata.xml +++ b/dev-lua/lualdap/metadata.xml @@ -9,4 +9,11 @@ <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 5dcdb72f8d80..da10c2b107a2 100644 --- a/dev-lua/luaossl/Manifest +++ b/dev-lua/luaossl/Manifest @@ -1,9 +1,4 @@ -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-20190731.tar.gz 350324 BLAKE2B ff80f8ef69472eb0bb908d292f906d4d2be30b6350b04ecc4b4f6414aa6c6d44109a99187d6a89519d60b23ff9259bdda48bf0e51032785abee2002611037033 SHA512 09315deb0c40b59230d80262906cb9f067660242315544179ec5df57a028b088c56a4bb0b944e5975bccf86d521901eae36006c5623ec1159cfca94d05fb6890 -EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9 -EBUILD luaossl-20180708.ebuild 921 BLAKE2B 7124683a0b21b71e8785ab8517012a9750a366afcb9eb5f1b82d5917fff5527499369ef7ed4891165e42a18fb09bd83763952d778b92db46838bcdb2dbf5276b SHA512 587d420d87f6b4f27e3267eaa12a96d5993cf557a43ba06f603a9acbe04231837368c6dedf0929d6025cd886981ccc120eab5c86517e509edb312d112ff78e22 -EBUILD luaossl-20181207.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e -EBUILD luaossl-20190731.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e -MISC metadata.xml 446 BLAKE2B e11f955abb7417868998af974278f1aeacfcc45c99727f9085958f1947873911a6c52e049782195fcc143336ac4359ac536797f3348df75295b64b48cafe759a SHA512 31b5c084ab50a3864d5bb189e55181a43d7ff2a2ff45738e00d5d863819ad2405b778f93caa12d9f62015e321252bcd1fdd776b7ff3a6299c58fc5cf74f6d547 +DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34 +EBUILD luaossl-20200709-r100.ebuild 2041 BLAKE2B 81332442754a17ecb826e254429301da076efa0240ebfae352c9ce8ef086f86d12b92dfe63dbec77b94584285fe792003c6ddd83e2cc3169cafd1a18be9bccd4 SHA512 faa5b11b60218854f01711cf80821f3ba4ef25d73916349d95ef32b4fed15383286e95872543cf065ea9518efaf55fbdcdacee8a8c5e7815bc1eecf82c6edaba +EBUILD luaossl-20200709.ebuild 1628 BLAKE2B 91b398e34cf60bf13b8dbe644a8de5aa46579bbf6ca457d8d4a16674d25fbc880151e353de0b53d633eda307c0b85461a4d7341015cea5fda89e0288de600610 SHA512 cb1fcaf7d2a9cbcd5cc58dab5acb4a6e0b083b8ed674088fddd2442aef442b669c9f6325bffd4c2dc5ad5b85cdef376838e1717a97eed7b72061d95313805a94 +MISC metadata.xml 557 BLAKE2B e42a835d0d6ed6481cd2be9a1c102c949f1d4a01526eba3c4634e3d28f9aa9d1ef67e0d82601c19869e7bf8db08167d3207834eb01d56111c50b8934102a8a0f SHA512 ea4a1248a41fa80097fb715819eec012c1e0b0f020397e548579d56e3ad2eea6a606b82d60a2df5c6acca7a4dbd91138cccd379fa59c1c9325456852eb4d018a 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-20190731.ebuild b/dev-lua/luaossl/luaossl-20190731.ebuild deleted file mode 100644 index 300a08cda740..000000000000 --- a/dev-lua/luaossl/luaossl-20190731.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-20200709-r100.ebuild b/dev-lua/luaossl/luaossl-20200709-r100.ebuild new file mode 100644 index 000000000000..f61c8526f83b --- /dev/null +++ b/dev-lua/luaossl/luaossl-20200709-r100.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~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/luaossl-20200709.ebuild b/dev-lua/luaossl/luaossl-20200709.ebuild new file mode 100644 index 000000000000..0e4aeb687ec1 --- /dev/null +++ b/dev-lua/luaossl/luaossl-20200709.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-rel-${PV}" + +inherit 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 ~x86" +IUSE="examples luajit" + +RDEPEND=" + dev-libs/openssl:0[-bindist] + !dev-lua/lua-openssl + !dev-lua/luasec + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" +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 + + # Set LUA version + LUA_VERSION=$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua)) +} + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "ALL_CPPFLAGS=${CPPFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" + "libdir=" + ) + + emake "${myemakeargs[@]}" openssl${LUA_VERSION} +} + +src_install() { + local myemakeargs=( + "DESTDIR=${D}" + "lua${LUA_VERSION/./}cpath=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "lua${LUA_VERSION/./}path=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + "prefix=${EPREFIX}/usr" + ) + + emake "${myemakeargs[@]}" install${LUA_VERSION} + + use examples && dodoc -r "examples/." + + einstalldocs +} diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml index 8056c7be9898..be7afb66eb72 100644 --- a/dev-lua/luaossl/metadata.xml +++ b/dev-lua/luaossl/metadata.xml @@ -9,6 +9,10 @@ <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 8dcb9c3c0164..1c378808217b 100644 --- a/dev-lua/luaposix/Manifest +++ b/dev-lua/luaposix/Manifest @@ -1,3 +1,4 @@ DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b -EBUILD luaposix-35.0.ebuild 1267 BLAKE2B 12cefcfb60eb5bdc13a789587fe8d8911c8ba59f89c80ce0959f98c7a0896c183f1a39bcb7e4f14a57e11240460fcf7804da1f82d8d2ece70123fa447174c7fd SHA512 85649949f8bd79602e1d79ac17e654c2f47d7246725d7763286da0dc538e50d3fc00e9c38995c59d4a9c9952576635979f83babe4e1ed53895036380cdb81ae5 +EBUILD luaposix-35.0-r100.ebuild 1598 BLAKE2B ec756a70b9ca70aa714d492104139a7d1bb00f2473dda0db2d97ba1d6337f12f4f5843d3325a66c17957026e58841f4019b006e8d21e8d7f71ce81cce2d71503 SHA512 3ae67e8ebbc85787b301380c169a1c80b33cc9783ce3b640166e05e1c62d7e24233042f09b8c9cb3e63a19f814c832071789170a2302a552afce2b074ea9876f +EBUILD luaposix-35.0.ebuild 1266 BLAKE2B 49d1d6db7709ae309d926c96ddbd75b2e60aa49005c256dacb57813399e81bbe3350694f308b62b097d723c5f696c1093ab28984e9ea16c50c7eded815a1d2d3 SHA512 a8048912aab2aac73f0f21e56c7fc3a6a05af3d97dc14472ffd92ce50c94d78d80ca87ddd3fed41b4c4bf54d1908c767155c84750d018f1e660c3f5f522a1b21 MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4 diff --git a/dev-lua/luaposix/luaposix-35.0-r100.ebuild b/dev-lua/luaposix/luaposix-35.0-r100.ebuild new file mode 100644 index 000000000000..7881ac5e4801 --- /dev/null +++ b/dev-lua/luaposix/luaposix-35.0-r100.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 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 + +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" +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +# Requires specl, which is not in the tree yet +RESTRICT="test" + +DEPEND="${LUA_DEPS}" +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 + + # Temporary fix for respect LDFLAGS (#739050) + # Fixed in luke 0.2.1 + sed -i -e "s:c_module,libdirs:c_module,'\$LDFLAGS',libdirs:g" \ + build-aux/luke || die + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + ./build-aux/luke package="${PN}" version="${PV}" \ + PREFIX="${ED}/usr" \ + INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \ + INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + ./build-aux/luke install \ + PREFIX="${ED}/usr" \ + INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \ + INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \ + || die + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + dodoc -r doc NEWS.md README.md +} diff --git a/dev-lua/luaposix/luaposix-35.0.ebuild b/dev-lua/luaposix/luaposix-35.0.ebuild index 06ef159c1e90..efcbfd7161c0 100644 --- a/dev-lua/luaposix/luaposix-35.0.ebuild +++ b/dev-lua/luaposix/luaposix-35.0.ebuild @@ -12,9 +12,9 @@ SLOT="0" LICENSE="MIT" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -RDEPEND="dev-lang/lua:0= +DEPEND="dev-lang/lua:0=" +RDEPEND="${DEPEND} dev-lua/lua-bit32" -DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" src_prepare() { diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest index 377b6593b586..6093be70eb1e 100644 --- a/dev-lua/luarocks/Manifest +++ b/dev-lua/luarocks/Manifest @@ -1,3 +1,6 @@ DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a -EBUILD luarocks-3.3.1.ebuild 896 BLAKE2B cbaa03508dbb342ffbe968324c70dc4ecf6b4d2fd066056fab35298cd82b4b35a1fcfde8a5fed332c5e405d902f362c442c23e3253913bdcd2dc1f83a812c84c SHA512 c5755a63fa1ccadef34163b130613dff03194a59021193268c0212ed15d6da7c5ebe041ab5667380f59afa5b3f9aedd3443d885f21ed5d4ae64e9f88a7e51a6c -MISC metadata.xml 613 BLAKE2B cc10d869cc70c325d22bb6bb9717a86a80d4d29b9340bf18057ab92759c4f96e06d4c114749e73c97c6d61404c7d50c2a054cf10d9a4f5e289ebfc5c3df073bf SHA512 3701e2b1691444a8f709573104f3e70524bd631e0f4ee233b141ad1e2763578bc511140118acebc9ccbf0b540769de56174f97267de67571a4ad12b864e6edb3 +DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151 +EBUILD luarocks-3.3.1.ebuild 897 BLAKE2B 11b7a1565b1dc071de54d8f8e0756b754ec65404db51c384e5b60ec506145bbf7cb69314ac04bd5ae83df25b169275a83ffefb627044a44da876144b4652c7ea SHA512 9de5f55078432880ad6e749bf50f150588ae322a1fed21c66bc5c331d1f9dcec85fb6f62ec48c11ec982c232b5beba7039e7e0473825f3871530f82ec58abb5e +EBUILD luarocks-3.4.0-r100.ebuild 2076 BLAKE2B 342b6a19174d1bdebcd91b27fb6db6ac9c7b606181b4d821057e843711923d9ad731cb2fd696c36a6e74ab1a1ea1134b7ec216ccdc0bbb6647e06437cbd2068b SHA512 d5bae0105cd8ad25330cbfa6333a412dda924ea423c342a4e285f47789cdf23b4edfb387965b34d778b38d99239b681f64af788554549e821d351eee625e0eb9 +EBUILD luarocks-3.4.0.ebuild 1763 BLAKE2B 269eb6987e0089696b0546b6a3ca8092d30dd40486c5affe3ee3b9a07e0cde71da1d6b4b9e900e1b5a1dbccc4fb8e856315c169c0f7475cb5b023d6d22b7293b SHA512 a801da10bd0ee9e37c162c682b72708ce5489ff790500260a86339b72ea57e8cc4e8a25a20e0020558c21c4c0618957da0c0f5e5efa84a112f7a7ab22b6fddaa +MISC metadata.xml 724 BLAKE2B 690486dab66b070c7ec5f7e71db2cced3d1c191acbbcc3d86bc7b4dcb90796c5b1cb712a4cad42462dc9bedecfd5de330b02447bd7ccf89b89b57905871a555f SHA512 7d8d58c931e5134bd261a05539d3d2e54648fe538a4c65397b78be325feeb4da04d93fc1ff81e2d3b6fd062cc2d94f8cf9958865ca968c1805fc915bcf287edb diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild index 59de0b8da8e0..921f56440198 100644 --- a/dev-lua/luarocks/luarocks-3.3.1.ebuild +++ b/dev-lua/luarocks/luarocks-3.3.1.ebuild @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="libressl" -DEPEND="dev-lang/lua:=" +DEPEND="dev-lang/lua:0=" RDEPEND="${DEPEND} net-misc/curl !libressl? ( dev-libs/openssl:0 ) @@ -24,9 +24,9 @@ src_configure() { # econf doesn't work b/c it passes variables the custom configure can't # handle ./configure \ - --prefix="${EPRIFIX}/usr" \ - --with-lua-lib="${EPRIFIX}/usr/$(get_libdir)" \ - --rocks-tree="${EPRIFIX}/usr/$(get_libdir)/lua/luarocks" \ + --prefix="${EPREFIX}/usr" \ + --with-lua-lib="${EPREFIX}/usr/$(get_libdir)" \ + --rocks-tree="${EPREFIX}/usr/$(get_libdir)/lua/luarocks" \ || die "configure failed" } diff --git a/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild new file mode 100644 index 000000000000..8075c2212cfd --- /dev/null +++ b/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} 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 ~ppc ~ppc64 ~x86" +IUSE="libressl test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS}" + +DEPEND=" + net-misc/curl + libressl? ( dev-libs/libressl:0 ) + !libressl? ( 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.4.0.ebuild b/dev-lua/luarocks/luarocks-3.4.0.ebuild new file mode 100644 index 000000000000..52063734ca52 --- /dev/null +++ b/dev-lua/luarocks/luarocks-3.4.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +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 ~ppc ~ppc64 ~x86" +IUSE="luajit libressl test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( >=dev-lang/lua-5.1:0 ) +" + +DEPEND=" + net-misc/curl + libressl? ( dev-libs/libressl:0 ) + !libressl? ( dev-libs/openssl:0 ) + ${RDEPEND} +" + +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted + dev-lua/busted-htest + ${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=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + "--with-lua-include=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))" + "--with-lua-interpreter=$(usex luajit 'luajit' 'lua')" + "--with-lua-lib=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + ) + + # 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 +} diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml index da7ced9078f6..e3ced5af4244 100644 --- a/dev-lua/luarocks/metadata.xml +++ b/dev-lua/luarocks/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="person"> <email>vpayno+gentoo@gmail.com</email> <name>Victor Payno</name> </maintainer> diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest index 908f2e8b713d..da68d007ab15 100644 --- a/dev-lua/luasec/Manifest +++ b/dev-lua/luasec/Manifest @@ -1,5 +1,5 @@ DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933 -EBUILD luasec-0.9-r101.ebuild 1700 BLAKE2B 9c3c0d01798d56ec9ee4d05c11a2bab66c61223b1c67e56041518de84b5b4a7fa5ceba3bc115703d40ec9bac2462514165717b35e4c8455ae6186a859fbe96d4 SHA512 d454a91b591a2c42d4fea20819c5f21afe1f110f2871eb0208787634b825bed613829f07d102039d71e971672bc238aa5c503818ba1d48467a2b57c6d9fc838c +EBUILD luasec-0.9-r102.ebuild 1569 BLAKE2B b1b658be0eea29ee65475958bc0de8460df7b2986322b37c71be4fba912d963dcc11e973dd891501fd2e1d596d10174e4289c5c7fa8a8575440a865e42c10ebd SHA512 02c167d22737553543c7a17cc5acc2fd256f4976185f371f15046ef46b8334576566b5dce7d3504bda8bb760c03b3c22dc7ade18b8c95d63f821efbcab5ab638 EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2 EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60 MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660 diff --git a/dev-lua/luasec/luasec-0.9-r101.ebuild b/dev-lua/luasec/luasec-0.9-r102.ebuild index ee3f8ffb8613..dfaab7645f99 100644 --- a/dev-lua/luasec/luasec-0.9-r101.ebuild +++ b/dev-lua/luasec/luasec-0.9-r102.ebuild @@ -19,7 +19,7 @@ IUSE="libressl" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" - >=dev-lua/luasocket-3.0_rc1_p20200328-r100[${LUA_USEDEP}] + dev-lua/luasocket[${LUA_USEDEP}] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ${LUA_DEPS} @@ -27,19 +27,27 @@ RDEPEND=" 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() { - # Clean project, to compile it for every lua slot - emake clean - - # Generate SSL options - ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + pushd "${BUILD_DIR}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -52,8 +60,7 @@ lua_src_compile() { emake "${myemakeargs[@]}" linux - # Copy module to match the choosen LUA implementation - cp "src/ssl.so" "src/ssl-${ELUA}.so" || die + popd } src_compile() { @@ -61,8 +68,7 @@ src_compile() { } lua_src_install() { - # Use correct module for the choosen LUA implementation - cp "src/ssl-${ELUA}.so" "src/ssl.so" || die + pushd "${BUILD_DIR}" || die local emakeargs=( "DESTDIR=${ED}" @@ -71,6 +77,8 @@ lua_src_install() { ) emake "${emakeargs[@]}" install + + popd } src_install() { diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest index 964e87c6bdff..1505bfd67933 100644 --- a/dev-lua/luasocket/Manifest +++ b/dev-lua/luasocket/Manifest @@ -2,6 +2,6 @@ AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb EBUILD luasocket-3.0_rc1-r5.ebuild 1269 BLAKE2B 2d68f6772b9b9b64f6e4a7019fe0fbb0d1b06853b22dbf6b25df7e1009fc9cadf71d011ce25192533b2327e9c9a0e696922da36e37e979ebcb684c385fc38be3 SHA512 e26279b51433c160b3eeed4891684ef339c711986ffd6bce5f0b89b714bcdaac792b033cf6a28558be8c5660dd12258e513a7025465a34be53e07e4130bbae39 -EBUILD luasocket-3.0_rc1_p20200328-r100.ebuild 1948 BLAKE2B 520cca570a1bc4a66d6bfbf4668a035857265d983a13159b630445333df23d5959098752288a509fd27e2352a00c66af2c1bf129c9835eb79ac7a6eb9cdb3163 SHA512 b9631e0d568994989ef221f5bade7d3c67346638a3827787f53fe5f4052aa6d74843b08b9d0accae75a3b574d7d4d6c203697454bad48edc5a74461ea595d314 +EBUILD luasocket-3.0_rc1_p20200328-r101.ebuild 2090 BLAKE2B b05de5f8feb553e4a58c446d016a2bebb66ccac4c2d5927f246856a2b4b055c8a0c5e6e003a3e77ed19ca51871028b06436c94cabb21be6981a316b52ce6979c SHA512 eeca0edc2aa3c3e9d5a940c78610e45c56705ef55e0659120f2643b350cc00d8f5eb7ccca9f372d2493838e39adfcdac40a2593ad4cf3ddfe972652f47bd5df6 EBUILD luasocket-3.0_rc1_p20200328.ebuild 1824 BLAKE2B acd961363bba7bd85d0437f2b81712863becfefef7cb76172b9ae88a189065ee5a5ae5035a35923df1a9de96ab2df04fa624ef8fefae3a952d27ae13f1e86309 SHA512 afc8bf466ffcd25e15899e043a7fa5fd9cad9d3025abb8931c14471b53a12b8262d3f714ed3b611f4216c131d5cf2cff9ba0790642bb2cd8199d42d729f13b98 MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild index 479cb3ff4eef..dab20430d3c6 100644 --- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild +++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild @@ -6,8 +6,9 @@ EAPI=7 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62" LUA_COMPAT=( lua5-{1..3} ) LUA_REQ_USE="${MULTILIB_USEDEP}" +MY_P="${PN}-${EGIT_COMMIT}" -inherit flag-o-matic lua multilib multilib-minimal toolchain-funcs +inherit flag-o-matic lua multilib-minimal toolchain-funcs DESCRIPTION="Networking support library for the Lua language" HOMEPAGE=" @@ -15,7 +16,7 @@ HOMEPAGE=" https://github.com/diegonehab/luasocket " SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" @@ -38,12 +39,12 @@ src_prepare() { # Workaround for 32-bit systems append-cflags -fno-stack-protector - multilib_copy_sources + lua_copy_sources + lua_foreach_impl multilib_copy_sources } lua_multilib_src_compile() { - # Clean project, to compile it for every lua slot - emake clean + pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -58,6 +59,8 @@ lua_multilib_src_compile() { ) emake "${myemakeargs[@]}" all + + popd } multilib_src_compile() { @@ -65,6 +68,8 @@ multilib_src_compile() { } lua_multilib_src_install() { + pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die + local myemakeargs=( "CDIR=$(lua_get_cmod_dir)" "DESTDIR=${ED}" @@ -79,6 +84,8 @@ lua_multilib_src_install() { insinto "$(lua_get_include_dir)"/luasocket doins src/*.h + + popd } multilib_src_install() { diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest index 09bf27745ca3..b47ac2852eaa 100644 --- a/dev-lua/luassert/Manifest +++ b/dev-lua/luassert/Manifest @@ -2,8 +2,8 @@ AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e8 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.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93 -EBUILD luassert-1.7.10.ebuild 874 BLAKE2B 52842a1da1aa2f7403ad84eb8038361e738f0c54ae5c298a01f5aad4924e79da65464a97674d20974efc7150e20d124fe40693fa285b8ffcee6f91d7cbccab36 SHA512 9bfda9a13d9a1e46e5c04a28905a1341ff7782ec4f22a714470a48d03956ea2864e5ca5effc8bab26115e9d05f153f5300d46e004f35883558a923bdb08acdf8 -EBUILD luassert-1.7.9.ebuild 609 BLAKE2B bb29a2069407537bd1e0bb9dc7561951c4615c6405108d11f83fd8132d032e0696f16be288e365a0b4201a41e45dda36e8b360313d58d1b7b0b58628b0c62b59 SHA512 920ca16cdb8eb819218d6eeaf97fcfb18777f68963cc79249622e856b7ef35cc8231e7436c8cb84a673ea50ce20dd95960834be0f19d71c2041e827a3f51bd9d -EBUILD luassert-1.8.0-r101.ebuild 994 BLAKE2B d0a8cab68455d3acef5aaa3890f482c1e7c6980c89026486a31b5b239b0fbff0624ba7cad1dbf0c3300ce3d1d9426ec3d7378b823f28ac85abf4c6bb63e5545a SHA512 bcb03b7f471d304b9a9bf374f1ab405b85950b5eba27836be0a7d27733fc7b6f8aa24b4cab804a6354f235ca0114da2d01a5aed61992459e6fbf8e625422aeb8 -EBUILD luassert-1.8.0.ebuild 962 BLAKE2B 153ecbd4a7d0b0baf03d0f5a2b1237f3cddc870689128cdae95cc5642c3b1f75b787a1e66c26a4f8019640519568baa5479d65ae7bea8477e68013704358c3d5 SHA512 0dce6316060cc9a2afe25450f4e362b2c5f482bb34fce5d32bb7bc70a56d9ce260c46e22e8f8f8f208f3b9fa51ea38b19077f1e99ea10007f26863392fb590a4 +EBUILD luassert-1.7.10.ebuild 875 BLAKE2B f05b89fe8a3a8fff2ce5c67b2d31e49c7f159b0ebb19fe714ba13411a441b2a6175c73e2ec49f4ca1d4ccfb05f07e6a7c27c14d8f103db44cfadfe43f8ffec70 SHA512 1ef6a365904a3dbeaab7222c692da45bd471f29bb38dabb527b9a94b540b67fefc6c07a29f91bf20fd6f995b7319a90fee45f79797e2a42e4e395ba9dd341f6f +EBUILD luassert-1.7.9.ebuild 607 BLAKE2B 4e921ee0a90ca2d1e6ab9e6ee40629b00af404721eb270fac78b8aa371fa4b2f9d499d1b3a19e09f3595eb84d3b7b25d9d7fe3d32b1aceba54a3a24610a3dc0b SHA512 ed12aaa3e48104c8f7574cb3ba1477bbb5caf9f1f4035086f8897155cd24bb4070e52fd288e0cc0fb50758d0a168103add7164e042e3acbba4f23af1d85c9c90 +EBUILD luassert-1.8.0-r101.ebuild 967 BLAKE2B 58fd29809bfd194ef2eb6356786761e5bd8d582df168a47918c299a95dbdd93df16107b441e1d0cba42ca3a0efb9f5e4f9fd46f7cca97df34fdf8484b01dd727 SHA512 c2e701ed993dca17e79a2cac7a902230e7895b4503e7169a3a3ad9469d38b00a894334a34459b908c3d1ea28cee200c76b683fd1c23dc895ee3ef4078dd65a9d +EBUILD luassert-1.8.0.ebuild 962 BLAKE2B 56290a27afa992fbecd4f77e36f4b36f353315ec921a5e31d391f95101f62af95f7ff097bb03539b5eb7e241260bd85f3ab4ff3451003c49b88ffbc3975ee7ce SHA512 ae72d1f98447ae7482983f2e96132f6df2ca385b3f17c2b96137107634ec39fe0776ebf289dd52bdcfedc6a9dbd10f598191622c46d2e916f91cc06c2a37778e MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a diff --git a/dev-lua/luassert/luassert-1.7.10.ebuild b/dev-lua/luassert/luassert-1.7.10.ebuild index d12908c4448e..d94677537a77 100644 --- a/dev-lua/luassert/luassert-1.7.10.ebuild +++ b/dev-lua/luassert/luassert-1.7.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ IUSE="luajit test" RESTRICT="!test? ( test )" CDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 )" RDEPEND="${CDEPEND} >=dev-lua/say-1.2_p1[luajit=]" diff --git a/dev-lua/luassert/luassert-1.7.9.ebuild b/dev-lua/luassert/luassert-1.7.9.ebuild index 82b2bca8d3da..ca2c53d951bc 100644 --- a/dev-lua/luassert/luassert-1.7.9.ebuild +++ b/dev-lua/luassert/luassert-1.7.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} diff --git a/dev-lua/luassert/luassert-1.8.0-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild index a5902ef63a15..3237001fdadc 100644 --- a/dev-lua/luassert/luassert-1.8.0-r101.ebuild +++ b/dev-lua/luassert/luassert-1.8.0-r101.ebuild @@ -19,14 +19,14 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lua/say-1.3_p1-r100[${LUA_USEDEP}] + dev-lua/say[${LUA_USEDEP}] ${LUA_DEPS} " BDEPEND=" virtual/pkgconfig test? ( - >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] + dev-lua/busted[${LUA_USEDEP}] ${RDEPEND} ) " diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild index a5f95453c020..858f392054e9 100644 --- a/dev-lua/luassert/luassert-1.8.0.ebuild +++ b/dev-lua/luassert/luassert-1.8.0.ebuild @@ -11,13 +11,13 @@ SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="luajit test" RESTRICT="test" # Requires same version to be installed or busted will fail. RDEPEND=" >=dev-lua/say-1.3_p1[luajit(-)=] - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 ) " diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest index a6c24510b3dd..86aec4cff939 100644 --- a/dev-lua/luasystem/Manifest +++ b/dev-lua/luasystem/Manifest @@ -2,7 +2,7 @@ AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990 AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de832d611e851bbe8c8edb7c1861c43b5496d47306a2f61d29087b83a0b8d87ecb2731572c2c3d149a19000c7173161bd0f326fd SHA512 980ee1089e4b2b45c54e0ac953bb441e5c31164417e64dbf3fd8f75010d50ddda84572fa0b8ed6101f1924a96a64de0ce31d4e24cf69f9f15d5c59b8f5ef8e3e 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 -EBUILD luasystem-0.2.0_p0.ebuild 1044 BLAKE2B 09dc31b189eec831c6d464eb802eb29b4846a45efe2c30e692e96c9f578ec71b480f82451e407b7fc36bca90065626090a209e75c761d07ef3f77df5d544d6cf SHA512 4c443043cb0b480975288d596d97af29c570e33f44ad7b634c7d86b5660f6e6d14556065ff15c4ed9990091d3a0d916ec3f4affeb32f763b6530258417a2b71f -EBUILD luasystem-0.2.1_p0-r101.ebuild 1687 BLAKE2B 8a7fca76da37830a8dcd4986837beead2c91d98499e55221d3641e0f8f0be0b9b179c3587162cb8ff3a663c7a489ab858aa961f2424b1f0899dd1ef5bb4a5d9f SHA512 59a6ac5361e8c5c8232b499812a4cda72c54439cae0d050334d8aa5514b73112878dc8ad0210b0f9db8db926148b27b7bbab7cd6a61a2f9d3a17e664e44f3677 -EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 3b7990082b8f84302b3a13476600cb3065e9beaea604d4b5c780338b94c08412793d243b42a65207740ea4e82f331f22dbb3bd1eb3a8cca812146ef77f4363f4 SHA512 ef3d0a11177eb5fa2ce12ff74945ee4d7da5ee2e81aaadc5d6db9dc87764403d5f1d4fe26565a6fc231917091e022be0073a199c1cc18c9a62b1444240bb9ecb +EBUILD luasystem-0.2.0_p0.ebuild 1045 BLAKE2B a79cd0fb2a4adac392a0a1d1669838e4cf21279cfaef42f2e2ffefa67117058096685988d622a35e0b8539e30978cda40a2ea6bdae720a4efeab771a24420f52 SHA512 4325ae337413822bf75705b987548eac51b22fcd8a11fd4e680d603c97b132f983bc0df9d22f9e397c0387f44502a43bb46fdad333fea22bb41149e39fc9d9d4 +EBUILD luasystem-0.2.1_p0-r102.ebuild 1522 BLAKE2B e4ec725c41c42528f8370e4b3a011fa6d5db4f6461dd06d5427ac9a9792566e688ed7e846c44e7ae889b9f13f77fb7d7145c44b880fd2608bd18d31eaaa34f52 SHA512 2f0fc6e801991809357edd2a67052962e653ba6c7b25589fd218501542acb28f8c56fc58f914cfb51c3399e541714787f912122c7ea00e44f5cf7e0d895d0a7a +EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 310ef682388b1e8094064312fe6928cdf61b4328d2b4a65c95bd4345d0cba8c6dd756ec06d70870ea4fec7420aebbd2d5a56605f61e1c4e7b5d5adebade49341 SHA512 a0b661d31c520fd30eee72aafb90e46507ac9ad54f3d56d7857bd176647aea74328221e0a3d492e7487efcec2ad66caa7baf6dcb3a36a0e4866ef65f89969034 MISC metadata.xml 591 BLAKE2B 9e8a3ce4bfe3031b55f3aa5193c124a8aa3da8907e6dfd97e60c59e4bb846a1aec0f1e2319f43178840a9b9e7517362d654a95c2f0871494482a70a20131e535 SHA512 23828de621a5ac7168e256b201af36343de97edbeb898d6d5e4f882bca88fe345914fc98f70d5e997d8b191dcf446f62250e4309cc2d3f84b9830b023088fa0e diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild index 3ae2a0e67ed4..6446cfc61d64 100644 --- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild +++ b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild index cbc542df1f37..2411804a12d5 100644 --- a/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild +++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild @@ -24,13 +24,19 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig test? ( - >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] + dev-lua/busted[${LUA_USEDEP}] ${RDEPEND} ) " PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch ) +src_prepare() { + default + + lua_copy_sources +} + lua_src_test() { busted --lua=${ELUA} || die } @@ -40,8 +46,7 @@ src_test() { } lua_src_compile() { - # Clean project, to compile it for every lua slot - emake clean + pushd "${BUILD_DIR}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -53,8 +58,7 @@ lua_src_compile() { emake "${myemakeargs[@]}" linux - # Copy module to match the choosen LUA implementation - cp "src/core.so" "src/core-${ELUA}.so" || die + popd } src_compile() { @@ -62,8 +66,7 @@ src_compile() { } lua_src_install () { - # Use correct module for the choosen LUA implementation - cp "src/core-${ELUA}.so" "src/core.so" || die + pushd "${BUILD_DIR}" || die local emakeargs=( "INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)" @@ -75,6 +78,8 @@ lua_src_install () { insinto $(lua_get_lmod_dir)/system doins system/init.lua + + popd } src_install() { diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild index bcbec5c1f81b..5b23c11d98c5 100644 --- a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild +++ b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz -> LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="luajit test" RESTRICT="!test? ( test )" @@ -28,7 +28,7 @@ BDEPEND=" dev-lua/busted )" RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 )" DEPEND="${RDEPEND}" diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest index 85d368dc5a39..c5bc771da05e 100644 --- a/dev-lua/mediator_lua/Manifest +++ b/dev-lua/mediator_lua/Manifest @@ -1,4 +1,4 @@ DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0 -EBUILD mediator_lua-1.1.2_p0-r101.ebuild 941 BLAKE2B f3336be1aa55cfebdc994ef7ea8b84d22dfe6483a0fd6c00afb70fd333ea5840ace05210d10bef2952b77eebfdb40538ae4b97f850beda0f9eb6bf23ccaa61f7 SHA512 11bdc4fdaa4f51b19d3808398aa54dbbd8c7c6027a61be55a5df5056d318f83313bad25ddf9b51b19eeb9860ee46a55045bfddfd171152ae8d058e7e906dfb18 -EBUILD mediator_lua-1.1.2_p0.ebuild 795 BLAKE2B 1c98dc5b6131ddd9565bc01502e4ae1f027f27e0cba6a95436027ded755f1c51308434f44ca0b6ed168c1065f1d84d8e70885dda7e71aa1a308f5f7c1b9dcb43 SHA512 348ea584e11fffab4989e915b1f1e7736436a66126741d6490ee86655c8378182b476a4d49f683302561788850d596bf9b4e31210ae6d8f75cdd150a0dcc1b4a +EBUILD mediator_lua-1.1.2_p0-r101.ebuild 928 BLAKE2B 0bafb164dee41f87eba8e47a61cc8e161e206ddff0b77f55cca23b8021f157bdd2cfaf05608aff2a42af711f3c42448b39bfcce8a07407537c84ba938f6aebcd SHA512 b3074810fcdf9409a1e03a4568b4d08114f5b649ab7e576b2dbb5acd3ebccd93c84b16c8abfaa6d3c2b6cb9f55a240536c66e506fff86717c5bd0de7b92d9aa2 +EBUILD mediator_lua-1.1.2_p0.ebuild 796 BLAKE2B d5f09eae4950d302560a4ee0731bafd07831fbf08e6f97812b3bbce7fb872a56327e309e6f94e8349ad5194801b70c9a20c2b539044625ba57ec9077ec0807ac SHA512 1637038c2635b7e22640f9e3957de4138c20c56484307186fcad183df7e6c7fa11a264be7199a665097fa709067c8eb10897a8d780393de38b658f1dda10d9ec MISC metadata.xml 724 BLAKE2B 8dca2534d29b63479b715a665b9f3cb785d7818e9cb467e38b4a69a958826507f286760d43ed6e5645296199ebf94b7562ab5e0c0b8a5e17729637b363e6a8c2 SHA512 a0c40bea247859b28e85de1c00535882a562329973c15899493303b095da0ba1434cf4f01ae68dd027eba3ce9fc46c419b0568187cf3cf851c258aefce6b8220 diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild index 0d1a8c7f594f..1bbd855a34b4 100644 --- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild +++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild @@ -24,7 +24,7 @@ RDEPEND="${LUA_DEPS}" BDEPEND=" virtual/pkgconfig test? ( - >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] + dev-lua/busted[${LUA_USEDEP}] ${RDEPEND} ) " 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 index 0a601062d7ac..b95c7f74bc77 100644 --- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild +++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest index 9379c5012593..7fd0fe08532c 100644 --- a/dev-lua/messagepack/Manifest +++ b/dev-lua/messagepack/Manifest @@ -1,4 +1,4 @@ -DIST lua-messagepack-0.3.2.tar.xz 13416 BLAKE2B 03d80c3a1fc8d8bfa30821f3b83ead61bc0a8ccf565d9ac17ca0b1d97ac7c72d0550695ee13feb6ff38cd8098fa331c3acaf4b52c0f95bfc3141b70a655ba9df SHA512 d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd -EBUILD messagepack-0.3.2-r100.ebuild 978 BLAKE2B a53ba1880589a4919da703cd41d1cc9bffc4e3e492e6c49a9c84c882ac4bf031f638550a345be5c82f7d98c582eb66fa91150cc0c6d0a227c0b9136942e3e1ed SHA512 40b43b12bdfeb03c3067a4a0f583cd9ee82ccf6d8df728b1441ce72988e4c07d4ce5f069c33f5a0f9983de9f44f0bc57da66d6ccce31d6b8f17eec10ecf09f48 -EBUILD messagepack-0.3.2.ebuild 688 BLAKE2B e4c72a03d21716dc334d6c0b6a028fe8a038d33998f75fdeaba53981632bcf611ac4e430356e9ee5c1d07c0ed5a212ad1edf8c4cb1e4700749dea4d62c90ddbc SHA512 d2eeeffe2fe4c8596924b0655108854f1798a4b0dcb5136415a6065f01da145eb1c448fd74ded4cb94e63fdbfcc7f45553191daa0d3c80f494559f7092b80772 +DIST messagepack-0.5.2_p20201025.tar.gz 19652 BLAKE2B 5f85081daf2ab7f57399cb47782fbde0dfd2afe9514fdb652da1ba0eacd832e5c0924258b788d919b0a07e227f37ee58a239004086e7d6759b4727922ea57d76 SHA512 245790163ec819438fd3426f59ab2e5672864be647748dace35155be712ad4eaf78f8d7228d5a0ce94bfb92f6a1d1071cf871483bf99e02ba18872c31b3d0682 +EBUILD messagepack-0.5.2_p20201025-r100.ebuild 1035 BLAKE2B cc6fc3be86d52ef63e8871467423d3a3b1c27f04dc7eed5c910a258f46bef374beb8b595b2b7641db1b30c4a1c9c7376c3cd7f5e0f6eeea6bf8c304f476b1603 SHA512 6683df3932390ee71dd39f5c848f8711886196460bca3dda811ca2c7c21b7c2a4c1c10946e50042fc78dbc38068ceb2dae6dd5f5cd213ea317e6147a924a6659 +EBUILD messagepack-0.5.2_p20201025.ebuild 1078 BLAKE2B 40c3b240f43d96fb2252f1b4d349e42dd1584ccb6b2d919f8003006b0c038bb403920c4938a1f679352ed39c4950b4d1ceb7c26a552d4486707967fbcc99adb9 SHA512 32d44465f023e5c3f98f255d9639d47e4aa2db82ed0dd9a38b52fbeba7bc4b47ba704a75580471894b41d323f3ce6dff52aa88b2d78b57e9e33af7dbce20b7f7 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild b/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild deleted file mode 100644 index d9897a706c27..000000000000 --- a/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} luajit ) - -inherit lua - -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" - -# Requires lua-TestMore, which we currently haven't got in the tree -RESTRICT=test - -DEPEND="${LUA_DEPS}" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -lua_src_install() { - local src_postfix="" - if [[ ${ELUA} != luajit ]] && $(ver_test $(lua_get_version) -ge 5.3); then - src_postfix="5.3" - fi - - insinto "$(lua_get_lmod_dir)" - doins src${src_postfix}/MessagePack.lua -} - -# nothing to compile -src_compile() { :; } - -src_test() { - lua_foreach_impl default -} - -src_install() { - lua_foreach_impl lua_src_install - dodoc CHANGES README.md -} 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..4dc5d4b18fc3 --- /dev/null +++ b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67" +LUA_COMPAT=( lua5-{1..2} luajit ) +MY_PN="lua-MessagePack" +MY_P="${MY_PN}-${EGIT_COMMIT}" + +inherit lua toolchain-funcs + +DESCRIPTION="A 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/messagepack-0.5.2_p20201025.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025.ebuild new file mode 100644 index 000000000000..a4f23657c074 --- /dev/null +++ b/dev-lua/messagepack/messagepack-0.5.2_p20201025.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67" +MY_PN="lua-MessagePack" +MY_P="${MY_PN}-${EGIT_COMMIT}" + +inherit toolchain-funcs + +DESCRIPTION="A 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="luajit test" + +# Needed 'lua-TestMore' Lua module not in tree +RESTRICT="test" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" + +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +src_compile() { + :; +} + +src_install() { + local myemakeargs=( + "LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + "LUAVER=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest index 89f58f003fe3..063b499e8c28 100644 --- a/dev-lua/mpack/Manifest +++ b/dev-lua/mpack/Manifest @@ -1,3 +1,6 @@ DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c -EBUILD mpack-1.0.4.ebuild 1058 BLAKE2B cc907ec09c79aaf12c09a39f88ad39edbb23b128ae0c0e90d83ecd862072acbb82fd5252f8188540788371d4bf231c64172dcca4a4836cb913cc4cd264cbc966 SHA512 94dff8c1f5154e50653cc58638902f716990175e2d579e4ac5aa866638f252a5b4a3f616037dc183f8592b7785d28b7b9912ded7105fabc4feeeeecb6f858d87 -MISC metadata.xml 249 BLAKE2B 2176c8add15ed2ad2e76def8911e581e40a5a8b0ced984020fa93a507a5478a3636be5b8053df59af367394611b4ab309fe966517286e43ae29963cea9726382 SHA512 1af3a96a7be80a3d2ee34216ac8b85c8965406212b1bd8bef97bb6adb8719f14c97227cfb8885e85ae0981aa93396be9049cf8640640e3669fc17be6c7c489ff +DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75 +EBUILD mpack-1.0.4.ebuild 1059 BLAKE2B 5263060e57633db082186e660d2fcdc16c0066a6a19c8ce87d7ce0db81fbb0ee20d4efd2975d955cca1ac097bff2aaf8c39555031d0d91481fa33a40243f3386 SHA512 1b94169795a9154cc152269af3aa56f5aadd4a50362284aec09524ecbeacb13298d91ff4fc716c9867cc6a590d02ad1debaac7bda042fc03a466fa5d2f1c7549 +EBUILD mpack-1.0.8-r1.ebuild 1647 BLAKE2B a6c7f72ec35b5da574823bb14129f8695170630545cf9f66bd66e714236d7f3758a260f60788524188c01dfecbbb544f924941ea84e2424aab9a9b337b8866a0 SHA512 fa5305fd83c17b7d20040a363afff06a2b58243b8cd8e4c0f299086ef594159539fb9c355f41e171446c37ae60294d56003644369be828d822d5ac300e4d6c7e +EBUILD mpack-1.0.8-r100.ebuild 1776 BLAKE2B d9d38dfc62cde85a87e7865e52ceff66762b4878e2a8e9d363d73162f4881e274652f99b86fd5ec7b2e72d6a2d6698e88a2a09268af958a607236d357f493947 SHA512 689bad3022e350a3e2de2132ead2bb2d139ae3a492cffb68353f139b855d1cdc1540b8bd684173b35ec40db8e8e1772dfbb93f6967643169fe622f6e88aa98e9 +MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1 diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml index efac9884a41f..c3e9e12ed26b 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"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <upstream> - <remote-id type="github">libmpack/libmpack</remote-id> + <remote-id type="github">libmpack/libmpack-lua</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild index 2e8a8290a194..0ad6a94afedf 100644 --- a/dev-lua/mpack/mpack-1.0.4.ebuild +++ b/dev-lua/mpack/mpack-1.0.4.ebuild @@ -17,7 +17,7 @@ IUSE="luajit test" RESTRICT="!test? ( test )" RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2= )" DEPEND=" diff --git a/dev-lua/mpack/mpack-1.0.8-r1.ebuild b/dev-lua/mpack/mpack-1.0.8-r1.ebuild new file mode 100644 index 000000000000..6a4b3afa624e --- /dev/null +++ b/dev-lua/mpack/mpack-1.0.8-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PN="lib${PN}-lua" + +DESCRIPTION="Lua bindings for libmpack" +HOMEPAGE="https://github.com/libmpack/libmpack/" +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 ~x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libmpack + luajit? ( dev-lang/luajit:2= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted + ${RDEPEND} + ) +" + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA_INCLUDE=$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" + "LUA_LIB=$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + if use luajit; then + # "[ 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. + ewarn "Not running tests under ${ELUA} because they are known to fail" + return + else + busted --lua=lua test.lua || die + fi +} + +src_install() { + local myemakeargs=( + "DESTDIR=${ED}" + "LUA_CMOD_INSTALLDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild new file mode 100644 index 000000000000..d9777b4051fb --- /dev/null +++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua toolchain-funcs + +MY_PN="lib${PN}-lua" + +DESCRIPTION="Lua bindings for libmpack" +HOMEPAGE="https://github.com/libmpack/libmpack/" +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 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libmpack + ${LUA_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-lua/busted[${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() { + # "[ 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 +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "DESTDIR=${ED}" + "LUA_CMOD_INSTALLDIR=$(lua_get_cmod_dir)" + "USE_SYSTEM_MPACK=yes" + "USE_SYSTEM_LUA=yes" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest index 71450e707e91..039b5f140caf 100644 --- a/dev-lua/penlight/Manifest +++ b/dev-lua/penlight/Manifest @@ -2,9 +2,9 @@ DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c3 DIST penlight-1.5.4.tar.gz 213938 BLAKE2B c6bba4fd7fc491d2e6ca464f71b897ba4b5dc8dc94e7340fd77d3add47a9b4a72ce48cea268f94fe55c2aef1edd850f96f00f2ba1ef7186e1e8d86a4e3155366 SHA512 c46e7875410a90390bfbf010a53f1d536475e2094668722618d03951caad0fcb0674c9bc7119a0753e4ed3df9e4d70fef828ba4c6c24e8ada4036948d2432519 DIST penlight-1.7.0.tar.gz 384917 BLAKE2B 153660f5029509611265399aad8b92d82b266ac470414c06e9d7f01b37225834f98488f30f9bbdfdc3a6714edfe2edc0fccd0356ebb966d964be633bff38eb25 SHA512 edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d DIST penlight-1.9.2.tar.gz 396248 BLAKE2B 2bbbece6e9855e8fc54f22f01e516cdf886782ec9a007a4ffac8ac980d7e0836cd19b8a7659ab1e05331e12b11bdb1c9c7df5e2f03c39965532c381298017035 SHA512 8df26e74f73ccf6dc73546640e1537b63e40357072855f9409e96b2ef8251c25b4653456d1237d5142573618af242e885490aa9750dffb387e4670ed9f3cfa91 -EBUILD penlight-1.3.2.ebuild 653 BLAKE2B ff029eaaf0cb3d19c04840e8cf4fe05b6456e8467a2c5452ed2064d5c4ebe7e14418d2f1ec349729ac6733e212f5b8030d27e25c289fad72a03cf5c8c2a6a39f SHA512 14aaea5b639507e25b2ebe5eba54aa10e268cd9147961e03219e389ee11b64c71a65650c719062f617335fb0a42d9defebda748b59da057e5321b29eea744db3 -EBUILD penlight-1.5.4.ebuild 756 BLAKE2B d598d38a6ea20256a2bda11b68a5568d476c4d030132c290ebd3678f3a55c8b5ba4a5b9b20caca1f2e8714c440d59a9aa6567fe2d2dc7fa105764c5de9b4aa13 SHA512 f5c135d7d71145dc50075782afe4a70c148e1094d0b86e7ecf1fbfa26592704dc6503d9f96a8797e8fbd48e4619065965a932c49d40adc3eb1c1939e931fb9fc -EBUILD penlight-1.7.0.ebuild 756 BLAKE2B 75d8259853ab59bcc367ee62c68a36f573e35ff3c5802266aba61cd2be816eb3f048815f5dbad60a9d71c20f3f345192ccc8d31630a4d4a97e08d07011667076 SHA512 ee214897fd97e590c17e9728bd88d5f2ea4c2a654702a8b0afdb2cb308d50ca467f9b2e5801ae001929ebe5d97b619d6e0e595997d9a480fa58aa542ccb13f33 -EBUILD penlight-1.9.2-r101.ebuild 1030 BLAKE2B 9dfd7e643c3afa0e04215591ea12cb88bf50339c386ea28cc0bb2d5809fc6c576d92677feb0fbde59d08e44ff16f0f226cbeda4229efc78ec2a0776ed348c3b0 SHA512 0b96bf98d2f3676697c75378acc2e10d1383b224f898e570f61022dedc042a377d06d2ff9b4cc24d0c5c685a7d6fa073532447ed3d8053e1cb6937db48c0c8ac -EBUILD penlight-1.9.2.ebuild 874 BLAKE2B b6d246cdd0917018fc7781deae97c1cd1623a4bf09e0bb44aad95efc204ceedba47cad2dcd6005ce591a38c8f99f3c7783a710b0c83bde776ec027dbae661805 SHA512 e3deb5b326019307c26326939030376f040edcaa888ce52581b9350783083ff0c038e1c31af4fd96db9ac9b42b3ad8ea08f3949b745b6e94b8f88b6794ec0b3f +EBUILD penlight-1.3.2.ebuild 654 BLAKE2B 6a4a4ea2f96ecff3e99bb5cfa257f8e7f2486f07a7d6105bf95d50d93547464dbbc53a67c32a4438708cae2b90f832521ba638554df62466438fd26b49db5c91 SHA512 b36305f96072b9276744a0bfb26de6767b6b5c1d62bd73a15cb19b0d430d5366ad230489e00437040e977b861ac83cebb237329760d037c19809bf69b4911fe8 +EBUILD penlight-1.5.4.ebuild 757 BLAKE2B 7d0870c6217f30ca5251d861dd7f13652f60557f2ad0929b5700bfcc0bceba0a7b833b4bdefa90807cb6d6e0390721202a4675a8ddd4375b0f2af112869a4e1b SHA512 9af992243a13d2713db63e967ce7135dbd28e4bff819f5f342b9f2adf8a115ff0eb8d9123089b1a58044666d5ec3e469e090b9cecee2206c6489b38a5e9521bd +EBUILD penlight-1.7.0.ebuild 756 BLAKE2B ed56154e99092498eba825cc8a4ee8fe62527db3c4ef09c160b84c7aa05a3783a33334d6f4c4b9786da1abdec76847ef66b60c567e464da1a3f6c796553d8e63 SHA512 985bd3c2d2026ec5c0b782db708473bbe411f12ad8123d53e4901a3935ca8490b5bdc4180764edbdc2d76e5e432da5c2d33208063331613ab4863bd83ddcba4c +EBUILD penlight-1.9.2-r101.ebuild 1032 BLAKE2B a59d65861871336e6f383bf7e2d36ae674cb012f9c62d5a7efa27a9d03a2096b51d79490ff67eaa7f75180310f12b31ce8e852cf4aba8dfeea5806335606773d SHA512 9d40f0941aa8980e7450fb07f416ca66bc65a6c124a2722e80bd49f589b05000e676f7fd5fa9e2a85eae62dca2cf024380d5fb85f4ff78166ee2392d7df176e9 +EBUILD penlight-1.9.2.ebuild 875 BLAKE2B a39e0fff4b7c3e90aa5f71b6ca89540422edc87cdb202c346e3bdd6d07e60e3a8ec1ac1736c7cafd730f119addb3966b5cddbf78b15176ef8271a9a14c08fe0a SHA512 aa78e5cbd272361d62048415c33c8040b1ea8d885b3e599d3adebb7566dbddca6c16c628de46ee961e67fe56a8c98cbe9eaed14396d813475fc77e4387db8d5e MISC metadata.xml 704 BLAKE2B 35e8f02d20c248a9b11efdc8b3e1ca81fa1cd8c355a02436f6cdcdeaf07d5a77026cd3053af1255a8fdcc603248f94b871d7432f43766c34766d0fa4f43a1795 SHA512 e64d04284f1bc1f3d2942b72d6077b401f74fb7f717b117c76e16a32f5ae87d7d97982cad6369aba4ebca369b480b6a89952c65cb06a5a7b3a5a6193c23831e3 diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild index 3c04e0e5285d..50461f6e6826 100644 --- a/dev-lua/penlight/penlight-1.3.2.ebuild +++ b/dev-lua/penlight/penlight-1.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig" diff --git a/dev-lua/penlight/penlight-1.5.4.ebuild b/dev-lua/penlight/penlight-1.5.4.ebuild index 4b6e900613f6..453932d80233 100644 --- a/dev-lua/penlight/penlight-1.5.4.ebuild +++ b/dev-lua/penlight/penlight-1.5.4.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-lang/lua-5.1:= +RDEPEND=">=dev-lang/lua-5.1:0= dev-lua/luafilesystem" DEPEND="${RDEPEND}" diff --git a/dev-lua/penlight/penlight-1.7.0.ebuild b/dev-lua/penlight/penlight-1.7.0.ebuild index f7d7ab835d4c..55bb481ca8b9 100644 --- a/dev-lua/penlight/penlight-1.7.0.ebuild +++ b/dev-lua/penlight/penlight-1.7.0.ebuild @@ -11,11 +11,11 @@ SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" IUSE="" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-lang/lua-5.1:= +RDEPEND=">=dev-lang/lua-5.1:0= dev-lua/luafilesystem" DEPEND="${RDEPEND}" diff --git a/dev-lua/penlight/penlight-1.9.2-r101.ebuild b/dev-lua/penlight/penlight-1.9.2-r101.ebuild index fc399a4a51d6..1b88d0b0c28f 100644 --- a/dev-lua/penlight/penlight-1.9.2-r101.ebuild +++ b/dev-lua/penlight/penlight-1.9.2-r101.ebuild @@ -23,7 +23,7 @@ RESTRICT="!test? ( test )" DEPEND="${LUA_DEPS}" RDEPEND=" - >=dev-lua/luafilesystem-1.8.0-r100 + dev-lua/luafilesystem[${LUA_USEDEP}] ${DEPEND} " diff --git a/dev-lua/penlight/penlight-1.9.2.ebuild b/dev-lua/penlight/penlight-1.9.2.ebuild index a679ab743c3a..fee4959b0eed 100644 --- a/dev-lua/penlight/penlight-1.9.2.ebuild +++ b/dev-lua/penlight/penlight-1.9.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=">=dev-lang/lua-5.1:=" +DEPEND=">=dev-lang/lua-5.1:0=" RDEPEND=" dev-lua/luafilesystem diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest index 4ee1a88245ab..5b9a631bc506 100644 --- a/dev-lua/say/Manifest +++ b/dev-lua/say/Manifest @@ -1,5 +1,5 @@ DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6 -EBUILD say-1.3_p1-r1.ebuild 886 BLAKE2B bdd9cd539a4119a3e521d241f148c9efe3fd8743e9a259f0a0df359735d99eb916dc2f0844dbf24b69f88aa1d81705981ca728c0bf9c2ccb583e838a57e63450 SHA512 50738d259c035e23eb8d90797c1fc2779721b44faaf61695654ad774e54264b20aaccc8d76f94a6c97864009b9fd8692bf4751d0477f1acaed0265276040418d -EBUILD say-1.3_p1-r101.ebuild 912 BLAKE2B 72b5d6a7a31b70de6d4c4d98b5fd4266147c53c704f8e515675e861d924c83288365b18fa96b6990944add556b7494fd3d0c44992003b53c37a08b0930e009d0 SHA512 81c4c893ca580c13c08e96db392aa6af82c1c018517a72141b7ce98bccb8433120cf23db755b35eb719cee9ffbd58cfb8e636f759231186502f4290a6fb29f5c -EBUILD say-1.3_p1.ebuild 664 BLAKE2B 23a1ec3ce6ae91d6ee0a79f2b882e49c75b25ac2b6dd45cbbe6c46a44e088f9050120cd21e90b0222e6f7029521a79a3040b4500687fe6aca625cfc0abd287f0 SHA512 348ac3a993aeee0c570dabdf7fc632c8532801620ce384f1b1b8f18b75ee20b6894f0ac1fc0a4d646e6be38df6136f88631f37e26a79275c6f27d8314a486ba8 +EBUILD say-1.3_p1-r1.ebuild 887 BLAKE2B 4657c5a3f5297703c44844d9182bc5547debb804a7a396c578922ded64da590852f88afbceb669a38eabe7b144ea975b026dd87c8f05d4e0d75f62317915424b SHA512 391dced871507f9295f3ed665101d88b8f114950724fe2f80d5cd04700b628d06fffa9324e0fb5b5d21590342cb361a5ad5be3673a92f37afc0d93fa3651d919 +EBUILD say-1.3_p1-r101.ebuild 899 BLAKE2B 261cd20f01cf361b633ad173ede70056da681372eff359f25d25bf013977b3a626b3dcc5b61e961b276881b8f1eee13d61bcc752bf4f38adcf578343717d22a3 SHA512 a137ce27fb4c01dbdf93ed1ddc9ce62cffd0a5e7c7c718e2bc3c05bcb25ce1bb08efdd0c4c7c5d66d838c07800b085efd86fe1d8d527dfb45de4ce5911cfbe75 +EBUILD say-1.3_p1.ebuild 662 BLAKE2B 1a37fa0b7df12661bf1c46560f114cfd02ddbd7b10e927d92dbda902ef8c8749c703f01d226b577b360383e1e4e32d4fd6cec38d9dede3e346475adcc93f1fe0 SHA512 37e8abc4018eee12be258abb9ad0d6663b77526d1ffb35e647da09e202b5eb6232f7a1006bc08914d683a33dd7a09f9a674d1a0d6323a0cb276faeaa25f6307d MISC metadata.xml 440 BLAKE2B 436e12385108634e35113c2cfa87d1fc7702e577f3da3242e575ba2c4d64c076ebd05e96e628db472c59957db600c244a14d72537c3728a83cb3125547c789be SHA512 15db0d85172a05831440854135278061e1240e287e36c367ba98cab7f98505450db8d770dbb7612a21a3468f079328bc074102d067e1c5f5f86e18b8d6794392 diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild index 4fa202cd47ab..b73175d9b818 100644 --- a/dev-lua/say/say-1.3_p1-r1.ebuild +++ b/dev-lua/say/say-1.3_p1-r1.ebuild @@ -17,7 +17,7 @@ IUSE="luajit test" RESTRICT="!test? ( test )" RDEPEND=" - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) luajit? ( dev-lang/luajit:2 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild index cef73fc92c85..422d9926960f 100644 --- a/dev-lua/say/say-1.3_p1-r101.ebuild +++ b/dev-lua/say/say-1.3_p1-r101.ebuild @@ -24,7 +24,7 @@ RDEPEND="${LUA_DEPS}" BDEPEND=" virtual/pkgconfig - test? ( >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] ) + test? ( dev-lua/busted[${LUA_USEDEP}] ) ${RDEPEND} " diff --git a/dev-lua/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild index edf21e39b467..243583660466 100644 --- a/dev-lua/say/say-1.3_p1.ebuild +++ b/dev-lua/say/say-1.3_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -COMMON_DEPEND=">=dev-lang/lua-5.1:=" +COMMON_DEPEND=">=dev-lang/lua-5.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" RDEPEND="${COMMON_DEPEND}" diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest index b905132a6ee0..3dba6143b270 100644 --- a/dev-lua/toluapp/Manifest +++ b/dev-lua/toluapp/Manifest @@ -1,6 +1,7 @@ AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1435 BLAKE2B cdcfa5e194dafa466cca5fb05d8cdfc285b97ff3a91c81fe71159601245576527a2f3d8539c3a3f15be745eab14cfe084a3fc90042e141b503dcee8063c85f8f SHA512 2cf6c341e3749aff13a89cc5894b900132b78b423a3b3c858d0235735c2c237b5503ea5a187ddcb851c12a69d42400da1e7556081e178edaafd406b84fb6e893 AUX toluapp-1.0.93_p20190513-lua-version.patch 288 BLAKE2B c98560e520abbc9106be46a28e604f1436a110de9fb267ec106c9ad00241dcb849861ef195e9344d785520e78d821b7a2750685778746eefc6c4d3619c81043f SHA512 cad6055a6fd10af78f068abbcc6921f22119206cca190d41010182edd4805b38b595b33bb7fe6ed3e90cca19b9ae944dfde8910ba14d284bca0fbf20f9a4ee1b DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442 -EBUILD toluapp-1.0.93_p20190513-r1.ebuild 702 BLAKE2B de6ee14cc2d14325a4f6249795fecf1a88e840146ea8ab708e0a3312467988932fd955096a019412a72561c9621900bebcd031db87238353a89f7f6de8a02199 SHA512 7fefa380e3bab68844e1b37869d5cabb17fb7dfdd6e1cdbbe3851523ef52cfedf792aaaf74a7b6d1cf851e6dc807565ee552e75197746717a88b1b4fd2d13fc3 -EBUILD toluapp-1.0.93_p20190513-r100.ebuild 970 BLAKE2B dc3f19a814ed66f061ab0833fa05f6cbbd8a7fa7fb53c0e952a9129276b2ffe8925ac5ae07b3de0bb120d58df771d66b6d259d4f4dd1244b72755b85f297f52c SHA512 b4cea412393ecfc62ffe776bce22ce09a69222efdfa181d3bab35a47b141df92c19dd5cec549769b55052a357c7e6587dd33d0956cb5de35f011f360284a9b28 +EBUILD toluapp-1.0.93_p20190513-r1.ebuild 685 BLAKE2B 06aa98e3cd20a07fdb5a2ddfebf8920040fea5c45f0a16a8b10e2043912ce60ac7c0cdde0f389720c6e019082682c9569d533ce6dd0a83e61e374be335fdfeb0 SHA512 bebbd6357816c05b37bd5c530601f37d4c34d20cbabea8ae7907f33b959142525a6b3f317a75d5192253589eddca798c020697b99c5e748b3eda647a9c47e84a +EBUILD toluapp-1.0.93_p20190513-r100.ebuild 952 BLAKE2B 3f63b1e4c8ca3d25b4c194d7147c6bff96ad55b1d2953869aa62876d6f8222a5e6d4e3c244706c235e8ca56bb17ac5ce724ea6bfe0a102d7359fcd3fcb318fd2 SHA512 b31afa40219f9d01143bfab7f621b591e23ec6199af0a149d369cf3c8e0bdc3ce38add9b4e978bb21fdc394924ef882ec73a514aa017a0eb003667b282e93ba1 +EBUILD toluapp-1.0.93_p20190513-r2.ebuild 661 BLAKE2B 7e6695ed18eae8e4fa419db1f86f0419fe1d20c700031cd31a45ebf5bc711f72e3d75766f21c6cfa2708cddf493ffb7cf39c4e96aaea04b39143e70d142c5e12 SHA512 a024454626e003749b95ff330c7e1339da259698ff46dcd9d959a2ac402e48eee5c36d158240c61928895f7c8d013f7c0e7e077e5e96c5244a77e900feb54a68 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild index 2c610c14b1af..66740e80284c 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" IUSE="" -RDEPEND="=dev-lang/lua-5.1*:=[deprecated]" +RDEPEND="=dev-lang/lua-5.1*:0=[deprecated]" DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}-${COMMIT_ID}" @@ -25,4 +25,4 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}" PATCHES=( "${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch ) -CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake" +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild index ab25d1fac8dc..7e530101477e 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild @@ -30,7 +30,7 @@ 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" +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" src_configure() { local mycmakeargs=( diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild new file mode 100644 index 000000000000..b717b9263fe0 --- /dev/null +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN=${PN/pp/++} +COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887" + +DESCRIPTION="A tool to integrate C/C++ code with Lua" +HOMEPAGE="https://github.com/LuaDist/toluapp" +SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" +IUSE="" + +RDEPEND="dev-lang/lua:0=" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-${COMMIT_ID}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch +) +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" |