gentoo resync : 23.03.2018

5 files changed, 91 insertions, 125 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index b181bdc880db..76b8c1e592d7 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -2,11 +2,8 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f
 AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2
-DIST fuse-3.0.0rc3.tar.gz 744606 BLAKE2B a9e52f7644652ef84da3a825df5327ada3265c5eff1a9e6fa070aa1beaad15e6b77d63b3e355fdff978bcd2285b0f1295acb9324dcc16c33f554b8a1d89a2898 SHA512 a50d12d70ee44c217f198a231bf37b323d36741aacb5d6b2fbf6f8cfc645d9106d7f05f7cc7be29bd64098b48797f8c53a239194bf49e714b9a0dc12bf885e35
-DIST fuse-3.1.0.tar.gz 809470 BLAKE2B 8a2cd4da789a5b533d0e0ad4b87b155aa880b7d87bb7b9c996ed6de79ef14de0126da379d2879ea8de7edda2329514be8c737ecae221db390507652edc0ad25b SHA512 e6278aef67162439b736af28528edb0f39a4513f584e5949a269cc3bc07a14436e6f0b69dbe8002db6f60de9139c452568b5a091baa49119a7f61422b7aec84c
-DIST fuse-3.1.1.tar.gz 819205 BLAKE2B 040bf3473c4a403e3b085106d987765b5aa80c91d1d1648762fa4eee8ba611b04c3ea9d584b79b71e9105f4cfe305f602521c997916f0aaab25b0a1a67cff399 SHA512 38c61380f08cc9cde576d4d8fdc3b9a7c703c753ae9c477ec5210fddfe235055dc925e024ba74f3200576974f901d05b5d138cecf1baffe7b17f17ed23fdc391
+DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
+EBUILD fuse-2.9.7-r1.ebuild 1967 BLAKE2B c520b94126a010188fbe36391efff49287b41216996bc51179fc33bcbcd1830fad0178d1e62cc568460963512cbd5bb0817648bca39d4934748114fd013a9612 SHA512 16beaf9cbef8060d07f26017adab1364731a75870993d87ab807bb3f6f8023e7d62a3e2ed0c8d540d2350353c0555de8590f9ac2eb1bce3078d161a558b2a1d6
 EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c
