Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/ntfs3g/
Date: Sun, 07 Nov 2021 00:29:23
Message-Id: 1636244927.be0aafde743046bdfac23126b7f264589cf4bc18.floppym@gentoo
1 commit: be0aafde743046bdfac23126b7f264589cf4bc18
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 7 00:23:30 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 7 00:28:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0aafde
7
8 sys-fs/ntfs3g: add 'fuse' USE flag
9
10 This allows libntfs-3g and ntfsprogs to be installed without the FUSE
11 driver.
12
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 sys-fs/ntfs3g/metadata.xml | 3 ++-
16 ...21.8.22-r2.ebuild => ntfs3g-2021.8.22-r3.ebuild} | 21 ++++++++++++---------
17 2 files changed, 14 insertions(+), 10 deletions(-)
18
19 diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
20 index fd2cd929283..910a26c2caf 100644
21 --- a/sys-fs/ntfs3g/metadata.xml
22 +++ b/sys-fs/ntfs3g/metadata.xml
23 @@ -16,9 +16,10 @@
24 file ownership, access right.
25 </longdescription>
26 <use>
27 + <flag name="fuse">Enable ntfs-3g FUSE driver</flag>
28 <flag name="mount-ntfs">Install mount.ntfs symlink</flag>
29 <flag name="ntfsdecrypt">Build and install the ntfsdecrypt application.</flag>
30 - <flag name="ntfsprogs">Include internal version of ntfsprogs.</flag>
31 + <flag name="ntfsprogs">Enable ntfsprogs</flag>
32 </use>
33 <upstream>
34 <bugs-to>http://tuxera.com/forum/</bugs-to>
35
36 diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
37 similarity index 84%
38 rename from sys-fs/ntfs3g/ntfs3g-2021.8.22-r2.ebuild
39 rename to sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
40 index fa4b403451e..1b89073cd28 100644
41 --- a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r2.ebuild
42 +++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
43 @@ -1,4 +1,4 @@
44 -# Copyright 1999-2021 Gentoo Authors
45 +# Copyright 2006-2021 Gentoo Authors
46 # Distributed under the terms of the GNU General Public License v2
47
48 EAPI=7
49 @@ -16,7 +16,7 @@ LICENSE="GPL-2"
50 # The subslot matches the SONAME major #.
51 SLOT="0/89"
52 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
53 -IUSE="acl debug +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
54 +IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
55
56 RDEPEND="
57 sys-apps/util-linux:0=
58 @@ -52,6 +52,7 @@ src_configure() {
59 --disable-ldconfig
60 --enable-extras
61 $(use_enable debug)
62 + $(use_enable fuse ntfs-3g)
63 $(use_enable acl posix-acls)
64 $(use_enable xattr xattr-mappings)
65 $(use_enable ntfsdecrypt crypto)
66 @@ -75,13 +76,15 @@ src_configure() {
67
68 src_install() {
69 default
70 - if use suid; then
71 - fperms u+s /usr/bin/ntfs-3g
72 - fi
73 - if use mount-ntfs; then
74 - dosym mount.ntfs-3g /sbin/mount.ntfs
75 + if use fuse; then
76 + # Plugins directory
77 + keepdir "/usr/$(get_libdir)/ntfs-3g"
78 + if use suid; then
79 + fperms u+s /usr/bin/ntfs-3g
80 + fi
81 + if use mount-ntfs; then
82 + dosym mount.ntfs-3g /sbin/mount.ntfs
83 + fi
84 fi
85 find "${ED}" -name '*.la' -type f -delete || die
86 - # https://bugs.gentoo.org/760780
87 - keepdir "/usr/$(get_libdir)/ntfs-3g"
88 }