Version bump (bug #363059). Add USE flag for internal ntfsprogs, with block against sys-fs/ntfsprogs. Also add USE flag for encrypted NTFS support. Drop old version 2010.3.6.

(Portage version: 2.1.9.48/cvs/Linux x86_64)

3 files changed, 25 insertions, 9 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index f9e6d4b94c77..56e9ae0fc05b 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.113 2011/02/26 07:58:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.114 2011/05/09 15:23:14 chutzpah Exp $
+
+*ntfs3g-2011.4.12 (09 May 2011)
+
+  09 May 2011; Patrick McLean <chutzpah@gentoo.org> -ntfs3g-2010.3.6.ebuild,
+  +ntfs3g-2011.4.12.ebuild, metadata.xml:
+  Version bump (bug #363059). Add USE flag for internal ntfsprogs, with block
+  against sys-fs/ntfsprogs. Also add USE flag for encrypted NTFS support. Drop
+  old version 2010.3.6.
 
   26 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   ntfs3g-2010.8.8.ebuild:
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 4e5a96af1feb..b999d0d7c4f3 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -18,5 +18,8 @@ file ownership, access right.
 		one. Must be disabled for unprivileged mounting to work.</flag>
 		<flag name='udev'>Install udev rule to make udisks use ntfs-3g instead
 		of the kernel NTFS driver.</flag>
+		<flag name='crypt'>Add support for encrypted NTFS drives/partitions.</flag>
+		<flag name='ntfsprogs'>Include internal version of ntfsprogs. This will
+		block sys-fs/ntfsprogs.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild b/sys-fs/ntfs3g/ntfs3g-2011.4.12.ebuild
index e39d5acf8632..779b64654ccd 100644
--- a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2011.4.12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild,v 1.8 2011/02/02 00:01:45 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2011.4.12.ebuild,v 1.1 2011/05/09 15:23:14 chutzpah Exp $
 
 EAPI=2
 inherit linux-info
 
 MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
+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/"
@@ -14,11 +14,14 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="acl debug suid udev +external-fuse"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl crypt debug ntfsprogs suid xattr +udev +external-fuse"
+
+RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
+	ntfsprogs? ( !!sys-fs/ntfsprogs )"
 
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.6.0 )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	sys-apps/attr"
 
 S="${WORKDIR}/${MY_P}"
@@ -40,15 +43,17 @@ src_configure() {
 		--enable-ldscript \
 		--disable-ldconfig \
 		--with-fuse=$(use external-fuse && echo external || echo internal) \
+		$(use_enable ntfsprogs) \
+		$(use_enable crypt crypto) \
 		$(use_enable acl posix-acls) \
+		$(use_enable xattr xattr-mappings)	\
 		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
+	dodoc AUTHORS ChangeLog CREDITS README
 
 	use suid && fperms u+s "/bin/${MY_PN}"