gentoo auto-resync : 15:02:2023 - 08:00:21

3 files changed, 77 insertions, 2 deletions

diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 56613d47ef6d..2c3b2875589f 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,3 +1,4 @@
+AUX zstd-1.5.4-fix-no-zlib-build.patch 2469 BLAKE2B 955ee5ce52fdf7701c8d3f812c4e4ed15c53d7764e9bfc0cdac09186aa572e0d867eee0862470f2d9cfb17369429f889d3a4f903e3bab12672c517c46c9739d0 SHA512 2caf596008aaad385bbf2ec61faff06ca28abac0228440fc1d4226e83757db2c7ca16010beb73da9802fe82ea6a6b81ce350e7fb7b059266d204d844623a1baa
 AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88
 AUX zstd-1.5.4-tests-no-programs.patch 2252 BLAKE2B 014fab10a60fd6f5ecf5399ebc77a192075c0b08cb3b6643b4b414e942198f476d5dc8fbe8fa76306db70361a299518b574f69b84d8b27b30e5c5dc4988c2c48 SHA512 aed61bacf3d4d2b802e8e6a3dfa12221dcd7b6f0e64972530f826995619870ed1e87ea920eb6fdc81069e5165153703972ad1e2d370521f7d1624c308afba520
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
@@ -6,6 +7,6 @@ DIST zstd-1.5.4.gh.tar.gz 2161536 BLAKE2B ffc5fcbbdf4ab04bc14b5037308bf4e879d4cb
 DIST zstd-1.5.4.tar.gz 2178759 BLAKE2B 0c7ad42ebbf888bcd978eee95dc07f8e74c6b4ca1e1cec15ae110f5f57b66cb1d726896f71430e6219ef54ff90e722fc778147d5f77f4bff5395b0dc8b914885 SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
 EBUILD zstd-1.5.2-r3.ebuild 1490 BLAKE2B 3acb86024c045b85682d2e4b138dd83ab85de948dbc95529aadd260728c6ffe2ddb1168ba3165cab65da7c803f9d715ec2c70f9a0c9d65b7ff01e06ae57d560a SHA512 9fdb17e7d37b41cb2b1cc5553005223d50d3aa0d62fd56100878ac5c30c994e0c515b5dd0aede1f053fc413614810bfd73f4a64da18f12b31f2644537cc6d0a9
-EBUILD zstd-1.5.4-r2.ebuild 1881 BLAKE2B b3ee9ad9883c591454016baa041bc108259559af01f0a8e282e1e7393d47d09eaaefed1e390f914f26f3c7b59b084013c24aad7bc4b50d82142827fd00956761 SHA512 e446b1ca1b202d98149380eafc812407daec6b644c3b8bd4f62ae1c00804cc8221152436b60209cd650c834bc7400c7c66c3461b7414a2a31d31620ea6a7c378
+EBUILD zstd-1.5.4-r2.ebuild 2085 BLAKE2B d4b17ef1cdf4ae53f6c1381fc6198471385ddd338b09697466bf3cde1501b4780ca97994c86444a9a64e155ec1c53dcc7860cb6fae92fb6931f6a08c2b76bc6f SHA512 54d69027986b64efcc12decc93a9114223663888d20802ad88600eeb6acb6acb5a3a882380341e8bdc7f124c1e8e32c499d18d6a8d026646df8456a6d8fec67e
 EBUILD zstd-1.5.4.ebuild 1826 BLAKE2B 606d8babbc91b04dd0901e582195c9d502248c7a87eaed6f6e47255ecf8ad3b10a85a7b9fdb94529721155f78b41896c26e35baf09a028912b31d5d0622f75ff SHA512 470298a353c7834d7d4cde29abf5c71e6e638b1a9d38b0610488cd6a7b1b5b134d52bf5dd35ee026252ed90ae9dffddcbd78d2749da9201381dd916a0b26d908
 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch b/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch
