gentoo resync : 15.12.2019

4 files changed, 23 insertions, 89 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index b4b35af3199e..7fa30c5fa267 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,9 +1,8 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.6.2.tar.xz 1255556 BLAKE2B a48caee0e2b8b7948caff3a8c226fb87a56aa37fb2d4da08cae2f64da274df5636bf15cf8f2a15a87c3138f9a11d34fa287b371d53ddaed5b0f18e9defb4c8e9 SHA512 e5eb10c66e8585d47430e289d059a3a58ebf3823304fa35e9be413c8d194401ff5093fac82c7c6911b3c5afde6c1c156aa671d333b193d2d739a7ed1632c4bd8
+DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9-r1.ebuild 2082 BLAKE2B cd76adedf8a5674cf7b6071d150b0d6ac15a3895998d50aa78f8392a6dbbcf00bab6dae4e53905c879506c01e1a06bcfffc1ba584369af26ba669a8e488da101 SHA512 bc85964d55375dfe4d44ee29879281d06c94641763e9e2f855f74693f5a81bd051f129f8fdb8aa439bc0b456989d763ee597235b4f83d6aadd25fd26b5f29c04
-EBUILD fuse-2.9.9.ebuild 1882 BLAKE2B 4f789ad332f80dbd3c012aeb7286e2d0615717f2afc8dd7078c0148f607cdf4fbac5fd1c515d7c49c189f2eb7e1ec9a79a1e2a25b9ded1a4e79e5e705772912e SHA512 834caa3c39f615fa440688c8bad60b725358ba9c3ac88fbabceeaa86f0027b2a6cea3bc563435cd430adda5f16e76efa86fff46b8ecfbe025ebbd33940a098eb
-EBUILD fuse-3.6.2.ebuild 1677 BLAKE2B 290c6d918897e2a5ce9d7307e3dc35c094400f88908ea994de2c057dc63204d29c3dbbaaf602f64d6cba5f73eafebc5466cd3211b47e6a8f5a5a005dae21c061 SHA512 30569fefccdf6234b2f10d8573614800bc276072061e34b1b029fb738db93549fd7795e1aa008986ff569e97a9949e07dfe021b1d701f5380c35b3d8eec21974
-MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
+EBUILD fuse-3.8.0.ebuild 1776 BLAKE2B 1f51840daa80da2d456a9e74e197d4cf408af8ff76ccd1a1c5f895a7a1ef17479f8250c937da8c2c1c0ef42b6a2fa6a6ca168fe909f8b0d978ad657a2aeed1a2 SHA512 5a8db47b6b99685140129edaa0f57acb99f8cf1ca21deca186b00ee84415b63be7a32717b13dde4c2245ca5955f4e9118d8f9cb2a3619cb114f5320ba1086e21
+MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-2.9.9.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
deleted file mode 100644
index c2933b58a93e..000000000000
--- a/sys-fs/fuse/fuse-2.9.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool linux-info udev toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-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() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
-	# sandbox violation with mtab writability wrt #438250
-	# don't sed configure.in without eautoreconf because of maintainer mode
-	sed -i 's:umount --fake:true --fake:' configure || die
-	elibtoolize
-
-	default
-}
-
-src_configure() {
-	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
-
-	if use kernel_FreeBSD ; then
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-	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
-}
diff --git a/sys-fs/fuse/fuse-3.6.2.ebuild b/sys-fs/fuse/fuse-3.8.0.ebuild
index 89893637d630..4e75898ead75 100644
--- a/sys-fs/fuse/fuse-3.6.2.ebuild
+++ b/sys-fs/fuse/fuse-3.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -13,10 +13,10 @@ 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 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
+IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
-DEPEND="virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	test? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
@@ -37,13 +37,16 @@ src_prepare() {
 	default
 
 	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
+	filter-flags '-flto*'
 
 	# passthough_ll is broken on systems with 32-bit pointers
 	cat /dev/null > example/meson.build || die
 }
 
 multilib_src_configure() {
+	local emesonargs=(
+		-Duseroot=false
+	)
 	meson_src_configure
 }
 
@@ -65,8 +68,8 @@ multilib_src_install_all() {
 	# installed via fuse-common
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
-	# handled by the device manager
-	rm -r "${D}"/dev || 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
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index 42343713afc0..b64588b9eb7e 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
-    <remote-id type="github">libfuse/libfuse</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron BaumanM</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
+		<remote-id type="github">libfuse/libfuse</remote-id>
+	</upstream>
 </pkgmetadata>