gentoo resync : 16.06.2019

4 files changed, 2 insertions, 162 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 0044050200eb..56b3a518bc0c 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,16 +1,12 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 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-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.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
-DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c544485265d9d91ff58ee22549aeabcfb53f8c30ee3fd984030ee2042099ab9bc6269875cc08c5048acb28740e SHA512 7519955d31566ac69454f5d44e95ccbe98d7719422ea8112cce6cc2138aef71a57f9fa1bc2a37212a0837938ec44e630f3adce0a4da153a030a5a46a06446de2
 DIST fuse-3.5.0.tar.xz 1021676 BLAKE2B 9e2ec6b5df75c3427ad99ca30f5c88cb1e2291ac05d005280f6a9b121abf978990e7ee84df83b8d866cc996b8fda7e99fdc626d1a24347472aacbfa2531182fe SHA512 953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27
-EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
+DIST fuse-3.6.1.tar.xz 1168980 BLAKE2B 9b02b03760047a545887f215122726a40aa28cbe0ef34cec50a393dc11ac23e2c231f803e53dc969c57cc9b2000905a85bcdcd3567edfc1cda9b9139882e334a SHA512 2234d532bf17f01ee7067e853185b5e9acefaef6d2f8e1ee0177be81f84ade3094ddfaa41e4b586f5a6c53fac53ee0773d5cc08afac8a4851d75a73c07847910
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9.ebuild 1882 BLAKE2B 4f789ad332f80dbd3c012aeb7286e2d0615717f2afc8dd7078c0148f607cdf4fbac5fd1c515d7c49c189f2eb7e1ec9a79a1e2a25b9ded1a4e79e5e705772912e SHA512 834caa3c39f615fa440688c8bad60b725358ba9c3ac88fbabceeaa86f0027b2a6cea3bc563435cd430adda5f16e76efa86fff46b8ecfbe025ebbd33940a098eb
-EBUILD fuse-3.4.1.ebuild 1656 BLAKE2B 6e556878bce6e6851104a52b29ed2f63306daa675af9bf6eab4d27140f0b9f81ac51c8a3ceeeea45d572b98a2354fe8ce3568a0116c52f7e9f8bab3614d0b267 SHA512 6b093f0fba44af3e4dbfaf0d3ca6f9ca106b669706b91c94c563cbe613fe625bed7ae471ac68cfe8742e0d9e64567a7affd7a9762fc6032981011bce7c38754b
-EBUILD fuse-3.4.2.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
 EBUILD fuse-3.5.0.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
+EBUILD fuse-3.6.1.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.7.ebuild b/sys-fs/fuse/fuse-2.9.7.ebuild
deleted file mode 100644
index 9710703f803e..000000000000
--- a/sys-fs/fuse/fuse-2.9.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-
-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"
-		FUSE_FS_WARNING="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_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif 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
-
-		# Allow non-root users to specify the 'allow_other' or 'allow_root'
-		# mount options.
-		#
-		#user_allow_other
-	EOF
-}
diff --git a/sys-fs/fuse/fuse-3.4.1.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
deleted file mode 100644
index f4468b461435..000000000000
--- a/sys-fs/fuse/fuse-3.4.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-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-3.3.0-r1"
-
-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
-
-	# handled by the device manager
-	rm -r "${D%/}"/dev || die
-
-	# 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.4.2.ebuild b/sys-fs/fuse/fuse-3.6.1.ebuild
index 36c655c869a1..36c655c869a1 100644
--- a/sys-fs/fuse/fuse-3.4.2.ebuild
+++ b/sys-fs/fuse/fuse-3.6.1.ebuild