gentoo auto-resync : 22:01:2024 - 22:48:12

8 files changed, 41 insertions, 7 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f80de6a0d51c..a5edf22b5c7b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index 3421ea29cd0c..7a42383adb50 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,3 +1,4 @@
+AUX hfsplusutils-1.0.4-Wincompatible-pointer-types.patch 964 BLAKE2B 4eb140cc26411ddea1e1a46c09871845e96ba19c9885b971961b80ac9e99b14dfcb7913a801971f87c880e205339ff577a6ba95953b844437927f918494222eb SHA512 8bb285e24bfe9db3724ab2e8efb9f2f99e1044652906f7349fd511c92b10252b73a8940357143d596e7fbcd5c25806443c32f02325bd6941b8f5e5ad3054a496
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
 AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
 AUX hfsplusutils-1.0.4-fno-common-gcc10.patch 591 BLAKE2B b804a5969a83cadb0cf8c8deb5138ee5f5abacc9c261adf2f5ff1e9933764165041f1e2e9e04351934dd680874405e69a0abfd87042dc49d93295d157d29ba42 SHA512 46c04b1a6043b8c208e55c4edf912ec4c09973081b7f1974c473c89dfe656a7c1565a834827a203428606c52af876a89878284a95b113d2828fc910807d778de
@@ -7,5 +8,5 @@ AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r3.ebuild 1073 BLAKE2B 79814f59b9516335fd3891cec6fde7e70fc5042a3367bd5a139ec6470098ffef5916870acb51e81728e1f1bfe2bc242a63a88f23f27f0b2f7e77d62a3440adc9 SHA512 4778bf4a493bf698155e36652588d582c6bf10e0e974e9ee68c36d64de0fd15fc9c587fe29cfc97deb33e4daa37659a9c5392e3bd6372b09609c1770518d24fb
+EBUILD hfsplusutils-1.0.4-r3.ebuild 1127 BLAKE2B 682d68369e5aa9ac668da1213e2263b28cd82335aace33a267cfa98b96d0c26663bf55f35689f59f3f4aa06887bccb17cb90471eaba0e9069b1c2a8119bf02a8 SHA512 1ba3366b3bb532102eb09d1adefd208d36c99fb6fd4baee9550e3d2cbe287a21b0e41f5d011d64c6c43be2cdee648531c4a6c62a4d30667d85d45c30f956df34
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-Wincompatible-pointer-types.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-Wincompatible-pointer-types.patch
new file mode 100644
index 000000000000..0ad76d93f453
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-Wincompatible-pointer-types.patch
@@ -0,0 +1,32 @@
+--- a/src/charset.c
++++ b/src/charset.c
+@@ -159,7 +159,7 @@
+  * NAME:	charset->latin1()
+  * DESCRIPTION:	return a Latin-1 (ISO 8859-1) string for MacOS Standard Roman
+  */
+-char *cs_latin1(char *mstr, int *lenptr)
++char *cs_latin1(char *mstr, size_t *lenptr)
+ {
+     int		    ilen, olen, i;
+     char	    *latin1, *ptr;
+--- a/src/charset.h
++++ b/src/charset.h
+@@ -23,6 +23,9 @@
+  *
+  * $Id: charset.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $
+  */
++
++#include <stddef.h>
++
+     /* a two byte unicode character, gnus wchar_t is 4 bytes in linux */
+ typedef unsigned short UCS2;
+ 
+@@ -35,7 +38,7 @@
+      * lenptr may be null in wich case the given strs len is used.
+      * on return *lenptr is set to the returned strings len.
+      * must be free()d */
+-char *cs_latin1(char *, int *);
++char *cs_latin1(char *, size_t *);
+ 
+     /* return a MacOS Standard Roman string for Latin-1 (ISO 8859-1).
+      * lenptr may be null in wich case the given strs len is used.
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
index e27b2512b24c..203f0abf002b 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
 	"${FILESDIR}"/${P}-fno-common-gcc10.patch
 	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-Wincompatible-pointer-types.patch
 )
 
 src_prepare() {
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 159e8ffc6b6b..9067a04cd026 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,6 +4,6 @@ DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdb
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625 SHA512 110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
 EBUILD zfs-kmod-2.1.14.ebuild 4601 BLAKE2B 451f240a8bfda7164ee48ae37bb410b8c3e06ca7184126da122258e7f6f8da62d23c9e6b0481e310735d92e460fbe5617a9f01da04cdb0ae801039c93cb12cd7 SHA512 7240287b57eaac31f6d0c7d4994c6a4de44a41ac9470aeb4c95e33ddb9557d7c70fad24c037f32ae026b4b7bb745ec5f4f496a802457dbdb95a8f1ec7f527c49
-EBUILD zfs-kmod-2.2.2.ebuild 5939 BLAKE2B 880f2d7d9caefc7c02a16662ea7f57f2c7315527b100159c4c1f65f13cd54bd13ce6fdf137fbf70c80531abc6cfe92b4854a5bc3a72b74b073b70b18552102aa SHA512 5c1e74764724963d200b40e95fbe30ea478c07c82be939f509651ed6d0c4cde86634a9e41d8ff854f23ae432a8d755c4455f9f8cd0d41ee8ec3a8cd50691603d
+EBUILD zfs-kmod-2.2.2.ebuild 5936 BLAKE2B 631a19040735ce4fca99f80923bf1f0da12c1bd99cbde846a0a0e28bd2104c7bde894c76a90a8468247f0f776fed92871b26f4aa961df078397245488abf6adc SHA512 af24bd6532a76f2a232dc4c3b20260d615c8d991414a6328a44e26caab77ba55917d1d245426c58fea3ee6c06f30c767e2bb6bdfd9d9b714857114f7b930b302
 EBUILD zfs-kmod-9999.ebuild 5939 BLAKE2B 880f2d7d9caefc7c02a16662ea7f57f2c7315527b100159c4c1f65f13cd54bd13ce6fdf137fbf70c80531abc6cfe92b4854a5bc3a72b74b073b70b18552102aa SHA512 5c1e74764724963d200b40e95fbe30ea478c07c82be939f509651ed6d0c4cde86634a9e41d8ff854f23ae432a8d755c4455f9f8cd0d41ee8ec3a8cd50691603d
 MISC metadata.xml 776 BLAKE2B 4c48182f7ceee679b4d947a70cb232980969b59bdc425463a929b6ae8be5f79450a3869bf3cc4d00069b65cda8a06f42eba29a7974c5e1b34a2998992901bcbe SHA512 f3f0af7dcdd26a01fc1b00af46ff64e7e6d7bb83a2225ea4cbff5c1a56651ddfdf3e7f59af914833f52828b9d059c6a8cb7f32037319abed129c40987349745f
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
index 940666b38c47..18f9e126cc32 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 33cf91b27848..c4e57e25270b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,6 +6,6 @@ DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdb
 DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
 DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625 SHA512 110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b
 EBUILD zfs-2.1.14.ebuild 8907 BLAKE2B ef6fa6ab85907507d146f3ee17c12680226ffcf0b49559d2f2521b95758d5dffe8ae4763d2db2691a09cf1a9d02bda4a58de0ffad205b4ec05201b3f76f85c3e SHA512 6f106cf37a7bc7fc850f86169aa90cea904680b85d5512045b36f7853024d702ca25272bc735eb5b140598581ea5edcd67b4bf027e1b378af2f8559b01d7838d
-EBUILD zfs-2.2.2-r1.ebuild 8812 BLAKE2B 18d33142384319d584570211db01e12ee9e01f37f91e6fd36cd4d56e1f64938fb6fcedf54e8277c8e5113ba3c1fb34554a0e642a614c9d5f69b0f75a0c4a8da0 SHA512 976f0d203b29ca863616a65c581d48a5f8318954d20cbc8d73c976afcdea81424f656d250f430cbd572146e3084805571e74297c390da90b5e8905a2822f2ed6
+EBUILD zfs-2.2.2-r1.ebuild 8809 BLAKE2B cbb0a314545e47bae39a40550179a30b7649f76a743a8171fede13557d343da5fd888c2101568f236358e9c9377d71dac844c4e7f6757646922efc9cd627ed1b SHA512 27b8f2c1eaa086b51bce6fdcd733a615843e7b8bd9a134b9c954a3f85796f0a75cfcb056e583c714c59f689dc999e167054a1fd20df9f69ebb90b67e82737495
 EBUILD zfs-9999.ebuild 8774 BLAKE2B 87f67afa1aef645feb74097804d346bde2ef32262025352543307d88f99b00664b1a292b5eae63c9e2daff849121380f271089b34fa76432c522a90cc1ba6ef6 SHA512 9a7f15356961ee7e2bb2fd9bb201ac0e20a73e4732c3e6f29cc67dc02cdc3c4348fe1985d204dbc6dd8f4991c6e58356d667041302d6fb622ceab94458a0baad
 MISC metadata.xml 2205 BLAKE2B 82e20a6f5906b8cbbc6eb6e9520cf4e4213ce9cba2b056df5d5db0d4deaa4a20822a88e26286446d105326a8f61c807047a0e1e64494faac48d8ed5708807c02 SHA512 222981f945e98ddef646c593cbc8889f3526af4901c28ab5775ba760ca7d3aff3129b2699e8b7337b59fd33cbba388915cb5b2dc09674432c606f41ff27dbd9b
diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
index 5d676afae4d7..80914d259c33 100644
--- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2-r1.ebuild
@@ -25,7 +25,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi