gentoo christmass resync : 25.12.2020

2 files changed, 11 insertions, 42 deletions

diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 7d8ff92ef925..54722912720a 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -2,6 +2,6 @@ AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60
 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-r102.ebuild 2185 BLAKE2B d1b5b1ee9148f625cbc2f6fff926c530768ec1f9e6fec78250f98ea8638804a3f26ba1914717cc95b73c5f61e0b1dd5f25070ccd8af6651374924a2f246ba95d SHA512 727d7d98a012b6510005a633661672640eda2e0ce381e74621615114e5d6386761a3e2b00e6b9df87d1bb633b1c296a0226c310cf39c2b55bd535aafe9987c5e
 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/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
index f45e0eee2820..7b4e0feb5b76 100644
--- a/dev-lua/luv/luv-1.32.0.0-r101.ebuild
+++ b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit cmake lua unpacker
+inherit cmake lua-single unpacker
 
 # e.g. MY_PV = a.b.c-d
 MY_PV="$(ver_rs 3 -)"
@@ -46,11 +46,16 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-lua_src_configure() {
+# This could in theory be multi-impl (and we have an ebuild in git history,
+# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
+# app-editors/neovim, actually links against luv instead of trying to load it
+# as a module. We could probably implement some sort of a hack for this
+# - but given how messy it would be, don't bother unless someone actually requests
+# luv multi-impl support.
+src_configure() {
 	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
 
 	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="$(lua_get_cmod_dir)"
 		-DBUILD_MODULE=OFF
 		-DLUA_BUILD_TYPE=System
 		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
@@ -70,44 +75,8 @@ lua_src_configure() {
 	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
+src_test() {
+	# We need to copy the library back so that the tests see it
 	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
 	${ELUA} "tests/run.lua" || die "Tests failed"
 }
-
-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."
-}