gentoo resync : 24.12.2018

6 files changed, 23 insertions, 103 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index fa4ae17ec6d6..d6a69cd280c3 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,15 +3,13 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 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-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
-DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
-DIST fuse-3.2.3.tar.xz 1238628 BLAKE2B 07b073d0af9d8db3b8799d872225f0637351b99bafb5db11b45dab1173101669731de66215a31e2141cfe5aa6d467e87d469f432194ddf7b8d5eb8e10825d679 SHA512 f91ee4b24df64e62d0c50db0bc3807229cfde06da118c87826bc3ee01b41689ec93a96b026226e948e6d7904bb506dc1d8ffa83d29aa12ea7f17009f6060263e
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-EBUILD fuse-2.9.7-r1.ebuild 1955 BLAKE2B a5c2d8696efd1c19223710c9a92bdb1c8a94e0e6fd6c7c928a458c6cfebb8e82b06ecd7a5ced2167f733f1f7b2f0aef0389873120278823ab39ce206eafdb073 SHA512 550ea0d9c917e2ffb770eabf93e0df0284728b7f6719d54ab8cd0082ff8586d604253591eee6460759c480cbd80e9b85ff3f26d8851a3b4e03b5d7fc3c86c0d2
+DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
+DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
-EBUILD fuse-2.9.8.ebuild 1955 BLAKE2B a5c2d8696efd1c19223710c9a92bdb1c8a94e0e6fd6c7c928a458c6cfebb8e82b06ecd7a5ced2167f733f1f7b2f0aef0389873120278823ab39ce206eafdb073 SHA512 550ea0d9c917e2ffb770eabf93e0df0284728b7f6719d54ab8cd0082ff8586d604253591eee6460759c480cbd80e9b85ff3f26d8851a3b4e03b5d7fc3c86c0d2
-EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
-EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
-EBUILD fuse-3.2.3.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-2.9.8-r1.ebuild 1886 BLAKE2B 09439bdee18c81239dd9f4a5c5d78f23e96d1f76780b5c9cb94a08e00f93287a8a689f936823cce2d53b7a18c7335f26763a73944c37c8c748f4d05a93ab99e6 SHA512 6a34428fa159d41398aea868695c5900c92a765db9df74a99757d167a6052af04124881a8f43a999cf31bf87ea59cda412d52c753229eada10945b01ef45b1d2
+EBUILD fuse-2.9.8.ebuild 1944 BLAKE2B 829ce122f4fff4be530130dc06bc33cbd67fc9e800b9691e4789b7942bc5dabf408e341e4041507946fafb79a441dbe76886753e8442452ccd40987f9305c26f SHA512 7c9f2c90a21662ed4d8e16d11468107a80a8b8a71a9d4a890bbf9d440cd76f881c7a7c77676dedd7d0dddf05eb3251d6e9448393a7d2412a5cbf6850b918fac1
 EBUILD fuse-3.2.6.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-3.3.0-r1.ebuild 1662 BLAKE2B d304faa93635f4c2edb4a787b994daede961bd77615290ab0d8648adb8d0548fdae6aa9a1eca177c6ef5b62a6a71329f9798b0992bfb15b2cb887963f685dc43 SHA512 104936339eb8b45aeb738d2e06f6811ea049dfca1fcc804e57ac267ac48162bdfba44419122fb221bebe38194cfb6f6b576f2884b016681be00d17d2f827b252
+EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.7-r1.ebuild b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
index 179face680f2..0e17eaa9a114 100644
--- a/sys-fs/fuse/fuse-2.9.7-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune libtool linux-info udev toolchain-funcs
+inherit libtool linux-info udev toolchain-funcs
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -15,7 +15,7 @@ IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 DEPEND="virtual/pkgconfig"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 pkg_setup() {
 	if use kernel_linux ; then
@@ -23,7 +23,7 @@ pkg_setup() {
 			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"
+		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
 		linux-info_pkg_setup
 	fi
 }
@@ -61,12 +61,10 @@ src_install() {
 		doins include/fuse_kernel.h
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	# 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
 
 	# handled by the device manager
 	rm -r "${D%/}"/dev || die
diff --git a/sys-fs/fuse/fuse-2.9.8.ebuild b/sys-fs/fuse/fuse-2.9.8.ebuild
index 179face680f2..6730afe7ac5e 100644
--- a/sys-fs/fuse/fuse-2.9.8.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+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 )"
diff --git a/sys-fs/fuse/fuse-3.2.3.ebuild b/sys-fs/fuse/fuse-3.2.3.ebuild
deleted file mode 100644
index 4012fc673b62..000000000000
--- a/sys-fs/fuse/fuse-3.2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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
-}
diff --git a/sys-fs/fuse/fuse-3.2.1.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
index 4012fc673b62..3b4821add777 100644
--- a/sys-fs/fuse/fuse-3.2.1.ebuild
+++ b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -20,7 +20,7 @@ DEPEND="virtual/pkgconfig
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
 
@@ -63,12 +63,11 @@ multilib_src_install_all() {
 
 	# 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
+	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
+	doman doc/{fusermount3.1,mount.fuse3.8}
 }
diff --git a/sys-fs/fuse/fuse-3.2.2.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
index 4012fc673b62..9910cea42b18 100644
--- a/sys-fs/fuse/fuse-3.2.2.ebuild
+++ b/sys-fs/fuse/fuse-3.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -20,7 +20,7 @@ DEPEND="virtual/pkgconfig
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
 
@@ -63,12 +63,11 @@ multilib_src_install_all() {
 
 	# 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
+	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
+	doman doc/{fusermount3.1,mount.fuse3.8}
 }