new file mode 100644
index 000000000000..c6e65cbe2b16
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.5.4-fix-no-zlib-build.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/894058
+https://github.com/facebook/zstd/pull/3497
+
+From cc94fac7c879c47984bba7d60d5ce0c9834ff4c7 Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Fri, 10 Feb 2023 19:30:30 -0500
+Subject: [PATCH] Use correct types in LZMA comp/decomp
+
+Bytef and uInt are zlib types, not available when zlib is disabled
+
+Fixes: 1598e6c634ac ("Async write for decompression")
+Fixes: cc0657f27d81 ("AsyncIO compression part 2 - added async read and asyncio to compression code (#3022)")
+---
+ programs/fileio.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/programs/fileio.c b/programs/fileio.c
+index 9a8300cdd8..d3ed9217d5 100644
+--- a/programs/fileio.c
++++ b/programs/fileio.c
+@@ -1173,8 +1173,8 @@ FIO_compressLzmaFrame(cRess_t* ress,
+     }
+ 
+     writeJob =AIO_WritePool_acquireJob(ress->writeCtx);
+-    strm.next_out = (Bytef*)writeJob->buffer;
+-    strm.avail_out = (uInt)writeJob->bufferSize;
++    strm.next_out = (BYTE*)writeJob->buffer;
++    strm.avail_out = writeJob->bufferSize;
+     strm.next_in = 0;
+     strm.avail_in = 0;
+ 
+@@ -1201,7 +1201,7 @@ FIO_compressLzmaFrame(cRess_t* ress,
+                 writeJob->usedBufferSize = compBytes;
+                 AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
+                 outFileSize += compBytes;
+-                strm.next_out = (Bytef*)writeJob->buffer;
++                strm.next_out = (BYTE*)writeJob->buffer;
+                 strm.avail_out = writeJob->bufferSize;
+         }   }
+         if (srcFileSize == UTIL_FILESIZE_UNKNOWN)
+@@ -2316,8 +2316,8 @@ FIO_decompressLzmaFrame(dRess_t* ress,
+     }
+ 
+     writeJob = AIO_WritePool_acquireJob(ress->writeCtx);
+-    strm.next_out = (Bytef*)writeJob->buffer;
+-    strm.avail_out = (uInt)writeJob->bufferSize;
++    strm.next_out = (BYTE*)writeJob->buffer;
++    strm.avail_out = writeJob->bufferSize;
+     strm.next_in = (BYTE const*)ress->readCtx->srcBuffer;
+     strm.avail_in = ress->readCtx->srcBufferLoaded;
+ 
+@@ -2345,7 +2345,7 @@ FIO_decompressLzmaFrame(dRess_t* ress,
+                 writeJob->usedBufferSize = decompBytes;
+                 AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
+                 outFileSize += decompBytes;
+-                strm.next_out = (Bytef*)writeJob->buffer;
++                strm.next_out = (BYTE*)writeJob->buffer;
+                 strm.avail_out = writeJob->bufferSize;
+         }   }
+         if (ret == LZMA_STREAM_END) break;
+
diff --git a/app-arch/zstd/zstd-1.5.4-r2.ebuild b/app-arch/zstd/zstd-1.5.4-r2.ebuild
index fc646ce06670..3d848f5e471a 100644
--- a/app-arch/zstd/zstd-1.5.4-r2.ebuild
+++ b/app-arch/zstd/zstd-1.5.4-r2.ebuild
@@ -25,13 +25,26 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
+MESON_PATCHES=(
 	# Workaround until Valgrind bugfix lands
 	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
 	# Allow building tests w/o programs (useful for multilib)
 	"${FILESDIR}"/${PN}-1.5.4-tests-no-programs.patch
 )
 
+PATCHES=(
+	# Fix build w/o zlib, bug #894058
+	"${FILESDIR}"/${P}-fix-no-zlib-build.patch
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+
+	cd "${S}" || die
+	eapply "${MESON_PATCHES[@]}"
+}
+
 multilib_src_configure() {
 	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local