gentoo resync : 25.11.2020

3 files changed, 127 insertions, 0 deletions

diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index bee97ff91be0..7d8ff92ef925 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,4 +1,7 @@
+AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60708583be04cb9a2e785c1ba09a171c7cdeb3cb18e1baf9dba976c429d6f7a5737c0c8ca803b3241d170f395f6045da03ece03 SHA512 6e8341db5eeb5c1e51cc9c812ffc99c2a15a18467456fa20c7dc37c100ac269ef4b416a311f7d435b89c824171218193b00e8e7dccf7506eaf789a88121866bd
 DIST luv-1.32.0.0.tar.gz 91349 BLAKE2B e4a90b3241e2fe650f62e34439ed75f9ba53168d6bd96b8685fc5600d6f9cbb1bb598a7d40d918ab9123cf4bad99f872a79d0664056d35caba52d1eda9046020 SHA512 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
+DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST luv-lua-compat-0.7.tar.gz 51383 BLAKE2B ae86f314de971fcd7d8706009d59d684c035fb661ecf392c581a3c317cc1a396321ef7af0418d8f23151c52c66613a0749e8fa9ac889a183c2ffe749091dae35 SHA512 665ece98422a105b818cffd96eea5788696fbb854d2ba41d2d387e8bd25c1fa9de601468e55e22e9e749979a66d4d2e0f7dfd656e5bf27b489d37bb07c96f48d
+EBUILD luv-1.32.0.0-r101.ebuild 2973 BLAKE2B 0735044bb0363923faa5e61f6d479194ff1e658086bbeb48cb7272aa24ddebc91a968ffa26d6d841dbb64e562556df3680a00c63eb02594be823891ab09b99c3 SHA512 7304ea117511225fb0d7bc7b1fd47edb7df9c44c999091f6f5ca7238fd3b31f06d4e396e2a96d51b273051e6ca52b4b0622e4705dd61937463e2ed6a18cd512e
 EBUILD luv-1.32.0.0.ebuild 1565 BLAKE2B b3cb0bc8ef2eb95e6b78ef0203feaa19b825b21f323599039da197715d829f3af596fa0489051a43c4d84ed62744e4cfef44ab7f2989494124a28f8ac05d522c SHA512 91bfaef1b5efb7bbb38707dff7a81baa620dad9d7d97c787adb233387e225f9b193ecc9419e5eaa6b0e02e0cbf5e9a225e8e01dcddc6869ddeae2bfe193c3716
 MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
diff --git a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..84af757d248b
--- /dev/null
+++ b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@
+       include_directories(${LUAJIT_INCLUDE_DIR})
+       link_directories(${LUAJIT_LIBRARIES})
+     else (USE_LUAJIT)
+-      find_package(Lua REQUIRED)
++      find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+       include_directories(${LUA_INCLUDE_DIR})
+     endif (USE_LUAJIT)
+ 
diff --git a/dev-lua/luv/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r101.ebuild
new file mode 100644
index 000000000000..f45e0eee2820
--- /dev/null
+++ b/dev-lua/luv/luv-1.32.0.0-r101.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.10"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+	>=dev-libs/libuv-1.32.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake_src_prepare
+}
+
+lua_src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="$(lua_get_cmod_dir)"
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_SHARED_LIBUV=ON
+	)
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=LuaJIT
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=Lua
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+lua_src_test() {
+	# We need to copy the implementation-specific library back so that the tests see it
+	rm -f ./luv.so
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
+
+lua_src_install() {
+	cmake_src_install
+	mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig && \
+	mv "${ED}$(lua_get_cmod_dir)"/pkgconfig/libluv.pc \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/libluv-${ELUA}.pc || \
+	die "Failed make pkgconfig file for ${ELUA} implementation-specific"
+	rmdir "${ED}$(lua_get_cmod_dir)"/pkgconfig || die
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
+
+pkg_postinst() {
+	ewarn "Please note that in order to properly support multiple Lua implementations,"
+	ewarn "this ebuild of ${PN} installs its library files into implementation-specific"
+	ewarn "module directories, as well as multiple .pc files named after implementations"
+	ewarn "(e.g. 'libluv-lua5.3.pc'). Since upstream by default only supports a single"
+	ewarn "Lua implementation at a time and thus only provides a single, unversioned"
+	ewarn ".pc file, projects depending on ${PN} might require changes in order to"
+	ewarn "support the multi-implementation approach."
+}