gentoo resync : 15.06.2021

4 files changed, 78 insertions, 27 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index aed5019adf82..b953fbe83cc5 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,8 +1,10 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
+DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.3.ebuild 1827 BLAKE2B 8e1e37c8d9b7f80ebb2e4347e79957aab2da8593df1077d6c8e870115fb58704293fd585d255f9ce7887a3975c029f13a85dc9080ae60ed5068eb098a7a02aae SHA512 0e99a19d507815000bd3156f3cd5e679b4f1951becf64963ad970d527f513c639c7cc8f1d5d716a5c7825e1cfbcd3379494d3c996a597ed5f3df226b64f3a8c7
-EBUILD fuse-3.9.3.ebuild 1949 BLAKE2B a2fc08eaed1f03dc4c838b735e493b0389ae8c9f0b6246f4ffd5fe3e4bae4f718fda10e1b9112c41558d441d3b19dc5b978a73a9f34df824976c961683c27b83 SHA512 4e72cec5c86803545305f82cf3541d94673fc7666b3bebbb48eab9dc3c45d4e4047ef7ffd6451a53b706ad2d6fff9c0461c02d110129dbb34fb7add9df6eae96
+EBUILD fuse-3.10.3.ebuild 1695 BLAKE2B ddaf9bde9834b4ff02d8155a2ba77e055fb959430f1bf763de42517062d1642ca44a0288448e676b8f8eb289e972430d95dc37d9fc3ba17f0f917eace3de3ef7 SHA512 9485425a10811c4a2a41bfa448b71e1f4333eb85d34e551b85c8c19d1187c675907498e625b5ce9f8c7a5d553653f0e29af51fca6cd271075508268a196bf456
+EBUILD fuse-3.10.4.ebuild 1701 BLAKE2B e1cbb0c3638b0728802ce85204a3ef59584e31ea3d582f62ebee24b21c43d6e6ddf4278bbb1e0f7f2e5aed427419105db9a0e8f5b7c2f40f1cfb090e08a9096c SHA512 aec0d76ee17b84495df8de1a9e92ad2554f9b6d33500ba0c15b0ffc53e9bbe2cac4295e39f439f5df8fb43b4cb198961cd7a1f7c9c9280b2af41fc98b172a2e1
+EBUILD fuse-3.9.3.ebuild 1823 BLAKE2B d4d0cc3939d07ecfa08c4c10fd21c8969e73d588043af680961765e09482d4cb6d5b6453a6fba8af1ddfe08f88932247015bb8317e4fcfdff298e61271efb79b SHA512 68f13b2185461fef0f8a1f804df628c7c668c9e78cf3f06ba5d92eaf85f8ada69d15fbe07bb5d8dd802716d313fbaa02a889b9cefd8d3abcad2b03c9d2079ec6
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 5af77ebc394a..dd6b9a769ba5 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson multilib-minimal udev python-any-r1
+inherit meson-multilib udev python-any-r1
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -12,7 +12,7 @@ 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
@@ -35,17 +35,13 @@ pkg_setup() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dexamples=$(usex test true false)
+		$(meson_use test examples)
 		-Duseroot=false
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	eninja
-}
-
 src_test() {
 	if [[ ${EUID} != 0 ]]; then
 		ewarn "Running as non-root user, skipping tests"
@@ -60,13 +56,7 @@ multilib_src_test() {
 	${EPYTHON} -m pytest test || die
 }
 
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
 multilib_src_install_all() {
-	einstalldocs
-
 	# installed via fuse-common
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild
new file mode 100644
index 000000000000..e3f0349a01b3
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.10.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+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() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use test examples)
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+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.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild
index 5e10d166e389..e5d07d2d9696 100644
--- a/sys-fs/fuse/fuse-3.9.3.ebuild
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
+inherit meson-multilib flag-o-matic udev python-any-r1
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -42,17 +42,13 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dexamples=$(usex test true false)
+		$(meson_use test examples)
 		-Duseroot=false
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	eninja
-}
-
 src_test() {
 	if [[ ${EUID} != 0 ]]; then
 		ewarn "Running as non-root user, skipping tests"
@@ -67,13 +63,7 @@ multilib_src_test() {
 	${EPYTHON} -m pytest test || die
 }
 
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
 multilib_src_install_all() {
-	einstalldocs
-
 	# installed via fuse-common
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die