From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- dev-lua/luv/Manifest | 6 ++-- dev-lua/luv/luv-1.30.1.1.ebuild | 61 ++++++++++++++++++++++++++++++++++++++++ dev-lua/luv/luv-1.30.1_p0.ebuild | 60 --------------------------------------- 3 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 dev-lua/luv/luv-1.30.1.1.ebuild delete mode 100644 dev-lua/luv/luv-1.30.1_p0.ebuild (limited to 'dev-lua/luv') diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest index 47991ebe4e48..215dc8edc661 100644 --- a/dev-lua/luv/Manifest +++ b/dev-lua/luv/Manifest @@ -1,4 +1,4 @@ -DIST luv-1.30.1_p0.tar.gz 88560 BLAKE2B 9eb32f4e13921899a80dfba143508d26ef0bee3ce0186b62b31ee9da508aa434ac01dcdbd5654f03fd18798791b71e310739e2d9a879f03bf6c48475cc6e0b46 SHA512 c7f613e72d5e5e93035597fcb6a3868d60e61811d4858ced1c2087f31ed0720c11fe436af51d6626c0d77ed448989520b220d6a150b49f6ec0fe557472dd66c7 -DIST luv-lua-compat-1.30.1_p0.zip 62515 BLAKE2B 173dbe43a1f1f4e440c1e40b0a0b22b4ca580568e754a44fbcf57370a53340ebe247de18ae8e98e68cf0f85ae2fa6ec41d5acfb9a433e4bdc717a1e80a2480b6 SHA512 7e66b059aecdb4de630fd305fdcc439cccac94b44101c8b74d61f0f40a1e01e8e68c811a96bddcf5bb0ae09f369d9524f0ec9b009e31d89aef2a1115becba056 -EBUILD luv-1.30.1_p0.ebuild 1623 BLAKE2B ce2de6f09b71b6c9f0cd4d0c76d1b64ba7fe9b7fb8865dd29083da536a89fa4687448674dd7dab23a97939934f73ac7167a7f40f7dd480f0fbe5181323314ee5 SHA512 02fbbd6d08f17cb4e0e1971eece8ba4c49a4c61b14e3ff171592c515fdf6ff9140823a6289a22e4a5f6fa6bf68c50a3096b31997b947ec7b80a73ba716e8301f +DIST luv-1.30.1.1.tar.gz 88948 BLAKE2B 8b6da2ac0c63222a508f9f37b6a724edab21285f21ff1fa95fe334ae800bf76a49114e41531d7584bc8ce171e4c373167cb713cf70bef6ac2c822b88398bbe17 SHA512 c9001cbea2f58a867b6ddf11ac54d16bfaa15f37f3453758d303c58b960177c7c1a65e8c5636ce07161711c898af7dfda0ed9cb4cfb8d7d6430b3843fd0acfa2 +DIST luv-lua-compat-0.7.tar.gz 51383 BLAKE2B ae86f314de971fcd7d8706009d59d684c035fb661ecf392c581a3c317cc1a396321ef7af0418d8f23151c52c66613a0749e8fa9ac889a183c2ffe749091dae35 SHA512 665ece98422a105b818cffd96eea5788696fbb854d2ba41d2d387e8bd25c1fa9de601468e55e22e9e749979a66d4d2e0f7dfd656e5bf27b489d37bb07c96f48d +EBUILD luv-1.30.1.1.ebuild 1558 BLAKE2B 82b2aac0bd86fb05eaba06379ac6023591d601feb63e07f1af8af8010cefdf14be3b08bbae1be80cc042c80a8a70db38527fe20913ba1d7886c2bcc0a1511cbb SHA512 482880c6b5a5d9ff03a13b64bd093b313f8c8e97c409149d3bc026f46b1b46132ead71d3d72ed199a6132855dd69d944490f21d695636ae2f16c60caed9387ef MISC metadata.xml 694 BLAKE2B 05c4a49f68f759283b8c222ed8dce31c5448b72a09e5f5d505ba9ac5a3552bb65a14483ee20f2d18b9b9ed2729b7c5ac282d66e9335ec099d411594934262637 SHA512 721d7421c83925c20a66d521d0c0f9f639b2d994b20cc9528f6f6529ddfec4f9d5cb4f0947d04e2fac7421bd7ece26f99ae94b126bc3c8c3ec9704878b029116 diff --git a/dev-lua/luv/luv-1.30.1.1.ebuild b/dev-lua/luv/luv-1.30.1.1.ebuild new file mode 100644 index 000000000000..1309efa30fe9 --- /dev/null +++ b/dev-lua/luv/luv-1.30.1.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils unpacker + +# e.g. MY_PV = a.b.c-d +MY_PV="$(ver_rs 3 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Bare libuv bindings for lua" +HOMEPAGE="https://github.com/luvit/luv" + +LUA_COMPAT_PV="0.7" +SRC_URI=" + https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz +" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + dev-libs/libuv:= + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix libdir + # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir + sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt" + cmake-utils_src_prepare +} + +src_configure() { + lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}" + local mycmakeargs=( + -DBUILD_MODULE=OFF + -DLUA_BUILD_TYPE=System + -DLUA_COMPAT53_DIR="${lua_compat_dir}" + -DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua) + -DWITH_SHARED_LIBUV=ON + ) + cmake-utils_src_configure +} + +src_test() { + local elua="$(usex luajit luajit lua)" + # We need to copy the library back so that the tests see it + cp "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to copy library for tests" + ${elua} "tests/run.lua" || die "Tests failed" +} diff --git a/dev-lua/luv/luv-1.30.1_p0.ebuild b/dev-lua/luv/luv-1.30.1_p0.ebuild deleted file mode 100644 index 70dc438f3624..000000000000 --- a/dev-lua/luv/luv-1.30.1_p0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils unpacker - -MY_PV="${PV/_p/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Bare libuv bindings for lua" -HOMEPAGE="https://github.com/luvit/luv" -# XXX: Remember to check this hash between bumps! -# https://github.com/luvit/luv/tree/master/deps -LUA_COMPAT_HASH="daebe77a2f498817713df37f0bb316db1d82222f" -SRC_URI=" - https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/keplerproject/lua-compat-5.3/archive/${LUA_COMPAT_HASH}.zip -> ${PN}-lua-compat-${PV}.zip -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="luajit test" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - dev-libs/libuv:= - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua:0 ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Fix libdir - # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir - sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt" - cmake-utils_src_prepare -} - -src_configure() { - lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_HASH}" - local mycmakeargs=( - -DBUILD_MODULE=OFF - -DLUA_BUILD_TYPE=System - -DLUA_COMPAT53_DIR="${lua_compat_dir}" - -DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua) - -DWITH_SHARED_LIBUV=ON - ) - cmake-utils_src_configure -} - -src_test() { - local elua="$(usex luajit luajit lua)" - # We need to copy the library back so that the tests see it - cp "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to copy library for tests" - ${elua} "tests/run.lua" || die "Tests failed" -} -- cgit v1.2.3