gentoo auto-resync : 29:03:2025 - 00:32:15

8 files changed, 93 insertions, 41 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e904308b0369..704db0d3d7cc 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 3ce7ecd674ca..665d105a80b0 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,7 +1,6 @@
 AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11
-AUX e2fsprogs-1.47.1-c23.patch 1293 BLAKE2B 9c297e1c99c9f3b071286223ecdf20a7d5f40aa3705a4e652a4d725831e7270d3a76aa225fc9b1e76a9573509604eb563ad879a4e249849e31b1324209de09c4 SHA512 2818e1e93295231490fcd18478eb14be80a509de435baeb39c87a6c63ed53593624e0dfdc77ed76a448abaafae0f7f6d51422fcbc5fca2f71c7ad3b376e8a4c3
 DIST e2fsprogs-1.47.2.tar.xz 7299932 BLAKE2B 20f93b53c18396dbbf8a9564fd80181e391120554bd63a76c90c88d32616596fb7cf8e1252417b835ef3918ecf3211aebdd7a75daebee11bcb6e7b0f9bd88053 SHA512 a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
 EBUILD e2fsprogs-1.47.2-r10.ebuild 4436 BLAKE2B 7a6eb1bca0181ea9bfc94735ce99e9f11ed45680a7987ef5ef01ff612f4b61912974557f92b46acade70c7fb7268620044291b3b933021f31269259ae7c90638 SHA512 b0d51008341d49ada4bfd1a8d12cc5489beabc11805e91adce5d1de66a92f5b3e414d1b57b0de76906b428f3696a8623944ffd98822c2b316976025c89f5bde9
 EBUILD e2fsprogs-1.47.2-r3.ebuild 4636 BLAKE2B 55f4b531a09a5531ffbf2f15235b7ab1aff98870e6ec1717fc1d6609b9bd505eb14de0866e04ef29fcfa324e80abcfe06cd7e9291f20a1f71ac7e687301a4629 SHA512 4af2cfed7c7002e77db3a202e7ae1b1a2a5e9c3ed5a831cd96a96fd5454812d732e5431c4ba636540f02b8ba491cfd405b76e19c5f794199d6e87365351ee284
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch
deleted file mode 100644
index b39e0a45534c..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/943687
-https://github.com/tytso/e2fsprogs/issues/202
-https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef
-
-From 49fd04d77b3244c6c6990be41142168eef373aef Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Fri, 22 Nov 2024 12:36:32 +0000
-Subject: [PATCH] libext2fs: fix -std=c23 build failure
-
-gcc-15 switched to -std=c23 by default:
-
-    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
-
-As a result `e2fsprogs` fails the build so only typedef int bool
-for __STDC_VERSION__ <= 201710L (C17)
-
-    ../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers
-    ../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration
-      113 | typedef int bool;
-          | ^~~~~~~
-
-https://github.com/tytso/e2fsprogs/issues/202
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
-Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---- a/lib/ext2fs/tdb.c
-+++ b/lib/ext2fs/tdb.c
-@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s)
- #endif
- #endif
- 
-+#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
- typedef int bool;
-+#endif
- 
- #include "tdb.h"
- 
diff --git a/sys-fs/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest
index e1413668d039..047f6b7791ca 100644
--- a/sys-fs/linux-apfs-rw/Manifest
+++ b/sys-fs/linux-apfs-rw/Manifest
@@ -1,3 +1,5 @@
 DIST linux-apfs-rw-0.3.10.tar.gz 210033 BLAKE2B a7714ed7e0f2334fe8b534cf88cca5c5dba62592046e8c4957171350de17d808fb64cc809facd2b385ef27b7f8c3f6001e675e34437c609daf5b6b2cd9afd1f0 SHA512 cebdbbda67f282edaf00e6b1da9ed4905a068205c2af6a1b723da4007c39c3ea02c2a2935e2e07395b51dda58b6f1ad00beb9547fed81690f77455b96fb9e672
+DIST linux-apfs-rw-0.3.13.tar.gz 214862 BLAKE2B b0e41feedde32953019cd8183ef7637fcc9310e47f383e82b67d830f3f8c21f86100e6726d1540051ed3594d286a294778e45d41c3456a841281f3f57ff2a57e SHA512 09db8cc6b0dc28e61d455b621e9c5cc17ebbbc2c80f6d88874f29b5878a9c0a611adf6ec0880ae47179ef5f1c632bb0b8bc5f2469678e59d9e4dd346dbaa28d3
 EBUILD linux-apfs-rw-0.3.10.ebuild 795 BLAKE2B 96d4853b6370e0b70de7502037792300e937d9aa72e5102b2544853814cef3da340ae8aa30d420d9fd96ff4cabece4a71001f1a0df29dd251da5f0bda419ec17 SHA512 b18acc3b83ed8b1eeb6fbee32ac7fe55866891954924917a6cf1b7c82ed06046859b2888e4d9e03f945438f8957b8f568c523fa5f9b274ef9772854d82134e32
