[gentoo-musl] [PATCH 5/6] sys-fs/fuse: version 2.9.4 in tree works fine

[Felix Janda]

---
 sys-fs/fuse/Manifest                        |  6 --
 sys-fs/fuse/files/fuse-2.9.3-includes.patch | 66 ----------------------
 sys-fs/fuse/files/fuse-fbsd.init            | 23 --------
 sys-fs/fuse/files/fuse.init                 | 35 ------------
 sys-fs/fuse/fuse-2.9.3-r99.ebuild           | 88 -----------------------------
 sys-fs/fuse/metadata.xml                    |  8 ---
 6 files changed, 226 deletions(-)
 delete mode 100644 sys-fs/fuse/Manifest
 delete mode 100644 sys-fs/fuse/files/fuse-2.9.3-includes.patch
 delete mode 100644 sys-fs/fuse/files/fuse-fbsd.init
 delete mode 100644 sys-fs/fuse/files/fuse.init
 delete mode 100644 sys-fs/fuse/fuse-2.9.3-r99.ebuild
 delete mode 100644 sys-fs/fuse/metadata.xml

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
deleted file mode 100644
index e73491b..0000000
--- a/sys-fs/fuse/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fuse-2.9.3-includes.patch 1771 SHA256 7aa45538344fb6eadc8bfaeaf04e397efd18a653d0cd3fe1266d6741f18f7dea SHA512 c15cce6095278148f45f3117575a05248e8e7074473273def7d8556f12cb04038c661300ff1fc040b0fd95a65cf03b1e0e47fcde3b5763752039aa0ecb5be27a WHIRLPOOL 7216deebc38df2dd8929bed364ad72a33084780b879d05c275c7b56f86f6eefb19defcd2bf547494ebdf599958f36d0a42ccd41ea992476acc10f22315ac9407
-AUX fuse-fbsd.init 467 SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273 SHA512 4d8ce71d9a025a52e8f1d7074f83fdc368fbdd4bdf65bccfdbdce214580d4051c20bdde7f61725d14c585db1dbbe0781cee2a0c73a857f1340a5b57ee920649e WHIRLPOOL 3cb757a5de22b36c6e638c612a99cad43edeac86e37a9590a3635d550ee12f404ea54734c69a7f139c1c1089d2446b37a6387f1aa264651000d50942f4a97047
-AUX fuse.init 756 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda SHA512 3d2765114081c8f6720ed25d7b7da4f6da5fbbb5b35760bb0a760f0bf2482abacabec63c1488d4e8cbe4f78875574607e6e46508dfe22df0869f4d2e1e91e607 WHIRLPOOL 2932da7d97b7418b5ead6c71f9e583b6ec1b47c86e763577312fd55492482c0c31677a78534301c7b541d476ee16b0eb2da981eb6723c1fdc9af338ce10c243c
-DIST fuse-2.9.3.tar.gz 572044 SHA256 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c SHA512 03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c WHIRLPOOL 739562e48e85326049dac0ef06653e5e6574a01dd60649e23ddc0990ea6c1979e6ce952a1e84d0776b706fbcad79eb0e1328aa35f70ba4881db9a4482d254a04
-EBUILD fuse-2.9.3-r99.ebuild 2213 SHA256 30cb8fcf62efc23e0103237920a2f17dc15b0532b9d27339aa168ce25eb0e78c SHA512 5637dd9bc6b6822aa4731e2abd21333b4574edd215183272a8b9879763b92c9e65111191b6202d1e723cad0ea636e694cc6939c92eea6f4f0f3c081ce7eaba55 WHIRLPOOL 1687f495902fa1c4aa0162edb8eca658cc0d7d30fd723a04a186187d5884a58b3721cd7dd00e7b55c7d95c347855462e3f5af65c1b21598a3dc27d4f17adeb44
-MISC metadata.xml 248 SHA256 32abf15e7c6c5b1d79352aff76413358aea37ae781534cee099c03723de657bc SHA512 b820a6d68eb09f0c3eda90fd7ed53d21afc40eb3daef875542f711b8064a5c7fc78f06462a5aa6a9a7e7d71bd82225ecaee627eb599b5c5fd563d2599cf78974 WHIRLPOOL 9187ff09bb4d8f155befdf23e5ec86740069de083eb920122ed18702a1f3a83ad9aa2e9adacd307940c9455d3b346853726f750e350be0f4f644b898e9dc3c21
diff --git a/sys-fs/fuse/files/fuse-2.9.3-includes.patch b/sys-fs/fuse/files/fuse-2.9.3-includes.patch
deleted file mode 100644
index db29377..0000000
--- a/sys-fs/fuse/files/fuse-2.9.3-includes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur a/fuse-2.9.3/lib/fuse.c b/fuse-2.9.3/lib/fuse.c
---- a/fuse-2.9.3/lib/fuse.c
-+++ b/fuse-2.9.3/lib/fuse.c
-@@ -33,6 +33,7 @@
- #include <dlfcn.h>
- #include <assert.h>
- #include <poll.h>
-+#include <sys/file.h>
- #include <sys/param.h>
- #include <sys/uio.h>
- #include <sys/time.h>
-diff -ur a/fuse-2.9.3/lib/fuse_lowlevel.c b/fuse-2.9.3/lib/fuse_lowlevel.c
---- a/fuse-2.9.3/lib/fuse_lowlevel.c
-+++ b/fuse-2.9.3/lib/fuse_lowlevel.c
-@@ -24,6 +24,7 @@
- #include <limits.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/file.h>
- 
- #ifndef F_LINUX_SPECIFIC_BASE
- #define F_LINUX_SPECIFIC_BASE       1024
-diff -ur a/fuse-2.9.3/lib/mount.c b/fuse-2.9.3/lib/mount.c
---- a/fuse-2.9.3/lib/mount.c
-+++ b/fuse-2.9.3/lib/mount.c
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <paths.h>
- #include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-diff -ur a/fuse-2.9.3/lib/mount_util.c b/fuse-2.9.3/lib/mount_util.c
---- a/fuse-2.9.3/lib/mount_util.c
-+++ b/fuse-2.9.3/lib/mount_util.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <paths.h>
- #ifndef __NetBSD__
- #include <mntent.h>
- #endif
-diff -ur a/fuse-2.9.3/util/fusermount.c b/fuse-2.9.3/util/fusermount.c
---- a/fuse-2.9.3/util/fusermount.c
-+++ b/fuse-2.9.3/util/fusermount.c
-@@ -19,6 +19,7 @@
- #include <getopt.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <pwd.h>
- #include <mntent.h>
- #include <sys/wait.h>
-diff -ur a/fuse-2.9.3/util/mount_util.c b/fuse-2.9.3/util/mount_util.c
---- a/fuse-2.9.3/util/mount_util.c
-+++ b/fuse-2.9.3/util/mount_util.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <paths.h>
- #ifndef __NetBSD__
- #include <mntent.h>
- #endif
diff --git a/sys-fs/fuse/files/fuse-fbsd.init b/sys-fs/fuse/files/fuse-fbsd.init
deleted file mode 100644
index 19b8400..0000000
--- a/sys-fs/fuse/files/fuse-fbsd.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting fuse"
-	if ! kldstat -q -m fuse; then
-		kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping fuse"
-	if kldstat -q -m fuse; then
-		kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
-	fi
-	eend ${?}
-}
diff --git a/sys-fs/fuse/files/fuse.init b/sys-fs/fuse/files/fuse.init
deleted file mode 100644
index 30b512e..0000000
--- a/sys-fs/fuse/files/fuse.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MOUNTPOINT=/sys/fs/fuse/connections
-
-depend() {
-	need localmount
-}
-
-start() {
-
-	ebegin "Starting fuse"
-	if ! grep -qw fuse /proc/filesystems; then
-		modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	if grep -qw fusectl /proc/filesystems && \
-	   ! grep -qw $MOUNTPOINT /proc/mounts; then
-		mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error mounting control filesystem"
-	fi
-	eend ${?}
-	
-}
-
-stop() {
-
-	ebegin "Stopping fuse"
-	if grep -qw $MOUNTPOINT /proc/mounts; then
-		umount $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error unmounting control filesystem"
-	fi
-	eend ${?}
-	
-}
diff --git a/sys-fs/fuse/fuse-2.9.3-r99.ebuild b/sys-fs/fuse/fuse-2.9.3-r99.ebuild
deleted file mode 100644
index 11cacff..0000000
--- a/sys-fs/fuse/fuse-2.9.3-r99.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.3.ebuild,v 1.11 2014/01/18 19:54:53 ago Exp $
-
-EAPI=5
-inherit eutils libtool linux-info udev toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-	# 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
-	epatch "${FILESDIR}"/${PN}-2.9.3-includes.patch
-	elibtoolize
-}
-
-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() {
-	default
-
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
-
-	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/metadata.xml b/sys-fs/fuse/metadata.xml
deleted file mode 100644
index 5cb3fde..0000000
--- a/sys-fs/fuse/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kernel-misc</herd>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
-  </upstream>
-</pkgmetadata>
-- 
2.3.6