Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/
Date: Wed, 12 Dec 2018 09:56:49
Message-Id: 1544608578.d6db67ff92a913da3ae13d4504b724ec55fda7e8.radhermit@gentoo
1 commit: d6db67ff92a913da3ae13d4504b724ec55fda7e8
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 12 09:53:29 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 12 09:56:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6db67ff
7
8 sys-fs/fuse: install slotted mount.fuse(3) binary and man page
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 sys-fs/fuse/fuse-2.9.8-r1.ebuild | 71 ++++++++++++++++++++++
13 .../{fuse-3.3.0.ebuild => fuse-3.3.0-r1.ebuild} | 7 +--
14 2 files changed, 74 insertions(+), 4 deletions(-)
15
16 diff --git a/sys-fs/fuse/fuse-2.9.8-r1.ebuild b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
17 new file mode 100644
18 index 00000000000..0e17eaa9a11
19 --- /dev/null
20 +++ b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
21 @@ -0,0 +1,71 @@
22 +# Copyright 1999-2018 Gentoo Authors
23 +# Distributed under the terms of the GNU General Public License v2
24 +
25 +EAPI=6
26 +inherit libtool linux-info udev toolchain-funcs
27 +
28 +DESCRIPTION="An interface for filesystems implemented in userspace"
29 +HOMEPAGE="https://github.com/libfuse/libfuse"
30 +SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
31 +
32 +LICENSE="GPL-2"
33 +SLOT="0"
34 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
35 +IUSE="examples kernel_linux kernel_FreeBSD static-libs"
36 +
37 +PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
38 +DEPEND="virtual/pkgconfig"
39 +RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
40 +
41 +pkg_setup() {
42 + if use kernel_linux ; then
43 + if kernel_is lt 2 6 9 ; then
44 + die "Your kernel is too old."
45 + fi
46 + CONFIG_CHECK="~FUSE_FS"
47 + WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
48 + linux-info_pkg_setup
49 + fi
50 +}
51 +
52 +src_prepare() {
53 + local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
54 + # sandbox violation with mtab writability wrt #438250
55 + # don't sed configure.in without eautoreconf because of maintainer mode
56 + sed -i 's:umount --fake:true --fake:' configure || die
57 + elibtoolize
58 +
59 + default
60 +}
61 +
62 +src_configure() {
63 + econf \
64 + INIT_D_PATH="${EPREFIX}/etc/init.d" \
65 + MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
66 + UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
67 + $(use_enable static-libs static) \
68 + --disable-example
69 +}
70 +
71 +src_install() {
72 + local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
73 + default
74 +
75 + if use examples ; then
76 + docinto examples
77 + dodoc example/*
78 + fi
79 +
80 + if use kernel_FreeBSD ; then
81 + insinto /usr/include/fuse
82 + doins include/fuse_kernel.h
83 + fi
84 +
85 + find "${ED}" -name '*.la' -delete || die
86 +
87 + # installed via fuse-common
88 + rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
89 +
90 + # handled by the device manager
91 + rm -r "${D%/}"/dev || die
92 +}
93
94 diff --git a/sys-fs/fuse/fuse-3.3.0.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
95 similarity index 91%
96 rename from sys-fs/fuse/fuse-3.3.0.ebuild
97 rename to sys-fs/fuse/fuse-3.3.0-r1.ebuild
98 index fe790fba947..3b4821add77 100644
99 --- a/sys-fs/fuse/fuse-3.3.0.ebuild
100 +++ b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
101 @@ -20,7 +20,7 @@ DEPEND="virtual/pkgconfig
102 ${PYTHON_DEPS}
103 $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
104 )"
105 -RDEPEND="sys-fs/fuse-common"
106 +RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
107
108 DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
109
110 @@ -63,12 +63,11 @@ multilib_src_install_all() {
111
112 # installed via fuse-common
113 rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
114 - rm "${ED%/}"/usr/sbin/mount.fuse3 || die
115
116 # handled by the device manager
117 rm -r "${ED%/}"/dev || die
118
119 - # manually install man pages
120 + # manually install man pages to respect compression
121 rm -r "${ED%/}"/usr/share/man || die
122 - doman doc/fusermount3.1
123 + doman doc/{fusermount3.1,mount.fuse3.8}
124 }