Version bump #548096 by Robin Kauffman.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 123 insertions, 1 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index 4fc97660c8c1..effe0aaec1af 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.170 2015/05/17 07:54:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.171 2015/06/08 15:52:50 vapier Exp $
+
+*ntfs3g-2015.3.14 (08 Jun 2015)
+
+  08 Jun 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/ntfs3g-2015.3.14-dont-put-things-in-root.patch,
+  +ntfs3g-2015.3.14.ebuild:
+  Version bump #548096 by Robin Kauffman.
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Fix metadata.xml description for ntfs (#545216)
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2015.3.14-dont-put-things-in-root.patch b/sys-fs/ntfs3g/files/ntfs3g-2015.3.14-dont-put-things-in-root.patch
new file mode 100644
index 000000000000..e86d9defbaea
--- /dev/null
+++ b/sys-fs/ntfs3g/files/ntfs3g-2015.3.14-dont-put-things-in-root.patch
@@ -0,0 +1,30 @@
+install all files into the sbindir since there's no need to split between /sbin and /usr/sbin
+
+--- a/ntfsprogs/Makefile.in
++++ b/ntfsprogs/Makefile.in
+@@ -1348,8 +1348,8 @@ uninstall-man: uninstall-man8
+ # mkfs.ntfs[.8] hard link
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-exec-hook:
+-@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/sbin
+-@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
++@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/$(sbindir)
++@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f mkntfs $(DESTDIR)/$(sbindir)/mkfs.ntfs
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-data-hook:
+ @ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)$(man8dir)
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1040,9 +1040,9 @@ uninstall-man: uninstall-man8
+ @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@	$(LDCONFIG)
+ 
+ @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:	install-rootbinPROGRAMS
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/sbin"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/$(sbindir)"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "../bin/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "../bin/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
+ 
+ @ENABLE_NTFS_3G_TRUE@install-data-local:	install-man8
+ @ENABLE_NTFS_3G_TRUE@	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
diff --git a/sys-fs/ntfs3g/ntfs3g-2015.3.14.ebuild b/sys-fs/ntfs3g/ntfs3g-2015.3.14.ebuild
new file mode 100644
index 000000000000..ef0ef69c1c4b
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-2015.3.14.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2015.3.14.ebuild,v 1.1 2015/06/08 15:52:50 vapier Exp $
+
+EAPI=5
+inherit eutils linux-info udev toolchain-funcs libtool
+
+MY_PN=${PN/3g/-3g}
+MY_P=${MY_PN}_ntfsprogs-${PV}
+
+DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
+HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
+SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0/86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
+
+RDEPEND="!<sys-apps/util-linux-2.20.1-r2
+	!sys-fs/ntfsprogs
+	ntfsdecrypt? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/gnutls-1.4.4
+	)
+	external-fuse? ( >=sys-fs/fuse-2.8.0 )"
+DEPEND="${RDEPEND}
+	sys-apps/attr
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS ChangeLog CREDITS README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
+	"${FILESDIR}"/${PN}-2015.3.14-dont-put-things-in-root.patch
+)
+
+pkg_setup() {
+	if use external-fuse && 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 ntfs-3g"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	# Note: patches apply to Makefile.in, so don't run autotools here.
+	elibtoolize
+}
+
+src_configure() {
+	tc-ld-disable-gold
+	econf \
+		--prefix="${EPREFIX}"/usr \
+		--exec-prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--enable-ldscript \
+		--disable-ldconfig \
+		$(use_enable acl posix-acls) \
+		$(use_enable xattr xattr-mappings) \
+		$(use_enable ntfsdecrypt crypto) \
+		$(use_enable ntfsprogs) \
+		$(use_enable ntfsprogs quarantined) \
+		--without-uuid \
+		--enable-extras \
+		$(use_enable static-libs static) \
+		--with-fuse=$(usex external-fuse external internal)
+}
+
+src_install() {
+	default
+
+	use suid && fperms u+s /usr/bin/${MY_PN}
+	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
+	prune_libtool_files
+
+	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
+}