+EBUILD linux-apfs-rw-0.3.13.ebuild 800 BLAKE2B 9db56bb6e602405e3993a66c0e301ae14a239833f897cbb1c61a44cb43ff8745f1e9e4444ab6ef19d759b52780730876c28f61f6e02683215efd9ef55fe16375 SHA512 fce12018ec32cd57870eab9264694ffeccd849941832305906c115c7f13c1a9e42fe0f6efb4205c7dc2a9ebb22ee26849f638a3022be096cf89ee9941d5c4d2c
 MISC metadata.xml 334 BLAKE2B 1ae67bd0e178cd47efd0c8fe5c6119f36bef5379b16e2bb05c5f319b62a1ead04a071849cbf64cc67616817967e9056933b30d4636ef8060739e50386f6c3938 SHA512 350a9048f140aecf169b3ec39f90374797206ecb0ea35911fac40157867540e8a87790d2089001ebff44a62829776a138b28740fd8e001fadeb9239788ce2f73
diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.13.ebuild b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.13.ebuild
new file mode 100644
index 000000000000..3613f1532e95
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="APFS module for linux, with experimental write support"
+HOMEPAGE="https://github.com/linux-apfs/linux-apfs-rw"
+SRC_URI="https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="LIBCRC32C"
+
+pkg_setup() {
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -e "s/GIT_COMMIT=.*/GIT_COMMIT=${PV}/" -i genver.sh || die
+}
+
+src_compile() {
+	local modlist=( apfs=extra )
+	local modargs=( KERNEL_DIR=${KV_OUT_DIR} KERNELRELEASE=${KV_FULL} )
+
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+}
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 68207bdde396..78d2bf27a4cf 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,4 +1,5 @@
 DIST unionfs-fuse-3.6.tar.gz 56360 BLAKE2B be69579d141c05c4fa0f5350e17a35e40884129c84f844f79055608ae1b7652384fe0d8c49c7c5c035e8818b1f341a2f4af395ffa0924e7f79bfad55ca095adb SHA512 0edc9a4f55236a997bb3d8742b77003201a9d036665df903c8337ced0394e2f0bea3025dbace1f881838fa7699890b7bc93861217e26d27ff8725452e36699cc
 EBUILD unionfs-fuse-3.6-r1.ebuild 1026 BLAKE2B 3a2bce81eba140f7e276e3adbc3c979183e84e01ad626a92d9c314cecf3491d9b2e6d083132c4eb88a4c0870b9120067c3b9af3957388f960fbea60174f8d2c7 SHA512 2fbc5ffc5f20aeef93238e875734d532b8f116ea6a234e05d121c9b05ec5c57bd92ce3efaf8359a3948cd8da6e7d0269fd24d920665e6e1ca58a080f84adea1c
-EBUILD unionfs-fuse-9999.ebuild 979 BLAKE2B 62809937086a05c35d30eb3312278e862e424b2ada5cb0ebd7c83282f5cb08c06583456fb2ec9608bd3657e8edd04b410ffc71dd55fcc2c31a5e55d87f46f504 SHA512 bbfbb96d4275304a06fcc764a6b5c1d85df7ba506e4a056531d3c4224274c319d0ca3059e023f60b762db98288a80e035079084dff1afae5783461649c0fc2cf
+EBUILD unionfs-fuse-3.6-r2.ebuild 1026 BLAKE2B bfdd8f1b67b8c3e9cd049077c4dc4fde21809b0f3fb2250ffa41d45b0bb265e5815c9bb8235c98c9e2b45b730f207ef26238593f601ce274020fbcf2fe439344 SHA512 01b7afaaa040a66f0d3812878b54d1f071568988bf9d331170fd86d28ee143867f58c6c32bac915ae4515f6fd9602c8599d40b7c8da8e4bb3ac4cbfeb76b929d
+EBUILD unionfs-fuse-9999.ebuild 979 BLAKE2B 9e9927f1c3c4536d990788e8243fe03e37eb0cc91e16c8b78950b520bd24d4c6e5e1c80e0d9e5672f1621d5c137040145a5b128d1d60802b786c07b6eacd6e66 SHA512 96716d2868cba74213211aa22adc9bb8d9a57dbba6e038817374e429d82066f53029860a9a94e82f71b767acf5ed7fdfd6a9b30e726b9fba99d30dbd468eaff8
 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild
new file mode 100644
index 000000000000..edbaab363381
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..13} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:3="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || return 0
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index a1af3d5796f4..64a5ee9a3635 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 inherit git-r3 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"