gentoo auto-resync : 27:06:2023 - 13:35:02

9 files changed, 19 insertions, 559 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 4007ff420a92..b1691ad723b4 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 4a0680652ec9..546b595e3b34 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -4,5 +4,5 @@ AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bc
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
 AUX cryfs-0.10.3-gcc13.patch 258 BLAKE2B ca97032f8545c83ba717efc12a3563a8efa8353c478fe600cb94480fc0d358bad0482432283f9192824ba3c444bafba7f9b94109ec20007a687c6fb52303ecf2 SHA512 aaf0dd6698c833598b212c07e6c954d245f20da23a3edc967b0615504d83ea18994e446cf29cd3b5c08590f25bf8c9d4115e164f8ea0472a17ab897793fa2dc1
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.3-r1.ebuild 2359 BLAKE2B 781e4813a564d20e34e1df7a2c951ed43374834e91d9209772a350f05a7b83f9080d25487cd213332361bfb7e2051e386b60b696831e23b66de496e52d486fe2 SHA512 38e24a2ff8f5f8ac073b9eafc61941b95929a94bea7544c455c012e31b07f3f07535650d84f5604944832af9601bcc6a7c208ddfe2f80709cb3aea2176da835b
+EBUILD cryfs-0.10.3-r1.ebuild 2650 BLAKE2B d851ef20c27b8f1dfbde12e104ec913336897376768643cb843cf5633b15ce368ac53669ca6e8f11f82e09f3b99ae161754785d784a0f63c9469f29b3cd38ebd SHA512 db695e6daa170fdeb11d82767d905e7dbdfc26a0c285cd1eff3e1fddbe8cde4f99dbc015d4dfc911a6a6a2f112f0b25bbd699f7bdb7a8b57f18939c27e6caf74
 MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index 321634245e9e..6ec74214a5c7 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit cmake flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
@@ -28,12 +28,18 @@ RDEPEND="
 	>=dev-libs/crypto++-8.2.0:=
 	net-misc/curl:=
 	>=sys-fs/fuse-2.8.6:0
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/versioneer[${PYTHON_USEDEP}]
+	')
+"
 
 PATCHES=(
 	# TODO upstream:
@@ -45,11 +51,16 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
 )
 