-EBUILD fuse-3.0.0_rc3.ebuild 2175 BLAKE2B 944085ab9a2c8a191ad81de9e7daeb03b611e48fdf6e29bd37174c133fcd95337349de3161dbe9903e5b4d4e262a395ea015a1193ba7c614d13e4ae82e998bff SHA512 683cb8c47f8d592305e83c01a926a305ebf89b7d1f35394d93c3dc6afdf99c1f778468147191fb2689947491cbbbb23a97ec028f4c68e3eac7460b8318e96e3f
-EBUILD fuse-3.1.0.ebuild 982 BLAKE2B 24b4b7bdbc57fb3f15c6f45ea0b9183d5645a8617493ccd027e006b8e85528e253510e046f5dd85ca9106f689d856983dca5ef480890b9ff46613c691a5c31e9 SHA512 8730ae6ce93a3a09574531acfa1029d649c26353aa45da6d25426db93cdcad94df87f0f18ae0fdecc304d6619d2b385d6d3423240356fde7cfd7bac120fc3e36
-EBUILD fuse-3.1.1.ebuild 1032 BLAKE2B 5c92d5b322cdab834ae638e0b2b01fa5c5207eda44b0c24288f4b916422441610827eb3a8f02afab1ac097622b8cb6e4d8a8bc618f7075ab7d5575daeffc6a19 SHA512 4fc85ec2409032548ecc680c851604bdafd9e07a42419800004f04dbd64a7d6604325af8e35716e389194e1d6a97b350ae4b82efb6597232244471570f18790f
+EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-3.0.0_rc3.ebuild b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
index 43bf6fd1bdd8..b27dc23c1413 100644
--- a/sys-fs/fuse/fuse-3.0.0_rc3.ebuild
+++ b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils libtool linux-info udev toolchain-funcs
-
-MY_P=${P/_/}
+inherit ltprune 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/${MY_P}/${MY_P}.tar.gz"
+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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 DEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
+RDEPEND="sys-fs/fuse-common"
 
 pkg_setup() {
 	if use kernel_linux ; then
@@ -32,6 +29,7 @@ pkg_setup() {
 }
 
 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
@@ -50,7 +48,7 @@ src_configure() {
 }
 
 src_install() {
-	local DOCS=( AUTHORS README.md doc/README.NFS doc/kernel.txt )
+	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
 	default
 
 	if use examples ; then
@@ -58,29 +56,18 @@ src_install() {
 		dodoc example/*
 	fi
 
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
+	if use kernel_FreeBSD ; then
 		insinto /usr/include/fuse
 		doins include/fuse_kernel.h
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
 	fi
 
 	prune_libtool_files
-	rm -rf "${D}"/dev
 
-	dodir /etc
-	cat > "${ED}"/etc/fuse.conf <<-EOF
-		# Set the maximum number of FUSE mounts allowed to non-root users.
-		# The default is 1000.
-		#
-		#mount_max = 1000
+	# installed via fuse-common
+	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
+	rm "${ED%/}"/usr/share/man/man8/mount.fuse.* || die
+	rm "${ED%/}"/sbin/mount.fuse || die
 
-		# Allow non-root users to specify the 'allow_other' or 'allow_root'
-		# mount options.
-		#
-		#user_allow_other
-	EOF
+	# handled by the device manager
+	rm -r "${ED%/}"/dev || die
 }
diff --git a/sys-fs/fuse/fuse-3.1.0.ebuild b/sys-fs/fuse/fuse-3.1.0.ebuild
deleted file mode 100644
index ac994543f9a4..000000000000
--- a/sys-fs/fuse/fuse-3.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson multilib-minimal
-
-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 LGPL-2.1"
-SLOT="3"
-#KEYWORDS="~amd64"
-RESTRICT="test"
-
-DOCS=( AUTHORS README.md doc/README.NFS doc/kernel.txt )
-
-src_prepare() {
-	default
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	default
-	rm "${ED%/}"/dev/fuse || die
-	rmdir "${ED%/}"/dev || die
-	rm "${ED%/}"/etc/init.d/fuse3 || die
-	rmdir "${ED%/}"/etc{/init.d,} || die
-	mv "${ED%/}"/usr/share/man/man8/mount.fuse{,3}.8.gz || die
-}
diff --git a/sys-fs/fuse/fuse-3.1.1.ebuild b/sys-fs/fuse/fuse-3.1.1.ebuild
deleted file mode 100644
index f2e588be8b69..000000000000
--- a/sys-fs/fuse/fuse-3.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson multilib-minimal
-
-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 LGPL-2.1"
-SLOT="3"
-#KEYWORDS="~amd64"
-RESTRICT="test"
-
-DEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-src_prepare() {
-	default
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm "${ED%/}"/dev/fuse || die
-	rmdir "${ED%/}"/dev || die
-	rm "${ED%/}"/etc/init.d/fuse3 || die
-	rmdir "${ED%/}"/etc{/init.d,} || die
-	mv "${ED%/}"/usr/share/man/man8/mount.fuse{,3}.8.gz || die
-}
diff --git a/sys-fs/fuse/fuse-3.2.1.ebuild b/sys-fs/fuse/fuse-3.2.1.ebuild
new file mode 100644
index 000000000000..4012fc673b62
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.2.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson multilib-minimal flag-o-matic 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 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND="sys-fs/fuse-common"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags -flto*
+
+	# passthough_ll is broken on systems with 32-bit pointers
+	cat /dev/null > example/meson.build || die
+}
+
+multilib_src_configure() {
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+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
+	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
+
+	# handled by the device manager
+	rm -r "${ED%/}"/dev || die
+
+	# manually install man pages
+	rm -r "${ED%/}"/usr/share/man || die
+	doman doc/fusermount3.1
+}