gentoo resync : 20.03.2021

3 files changed, 34 insertions, 2 deletions

diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index c24cb7d195de..704521faf3e9 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,4 +1,5 @@
+AUX lgi-0.9.2-lua54.patch 886 BLAKE2B f2163836ca359d91f2f36d6b9fa0bd4aeeebed80a27c0ea8f11c3d025f8e84393b7e5f82cf87de7c567fad34285de8d40da32dae85dbba9efe34b2596801b059 SHA512 9b43ea4ae0e6844f33ab2fe71d04443c4336b91d287aee31ed438c9fb63a201674b160aa8e4593c90459115f60d64e27633e63db9e0466cc7ce2ce244920c431
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
-EBUILD lgi-0.9.2-r100.ebuild 2546 BLAKE2B 8bca9901581a952620ca8448976ce0f70d168c47d996bf404dd668b92e57727daadb8f8efd752d058e21455a1525cd01bcc2cd466c1de531ff1146f509555fe8 SHA512 c8a4a4165ffa7bccd783ae739e79b431c1d909736e030e2c641f3276b3ca55fb8b757e51f149c46625ec19a2e0ca85767e4d75f7f8e615eb485d3a4e45b9280d
+EBUILD lgi-0.9.2-r100.ebuild 2590 BLAKE2B 62cb3ab1e4b7dda27d6388c42fb44492f473a4132c2a9efb53d23d5ff1b91d4a26c05a2b8166a5c66e99e6004f634e950b80514845346d9c3806903ab2463434 SHA512 daf47e83d7ccb3c29f8f229ef5d18edba3261da91c4edc043d453b5ac61416185d3c269d251cca8f76e8c28a1fb8c018e053c90d0ebb285318be6a31cf55ddd6
 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/files/lgi-0.9.2-lua54.patch b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch
new file mode 100644
index 000000000000..b1451a7566d7
--- /dev/null
+++ b/dev-lua/lgi/files/lgi-0.9.2-lua54.patch
@@ -0,0 +1,29 @@
+From 5cfd42c386d3adae6d211fbb4011179c3c141b04 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Sun, 2 Aug 2020 16:14:27 +0200
+Subject: [PATCH] Fix the build with Lua 5.4
+
+Lua 5.4 changed the API to lua_resume(). This commit changes the code to
+cope with that.
+
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ lgi/callable.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lgi/callable.c b/lgi/callable.c
+index e96d3af..3234b64 100644
+--- a/lgi/callable.c
++++ b/lgi/callable.c
+@@ -1355,7 +1355,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg)
+     }
+   else
+     {
+-#if LUA_VERSION_NUM >= 502
++#if LUA_VERSION_NUM >= 504
++      int nresults;
++      res = lua_resume (L, NULL, npos, &nresults);
++#elif LUA_VERSION_NUM >= 502
+       res = lua_resume (L, NULL, npos);
+ #else
+       res = lua_resume (L, npos);
diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
index 285de59e5aff..79f00bb47318 100644
--- a/dev-lua/lgi/lgi-0.9.2-r100.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VIRTUALX_REQUIRED="manual"
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua eutils toolchain-funcs flag-o-matic virtualx
 
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 			${VIRTUALX_DEPEND}
 		)"
 
+PATCHES=( "${FILESDIR}/${P}-lua54.patch" )
+
 lua_src_prepare() {
 	pushd "${BUILD_DIR}" || die
 	# The Makefile & several source files use the LUA version as part of the