Merge updates from master

3 files changed, 75 insertions, 23 deletions

diff --git a/sys-fs/fuse-common/fuse-common-3.3.0.ebuild b/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
index ecc727e5723d..5bfc1b515372 100644
--- a/sys-fs/fuse-common/fuse-common-3.3.0.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit meson udev flag-o-matic
+inherit udev
 
 DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -18,25 +18,7 @@ RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
 
 S=${WORKDIR}/fuse-${PV}
 
-# tests run in sys-fs/fuse
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-}
-
-src_configure() {
-	local emesonargs=( -Dudevrulesdir="$(get_udevdir)"/rules.d )
-	meson_src_configure
-}
-
 src_install() {
-	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
-	newman doc/mount.fuse3.8 mount.fuse.8
-
 	udev_newrules util/udev.rules 99-fuse.rules
 
 	if use kernel_linux ; then
diff --git a/sys-fs/fuse/fuse-2.9.8-r1.ebuild b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
new file mode 100644
index 000000000000..0e17eaa9a114
--- /dev/null
+++ b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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.3.0.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
index fe790fba9477..3b4821add777 100644
--- a/sys-fs/fuse/fuse-3.3.0.ebuild
+++ b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
@@ -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}
 }