+python_check_deps() {
+	python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	local CONFIG_CHECK="~FUSE_FS"
 	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
 
 	check_extra_config
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -58,6 +69,9 @@ src_prepare() {
 	# don't install compressed manpage
 	cmake_comment_add_subdirectory doc
 
+	# We use the package instead for >=py3.12 compat, bug #908997
+	rm src/gitversion/versioneer.py || die
+
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
 		-i test/cpp-utils/CMakeLists.txt || die
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 2ab2ee9f7459..c5f6bf707fd2 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,18 +1,9 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 AUX fuse-2.9.9-avoid-calling-umount.patch 1264 BLAKE2B f02bb80aab844f90638ed291891d819169946e3e4e58318bf370f5f3721aa80ba8ecd7cb127e387780e5ed8336875e3eca2d776ecde29a85e40821ee89c8264d SHA512 24f6c7ccf8b3d291e0e477685532854a21aeb65a90f7c428db039e6c7ba8a4cdb5435f2effba3a397448c0f6a44e056f2580eb55357a0b29c6c78bf5b364830c
 AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caadee97c84fe412056c04124cf501a30df1dd7cb5bbbfd8a761692f2396755dda156fd94b86278d78f1a2bd2d7a41b9fd87f20fee SHA512 77bca6a67c235d7d22b156a9c3a8b906de59029d28fa0c985cb15e30d306b0dd6b9437d75eabe307aca7e159ecd90e47bd8fb723a582e95d0c491a6cb308e8a5
-AUX fuse-3.13.1-r1-fix-config.patch 9611 BLAKE2B 05de6d654c21f72ff29b1193d1e4bde2fe34caf390958470972c4e7d598e1fc442d2cbe6ed22a0805395e84504871efd2ae4ea41c6e04bf0d2999e271cc7e5fd SHA512 59f9dc1d6a57f54a7f053dcbcb2c3026f2fd2a6d0716e2ea27f28312f658413bc8577c4bd8e97e51cda5cfe06d8ae4df82b4a76b11a5b86f3674bc090f0f2f30
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.12.0.tar.xz 3206368 BLAKE2B 9f7df324f5c28480e48264c53c23fd2afc372592aab586bebdee38a809881603c93d05d0ca20c9007ba4b77efdf391705a93a0a6a12b218c9bd5541aa6a5275d SHA512 b66232785fbe83ec32a9779542d085dc2c19f1fe0655e5f1e22e1a7add69795df40eb58da256a963537e64a9bf798ed8dfbc678f977fdd22567c5befa5b6ca04
-DIST fuse-3.13.1.tar.xz 4011224 BLAKE2B b8e6cb54bc88e2133a90e9a1dce549f81ce1503906424dd36825cfdfc2b7340217b84176c9e9c707403ea4fe0e0a10a723613bb475c95fb59ff0cb35e7180c60 SHA512 7630e17a68d81e1ac66c9e8937bc9e1a99d8887d48639cbd5a96d04c7f687729dbab71a875d90bb77bdf361a154f195223f34c3438ab149630286bf87238c679
-DIST fuse-3.14.0.tar.xz 4351852 BLAKE2B c8765b72c95b6983b9c561baf4b4d6f9eb63441348f04e1992463241df0a8ed426f4336dd2e9ee7fc4b1f550ce30d3c3c08b80a4a476754667c698bcc5dcdb0b SHA512 4589df0ed975d6cc75a0a8ec032e934ad65c77f99194da6aba968cb6d5ee73f13c7eee1a78800965c4a9355b8d7d04c861aa881d502fc147a1e7c6677418ce1c
-DIST fuse-3.14.1.tar.xz 4404984 BLAKE2B 36e982066c10aea1cff269bac635fca0776d0a7844c35ff21db568b22e5dc0ffb8877be50e42646ba120ba29367b6de282a62960f6b28c4c2b462c49e335f6bc SHA512 ef5a67c857ab4cb4d2d3dcb252fa98acb102c3c2db226f812a899f2a137026b7037f757d76d196a63fff0e11683b7e13b8c13c67aaa1fec8c223b26a621c806d
 DIST fuse-3.15.0.tar.xz 4589124 BLAKE2B 4777a956f8429aee2e5da43b9606ac6acc66744943739051f2be87a646b93c2aaa8f0b7f0c188f6d1724c1ab3fdf706d35c981066b0ba8c4dd647c0eb1f3c821 SHA512 5046b827c2cdccd03031761aeb995caf159f075a16cdda7248fcdd81177500f337368208948e0ff0e4bee32d06dd3d2d966828d3b5e82a79339f28a01727b1ae
 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55
 EBUILD fuse-2.9.9-r2.ebuild 2141 BLAKE2B 92bedf477999e4b306f48194f211769747f1c0955efa944421c5afbfd95f0d2f731b1b0ccc33dd403a8083a915c3c73081b332ea9c08629084923fcc470d0ca5 SHA512 808807cdd2daef32aa9923beb6317e4c13b9a70205899537aecf1c31ad88a7b1945f5b5242edb1869db9d0e56ade86a1fc2b65633c64b02236f9358bae9aafe3
-EBUILD fuse-3.12.0.ebuild 1672 BLAKE2B b911ccb415e6c19ae6773ad2cf857d0c841db90572a9fb148d5b34aa6da6c88cac55abe4395fbe434b380fac919c63edbc23d351d578ee11a9ee131f4dc73720 SHA512 97f49cb9d54e945199abc40b6d3409175425b12e6d3ec83fb75c05155e29c004f37d526fdb679f2c81c3bcb58c712de3abbd1c265b2441a7770a2fabde5ba3be
-EBUILD fuse-3.13.1-r1.ebuild 1781 BLAKE2B c32fcf213fe599cb4a6d25e87af15903b08cc8c49349f4492eaa54b6678a2e9fb7a2b2d5314544f7ba5f4e8bdf8fb02f41ddc18b69015c09a5e937f26757cb63 SHA512 7b417db573996249174c006c1a6f7429c7dd641d4a69509d2f0bace6ce8a8eea6a5bc01507d36526be9df27eda12ee0b38e1e6e9f33593785e2c25eeec614867
-EBUILD fuse-3.14.0.ebuild 1713 BLAKE2B 2d09a6c8babf750fe0d4c7c3c58cf47d01885da9392d036529e847b62120f32cb84a76213a61704961bdd23ce1acd8bd38cc099289e5ea6f5217e79f432b6f90 SHA512 129ae628db084e338a536dfee4d28767b44b523aaf0b6fe82c0ceefe2ea6cc473e7e46fa15cd96d6d03edcf74e681a85824aeced5dc113804bc39a675ea794c9
-EBUILD fuse-3.14.1.ebuild 1713 BLAKE2B 2d09a6c8babf750fe0d4c7c3c58cf47d01885da9392d036529e847b62120f32cb84a76213a61704961bdd23ce1acd8bd38cc099289e5ea6f5217e79f432b6f90 SHA512 129ae628db084e338a536dfee4d28767b44b523aaf0b6fe82c0ceefe2ea6cc473e7e46fa15cd96d6d03edcf74e681a85824aeced5dc113804bc39a675ea794c9
 EBUILD fuse-3.15.0.ebuild 1717 BLAKE2B d184785d62157336bdbacb8c25d420ae79aa50e685d920cc005699311ab0786a4aa011baf49ff4c7ec49c75d0a6388f704aac84a42dddf88f075cab6ac123746 SHA512 0f6bfb95ad2d25c30e446a3da8d44db9ec6132a70703b56dbce5e0888af6cd2a5b9f7d97247e3851da3dc6f5a31196126c0113326ea9a60a020dc02a2962dea0
 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e
diff --git a/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch b/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
deleted file mode 100644
index d61657f3c285..000000000000
--- a/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From d7560cc9916b086bfe5d86459cc9f04033edd904 Mon Sep 17 00:00:00 2001
-Message-Id: <d7560cc9916b086bfe5d86459cc9f04033edd904.1676039329.git.nert.pinx@gmail.com>
-From: Bernd Schubert <bschubert@ddn.com>
-Date: Tue, 7 Feb 2023 23:06:42 +0100
-Subject: [PATCH] Split config.h into private and public config
-
-This addresses https://github.com/libfuse/libfuse/issues/729
-
-commit db35a37def14b72181f3630efeea0e0433103c41 introduced a public
-config.h (rename to fuse_config.h to avoid conflicts) that
-was installed with the package and included by libfuse users
-through fuse_common.h. Probablem is that this file does not have
-unique defines so that they are unique to libfuse - on including
-the file conflicts with libfuse users came up.
-
-In principle all defines could be prefixed, but then most of them
-are internal for libfuse compilation only. So this splits out
-publically required defines to a new file 'libfuse_config.h'
-and changes back to include of "fuse_config.h" only when
-HAVE_LIBFUSE_PRIVATE_CONFIG_H is defined.
-
-This also renames HAVE_LIBC_VERSIONED_SYMBOLS to
-LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS, as it actually
-better explains for libfuse users what that variable
-is for.
-
-Signed-off-by: Martin Kletzander <nert.pinx@gmail.com>
----
- include/fuse.h          | 10 ++++-----
- include/fuse_common.h   |  5 +++++
- include/fuse_lowlevel.h |  4 ++--
- lib/compat.c            |  2 +-
- lib/fuse_misc.h         |  2 +-
- lib/meson.build         |  2 +-
- meson.build             | 45 ++++++++++++++++++++++++++++-------------
- 7 files changed, 46 insertions(+), 24 deletions(-)
-
-diff --git a/include/fuse.h b/include/fuse.h
-index 2888d2b497c1..6f162dd07821 100644
---- a/include/fuse.h
-+++ b/include/fuse.h
-@@ -948,15 +948,15 @@ struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *o
- 			 size_t op_size, void *private_data);
- #define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
- #else
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op,
- 		      size_t op_size, void *private_data);
--#else /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#else /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- struct fuse *fuse_new_31(struct fuse_args *args,
- 		      const struct fuse_operations *op,
- 		      size_t op_size, void *user_data);
- #define fuse_new(args, op, size, data) fuse_new_31(args, op, size, data)
--#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- #endif
- 
- /**
-@@ -1053,11 +1053,11 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config);
-  *
-  * See also: fuse_loop()
-  */
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- int fuse_loop_mt(struct fuse *f, struct fuse_loop_config *config);
- #else
- #define fuse_loop_mt(f, config) fuse_loop_mt_312(f, config)
--#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- #endif
- 
- 
-diff --git a/include/fuse_common.h b/include/fuse_common.h
-index 1d050bb3a00a..8ee1a34029ff 100644
---- a/include/fuse_common.h
-+++ b/include/fuse_common.h
-@@ -14,7 +14,12 @@
- #ifndef FUSE_COMMON_H_
- #define FUSE_COMMON_H_
- 
-+#ifdef HAVE_LIBFUSE_PRIVATE_CONFIG_H
- #include "fuse_config.h"
-+#endif
-+
-+#include "libfuse_config.h"
-+
- #include "fuse_opt.h"
- #include "fuse_log.h"
- #include <stdint.h>
-diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
-index 96088d7ae8f2..9099e45357f3 100644
---- a/include/fuse_lowlevel.h
-+++ b/include/fuse_lowlevel.h
-@@ -1958,7 +1958,7 @@ struct fuse_cmdline_opts {
-  * @param opts output argument for parsed options
-  * @return 0 on success, -1 on failure
-  */
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- int fuse_parse_cmdline(struct fuse_args *args,
- 		       struct fuse_cmdline_opts *opts);
- #else
-@@ -2076,7 +2076,7 @@ int fuse_session_loop(struct fuse_session *se);
- 	int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *config);
- 	#define fuse_session_loop_mt(se, config) fuse_session_loop_mt_32(se, config)
- #else
--	#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+	#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- 		/**
- 		 * Enter a multi-threaded event loop.
- 		 *
-diff --git a/lib/compat.c b/lib/compat.c
-index cab6cbfe9641..0bac39e597f4 100644
---- a/lib/compat.c
-+++ b/lib/compat.c
-@@ -34,7 +34,7 @@
- /**
-  * Compatibility ABI symbol for systems that do not support version symboling
-  */
--#if (!defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (!defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- /* With current libfuse fuse_parse_cmdline is a macro pointing to the
-  * versioned function. Here in this file we need to provide the ABI symbol
-  * and the redirecting macro is conflicting.
-diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
-index 37e3635bbc1d..855edc326d0f 100644
---- a/lib/fuse_misc.h
-+++ b/lib/fuse_misc.h
-@@ -15,7 +15,7 @@
-   Note: "@@" denotes the default symbol, "@" is binary a compat version.
- 
- */
--#ifdef HAVE_LIBC_VERSIONED_SYMBOLS
-+#ifdef LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS
- # if HAVE_SYMVER_ATTRIBUTE
- #  define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2)))
- # else
-diff --git a/lib/meson.build b/lib/meson.build
-index 54d07597c519..904463095d98 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -11,7 +11,7 @@ else
- endif
- 
- deps = [ thread_dep ]
--if cfg.get('HAVE_ICONV')
-+if private_cfg.get('HAVE_ICONV')
-    libfuse_sources += [ 'modules/iconv.c' ]
-    libiconv = cc.find_library('iconv', required: false)
-    if libiconv.found()
-diff --git a/meson.build b/meson.build
-index eb7b47727b4f..fb6451a0daac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -16,11 +16,22 @@ elif platform == 'cygwin' or platform == 'windows'
-         'Take a look at http://www.secfs.net/winfsp/ instead')       
- endif
- 
-+cc = meson.get_compiler('c')
-+
- #
--# Feature detection
-+# Feature detection, only available at libfuse compilation time,
-+# but not for application linking to libfuse.
- #
--cfg = configuration_data()
--cc = meson.get_compiler('c')
-+private_cfg = configuration_data()
-+
-+#
-+# Feature detection, the resulting config file is installed
-+# with the package.
-+# Note: Symbols need to be care fully named, to avoid conflicts
-+#       with applications linking to libfuse and including
-+#       this config.
-+#
-+public_cfg = configuration_data()
- 
- # Default includes when checking for presence of functions and
- # struct members
-@@ -35,27 +46,27 @@ include_default = '''
- '''
- args_default = [ '-D_GNU_SOURCE' ]
- 
--cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
-+private_cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- # Test for presence of some functions
- test_funcs = [ 'fork', 'fstatat', 'openat', 'readlinkat', 'pipe2',
-                'splice', 'vmsplice', 'posix_fallocate', 'fdatasync',
-                'utimensat', 'copy_file_range', 'fallocate' ]
- foreach func : test_funcs
--    cfg.set('HAVE_' + func.to_upper(),
-+    private_cfg.set('HAVE_' + func.to_upper(),
-         cc.has_function(func, prefix: include_default, args: args_default))
- endforeach
--cfg.set('HAVE_SETXATTR', 
-+private_cfg.set('HAVE_SETXATTR', 
-         cc.has_function('setxattr', prefix: '#include <sys/xattr.h>'))
--cfg.set('HAVE_ICONV', 
-+private_cfg.set('HAVE_ICONV', 
-         cc.has_function('iconv', prefix: '#include <iconv.h>'))
- 
- # Test if structs have specific member
--cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
-+private_cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
-          cc.has_member('struct stat', 'st_atim',
-                        prefix: include_default,
-                        args: args_default))
--cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
-+private_cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
-          cc.has_member('struct stat', 'st_atimespec',
-                        prefix: include_default,
-                        args: args_default))
-@@ -63,7 +74,7 @@ cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
- #
- # Compiler configuration
- #
--add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-Wno-sign-compare',
-+add_project_arguments('-D_REENTRANT', '-DHAVE_LIBFUSE_PRIVATE_CONFIG_H', '-Wno-sign-compare',
-                       '-Wstrict-prototypes', '-Wmissing-declarations', '-Wwrite-strings',
-                       '-fno-strict-aliasing', language: 'c')
- add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-D_GNU_SOURCE',
-@@ -111,7 +122,7 @@ endif
- 
- if versioned_symbols == 1
-      message('Enabling versioned libc symbols')
--     cfg.set('HAVE_LIBC_VERSIONED_SYMBOLS', 1)
-+     public_cfg.set('LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS', 1)
- 
-      # gcc-10 and newer support the symver attribute which we need to use if we
-      # want to support LTO
-@@ -140,9 +151,15 @@ else
-      message('Disabling versioned libc symbols')
- endif
- 
--# Write the test results into config.h (stored in build directory)
--configure_file(output: 'fuse_config.h',
--               configuration : cfg, install: true, install_dir: 'include/fuse3')
-+# Write private test results into fuse_config.h (stored in build directory)
-+configure_file(output: 'fuse_config.h', configuration : private_cfg)
-+
-+# Write the test results, installed with the package,
-+# symbols need to be properly prefixed to avoid
-+# symbol (define) conflicts
-+configure_file(output: 'libfuse_config.h',
-+               configuration : public_cfg,
-+               install: true, install_dir: 'include/fuse3')
- 
- # '.' will refer to current build directory, which contains config.h
- include_dirs = include_directories('include', 'lib', '.')
--- 
-2.39.1
-
diff --git a/sys-fs/fuse/fuse-3.12.0.ebuild b/sys-fs/fuse/fuse-3.12.0.ebuild
deleted file mode 100644
index dc5ea9f7073f..000000000000
--- a/sys-fs/fuse/fuse-3.12.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use test examples)
-		$(meson_use test tests)
-		-Duseroot=false
-		-Dinitscriptdir=
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	epytest
-}
-
-multilib_src_install_all() {
-	# Installed via fuse-common
-	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.13.1-r1.ebuild b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
deleted file mode 100644
index 7f4f571e0b4e..000000000000
--- a/sys-fs/fuse/fuse-3.13.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-PATCHES=(
-	"${FILESDIR}"/fuse-3.13.1-r1-fix-config.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# bug #853058
-	filter-lto
-
-	local emesonargs=(
-		$(meson_use test examples)
-		$(meson_use test tests)
-		-Duseroot=false
-		-Dinitscriptdir=
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	epytest
-}
-
-multilib_src_install_all() {
-	# Installed via fuse-common
-	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.14.0.ebuild b/sys-fs/fuse/fuse-3.14.0.ebuild
deleted file mode 100644
index f1216a8b72b8..000000000000
--- a/sys-fs/fuse/fuse-3.14.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# bug #853058
-	filter-lto
-
-	local emesonargs=(
-		$(meson_use test examples)
-		$(meson_use test tests)
-		-Duseroot=false
-		-Dinitscriptdir=
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	epytest
-}
-
-multilib_src_install_all() {
-	# Installed via fuse-common
-	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.14.1.ebuild b/sys-fs/fuse/fuse-3.14.1.ebuild
deleted file mode 100644
index f1216a8b72b8..000000000000
--- a/sys-fs/fuse/fuse-3.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# bug #853058
-	filter-lto
-
-	local emesonargs=(
-		$(meson_use test examples)
-		$(meson_use test tests)
-		-Duseroot=false
-		-Dinitscriptdir=
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	epytest
-}
-
-multilib_src_install_all() {
-	# Installed via fuse-common
-	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}