gentoo resync : 13.11.2021

4 files changed, 32 insertions, 27 deletions

diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 4462b1363ce0..fab1fb8800ae 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,5 +1,4 @@
-DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
-EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
-EBUILD ntfs3g-2021.8.22.ebuild 2094 BLAKE2B 0d482ef348d1d375ea0527062d433d967e47b7c9ca633bcb596a90d4a18d4b2d9dc125380c177c9d31269a3031861a181800953137c444ccfcfe6ca68d98869e SHA512 79e9b31bd21941cb511b3d4f8d86be88fa9a0e9912be4f46ce9c8341688e0edbf6118aa8ee6577c357761787126df5a1e03dcd965a8f131f4b880c39c67ed4c0
-MISC metadata.xml 1072 BLAKE2B cbfb93f83a25bb707c6584f035d742513da2e423ec1f52fcebf25b6b34829bc429f7fbc38e2e3e76dd5ad2eca5f28d91072a0000ef83277bf84553aa6ff1e6b5 SHA512 2afcc34189ca0708f6d1cd15e9e249dc3ac0a150f4094c97a0d5745ca0b21f426676c3090df031cc8f234da38b2d13abb8ddf1583b9049d52ce2737833ee9314
+EBUILD ntfs3g-2021.8.22-r3.ebuild 2044 BLAKE2B d16a408891fdb5b368df38e338ff6f08822db2cb817f12c33ccb24c818fb8b71b2cba38cc70d1a6c8cba25cfb747d11bebcd682cdb7809b07048d20fb3dcbc19 SHA512 58dec845c63767f2b76df43963ffa4dc02f771792cbc8d2bb83da5a31ffad382de72f412a3d2690fb77447ef9c9d256a3f7aaf542aadd2ebf674a34e7494f5e5
+EBUILD ntfs3g-2021.8.22.ebuild 2078 BLAKE2B 236f32ff2a280c8c42d84cb66b5a9aea465e0d9ef4095991406d40edd59a98b396598698318098762be665bb62c4c917abac68015a01a2183b28066acb24c25d SHA512 7bf7851726792dcadf394cb7278723a4a9a59f425c362bde4a2128e60e0c5677a286a4c02596c15f05b29830074891166b774a58f4c9c566c6272da29b04c1ae
+MISC metadata.xml 1164 BLAKE2B 276dcf2d0cccad4b91a84390949ff8a81b76e54c22d7bfbe4b778c97917224f3d0603079fb74e4b3ff0e058580f4ac6540aef3bae4fdc6ae9b2fb54b831e22ea SHA512 63391014c4dc8ba722c8f90d6fe1952b5f4386d44b1bb2af195e907e5027ede0f4063e4390679b6b521b892fcc12194914b4f40a09c6bc08a300a90bdd250390
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 9b2852a0591a..910a26c2caf5 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -16,8 +16,10 @@
 		file ownership, access right.
 	</longdescription>
 	<use>
+		<flag name="fuse">Enable ntfs-3g FUSE driver</flag>
+		<flag name="mount-ntfs">Install mount.ntfs symlink</flag>
 		<flag name="ntfsdecrypt">Build and install the ntfsdecrypt application.</flag>
-		<flag name="ntfsprogs">Include internal version of ntfsprogs.</flag>
+		<flag name="ntfsprogs">Enable ntfsprogs</flag>
 	</use>
 	<upstream>
 		<bugs-to>http://tuxera.com/forum/</bugs-to>
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
index 17c8330cd5b4..28102ca67d43 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2006-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit linux-info toolchain-funcs
 
-MY_P="ntfs-3g_ntfsprogs-${PV%.*}AR.${PV##*.}"
+inherit toolchain-funcs
+
+MY_P="ntfs-3g_ntfsprogs-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
 HOMEPAGE="https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
-#SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
+SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
-SLOT="0/885"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
+SLOT="0/89"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
 	sys-apps/util-linux:0=
@@ -34,12 +34,6 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	CONFIG_CHECK="~FUSE_FS"
-	FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-	linux-info_pkg_setup
-}
-
 src_configure() {
 	tc-ld-disable-gold
 
@@ -52,6 +46,7 @@ src_configure() {
 		--disable-ldconfig
 		--enable-extras
 		$(use_enable debug)
+		$(use_enable fuse ntfs-3g)
 		$(use_enable acl posix-acls)
 		$(use_enable xattr xattr-mappings)
 		$(use_enable ntfsdecrypt crypto)
@@ -64,6 +59,10 @@ src_configure() {
 		# disable hd library until we have the right library in the tree and
 		# don't links to hwinfo one causing issues like bug #602360
 		--without-hd
+
+		# Needed for suid
+		# https://bugs.gentoo.org/822024
+		--with-fuse=internal
 	)
 
 	econf "${myconf[@]}"
@@ -71,9 +70,15 @@ src_configure() {
 
 src_install() {
 	default
-	use suid && fperms u+s /usr/bin/ntfs-3g
-	dosym mount.ntfs-3g /sbin/mount.ntfs
-	find "${D}" -name '*.la' -type f -delete || die
-	# https://bugs.gentoo.org/760780
-	keepdir "/usr/$(get_libdir)/ntfs-3g"
+	if use fuse; then
+		# Plugins directory
+		keepdir "/usr/$(get_libdir)/ntfs-3g"
+		if use suid; then
+			fperms u+s /usr/bin/ntfs-3g
+		fi
+		if use mount-ntfs; then
+			dosym mount.ntfs-3g /sbin/mount.ntfs
+		fi
+	fi
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
index 73800e129e54..64a938dc180b 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
+IUSE="acl debug +mount-ntfs ntfsdecrypt +ntfsprogs static-libs xattr"
 
 RDEPEND="
 	sys-apps/util-linux:0=
@@ -74,8 +74,7 @@ src_configure() {
 
 src_install() {
 	default
-	use suid && fperms u+s /usr/bin/ntfs-3g
-	dosym mount.ntfs-3g /sbin/mount.ntfs
+	use mount-ntfs && dosym mount.ntfs-3g /sbin/mount.ntfs
 	find "${ED}" -name '*.la' -type f -delete || die
 	# https://bugs.gentoo.org/760780
 	keepdir "/usr/$(get_libdir)/ntfs-3g"