gentoo resync : 25.04.2020

3 files changed, 17 insertions, 9 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index be2416ea4a00..0ca8dfab162a 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -5,8 +5,8 @@ DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f1
 DIST fuse-3.9.0.tar.xz 1523028 BLAKE2B 2fff93431e59e370189fb1527de7bff3863d20e1a62628bb56a6671077a1c919b394ddac66537a1ef7c2991556b1817b2c7f6a92c161ebfffbc804466e19e5e7 SHA512 0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 EBUILD fuse-2.9.8.ebuild 1940 BLAKE2B fdd2f9a9b72a689dc877986c39e937b7e228d7a64f42c69507cda307ad053738042909daae6d521652f1c10547d9a0a10e57a929171c75bf67bd7c337aeffcbe SHA512 87df2bcb4e80a135a0247f609e0f20bbf0bee1c66f7b77b2b0670e12e3f894c6f16950b1be5d302d2e65e5975419fb911fb281f94bc9ab28070964d86da26963
-EBUILD fuse-2.9.9-r1.ebuild 2078 BLAKE2B 00dd332da7ca23c732f5e568dd1685a582f030f22113a5557234517d71e2b11fc97dc437da34d497c38153e653517620477ef23706c23e72eb81b30129a28cee SHA512 f022812c0d0fd8ed1ef95cb9b6d194f624b3a998ac41de5760d65ce791409ffef2db8abfd1c222a20cb7200d4e70d4d702dee6c86b765fcfdd6f38327e2ea1a0
+EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
 EBUILD fuse-3.8.0.ebuild 1822 BLAKE2B dea4a95ee049918dabf0c5e67eb8672f7737273cb7a1d6b50470e678b960209cec7e5f376c28e0665f35c1fdff12a6ad7df2d45cb0da4e9307dcafa38f5b67e1 SHA512 675a12c934f6477a6e724f82f9b70d8bb9eea843a99ec6bfd685d8f0aeec1acc2dff6f2d7b182705d7414a0e789b62a733c92e5fd11fe96a9b0abeb01ffc60f1
 EBUILD fuse-3.9.0.ebuild 1822 BLAKE2B dea4a95ee049918dabf0c5e67eb8672f7737273cb7a1d6b50470e678b960209cec7e5f376c28e0665f35c1fdff12a6ad7df2d45cb0da4e9307dcafa38f5b67e1 SHA512 675a12c934f6477a6e724f82f9b70d8bb9eea843a99ec6bfd685d8f0aeec1acc2dff6f2d7b182705d7414a0e789b62a733c92e5fd11fe96a9b0abeb01ffc60f1
-EBUILD fuse-3.9.1.ebuild 1822 BLAKE2B dea4a95ee049918dabf0c5e67eb8672f7737273cb7a1d6b50470e678b960209cec7e5f376c28e0665f35c1fdff12a6ad7df2d45cb0da4e9307dcafa38f5b67e1 SHA512 675a12c934f6477a6e724f82f9b70d8bb9eea843a99ec6bfd685d8f0aeec1acc2dff6f2d7b182705d7414a0e789b62a733c92e5fd11fe96a9b0abeb01ffc60f1
+EBUILD fuse-3.9.1.ebuild 1951 BLAKE2B d77d30f658b18676242b9f12240da45cd10a6e320592dc8c742febcfd9ce046fe2a92fd89c1d7e4c01da5ed89cbcaa24550a7eb1a7475e9a1c6515b877886722 SHA512 a4e79858f9f94df3e7494eb79270246c6fd64c87e68974e960d661a6056b4acdd0990cd8faa0cf0f2e9703e87a7732acb27bf1f604949d23a1b44654fca53e15
 MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index 4a145b23892d..91a95b0677f0 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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.9.1.ebuild b/sys-fs/fuse/fuse-3.9.1.ebuild
index bcea225f2d8c..a94fefb04bc6 100644
--- a/sys-fs/fuse/fuse-3.9.1.ebuild
+++ b/sys-fs/fuse/fuse-3.9.1.ebuild
@@ -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 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
@@ -26,11 +26,11 @@ 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}]"
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	use test && python_setup
 }
 
 src_prepare() {
@@ -38,13 +38,11 @@ src_prepare() {
 
 	# 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() {
 	local emesonargs=(
+		-Dexamples=$(usex test true false)
 		-Duseroot=false
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
@@ -55,6 +53,16 @@ multilib_src_compile() {
 	eninja
 }
 
+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
 }