gentoo auto-resync : 15:08:2022 - 08:27:50

4 files changed, 84 insertions, 3 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 209806295190..7bdb52f90b6a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 2667edbb3638..ae71f216d92b 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -5,7 +5,8 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88
 DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f654626ba9d397753a7fbbf21dde877e6c528a44950ae1c828583f36a49c39f44a587544e44f8e749bd4c604b33b4 SHA512 da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe
 DIST fuse-3.11.0.tar.xz 3515332 BLAKE2B 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 SHA512 033324de7ea4c7e91fb21c453211c01e53771ec5805c2126e13ef2d4334119a51f5c783b6249e888e28888c753aa04b48ed33cefb6d486d8d526546565f6ae50
 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55
-EBUILD fuse-2.9.9-r1.ebuild 2098 BLAKE2B ed8d6d52dd8179ff9b1c7f1d442448eb4895ca08e187b387e3eb4b5dbb7966576789baee056d64bb4eb32b21ef2acfccc7458e0f95b4078cca8a4acdaf299cb9 SHA512 3ae9cb35858446a23f6e451c93c783bf85ef15370025a33d210ed579d4815a212120b7cacd603bf3b7f9d224e2744cd12f4fe5563d822d8a77cc474c0dbfb021
+EBUILD fuse-2.9.9-r1.ebuild 2107 BLAKE2B 22f29ade4ee95b51f25e7c42fed47930637a573f59547380821c941d8378f2826b05cbbc1e1b0096323f541b267ba962d5ce95a3c846ef6abaf069d40893b568 SHA512 1f380175b9d661a75581b7a81c19da5f158b34e51974f204a38b96e59f53f3fac556a8863223dc73e9dfe488cd4bc41980aafe8e91c58e1d457aee100eeaa313
+EBUILD fuse-2.9.9-r2.ebuild 2191 BLAKE2B 0d643c4bed2af860235ba9a056ee805413c7f1cf840d53c2fc535c19cd1fd8edca09f37f30be8954c5e4eb78b838008a963fe863b0135217886070bd7b117fad SHA512 054de8ee6bd06a615e286373acc24159ae148ac9ddef2d1d12eb2be7d84225564b784b369714e9644e3f60db941b44764145c4baf96081b7462c2ad36ccf8e2d
 EBUILD fuse-3.10.5.ebuild 1806 BLAKE2B fc21f9e50c0f3c9de23ff2157c3c12d48e64a1e49ed955f1b28e30a14d855eb12fb16ada86f04f8256bbdbd34b8c7ea3c7ab511720d369cc48e86607b0115748 SHA512 54eec78493c8b365c9b7576cc7bf5f8947e52e359a24e8f044fd7785bf548b648d34437d4e6020509f05b529ba6cdb846576ec0e77f78294ccbbe4cd6588c6dc
 EBUILD fuse-3.11.0.ebuild 1813 BLAKE2B 84e2d067dc591109d03bb56ad6705a3f17d25cb3ced40993540fc548833bc1080e1f9034b77209ce0b4ec4c93587cdb336f9e11fb4ac6b05385033b6e5cd449b SHA512 e63430d4ebbb4f5953f6cc5a78f8784bc9b284272260ce10289cad1e703e2947c616a3f0a8709c7faa47dc200b2b59f05a3c307e6271c8338776a675a8bb0641
 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index 4d6a5352e737..a171192a0d6c 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 
 src_configure() {
 	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	# gcc-9 with -flto leads to link failures: #663518,
+	# gcc-9 with -flto leads to link failures: #663518 (see also #863899)
 	# https://gcc.gnu.org/PR91186
-	filter-flags -flto*
+	filter-lto
 
 	econf \
 		INIT_D_PATH="${EPREFIX}/etc/init.d" \
diff --git a/sys-fs/fuse/fuse-2.9.9-r2.ebuild b/sys-fs/fuse/fuse-2.9.9-r2.ebuild
new file mode 100644
index 000000000000..1412603dbd80
--- /dev/null
+++ b/sys-fs/fuse/fuse-2.9.9-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info udev
+
+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.gz"
+# For bug #809920 to avoid a gettext dependency
+# extracted from sys-devel/gettext-0.21-r1
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
+	"${FILESDIR}"/${PN}-2.9.9-avoid-calling-umount.patch
+	"${FILESDIR}"/${PN}-2.9.9-closefrom-glibc-2-34.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if kernel_is lt 2 6 9 ; then
+			die "Your kernel is too old."
+		fi
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Can be dropped along with additional SRC_URI if dropping eautoreconf
+	cp "${WORKDIR}"/iconv.m4 m4/ || die
+	eautoreconf
+}
+
+src_configure() {
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	# gcc-9 with -flto leads to link failures: #663518 (see also #863899)
+	# https://gcc.gnu.org/PR91186
+	filter-lto
+	# ... and strict aliasing warnings, bug #863899
+	append-flags -fno-strict-aliasing
+
+	econf \
+		INIT_D_PATH="${EPREFIX}/etc/init.d" \
+		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
+		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
+		$(use_enable static-libs static) \
+		--disable-example
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc example/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# handled by the device manager
+	rm -r "${D}"/dev || die
+}