sys-fs/ntfs3g-ar: version bump

svn path=/sunrise/; revision=12495

5 files changed, 29 insertions, 55 deletions

diff --git a/sys-fs/ntfs3g-ar/ChangeLog b/sys-fs/ntfs3g-ar/ChangeLog
index d9994ac0f..9ba675500 100644
--- a/sys-fs/ntfs3g-ar/ChangeLog
+++ b/sys-fs/ntfs3g-ar/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2011; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> ChangeLog:
+  version bump
+
   08 Oct 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   hal is no more
 
diff --git a/sys-fs/ntfs3g-ar/Manifest b/sys-fs/ntfs3g-ar/Manifest
index abc14080b..bbf80bb9a 100644
--- a/sys-fs/ntfs3g-ar/Manifest
+++ b/sys-fs/ntfs3g-ar/Manifest
@@ -1,6 +1,5 @@
-AUX 10-ntfs3g.fdi.2009-r1 3065 RMD160 38d92bb8e2be61cc0adde5ff8239b8caff657b91 SHA1 41ca7eeeba9cf01c04032d41e4a8beeaf0165cfe SHA256 680da3e23313260a586b7f986d2cc9440c14485dfbbf16748a6cefab83c38e2d
 AUX 99-ntfs3g.rules 51 RMD160 5c022fc946d0a695f8ef0dde7b8be42080bc8162 SHA1 01c821c46815c8bbe7560455fc22cc355c3844a2 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463
-DIST ntfs-3g-2010.10.2AR.3.tgz 1156122 RMD160 e3e9ca6b122f796982b501a60bcd97b4b199ea53 SHA1 ac83621b5719d51044c4882beeb2b5baf3e469a6 SHA256 35d24c6e23287e2c6b3e61514cd4014162adff1bbfae19ba772f1478021e34e0
-EBUILD ntfs3g-ar-2010.10.2.3.ebuild 2118 RMD160 6b56a6fba05fc3a26c9be362dff39026859f3efb SHA1 213ffb220d6029461f50bf2286963cd1e85b7b34 SHA256 056f75f8dbf2df870ada75bf25ba722d2ceac0807c8068cf4a3cc352bd15c1d8
-MISC ChangeLog 2460 RMD160 86ded0daa14746fa0b3efa39441126a29aaee16f SHA1 2f8922dfde7d633ff82b57684f10ac69d9d15bf0 SHA256 5378bd7257bd9a8fa801368023098bb08d1bd55114960ae6b38d258af6b9c434
-MISC metadata.xml 438 RMD160 eef4d89eea8f821b8dcf9ecdc39aa216846a6d20 SHA1 97e2c3b16248770081fbda49bb3c1f1afd1efcee SHA256 a8e711786a3ab792e9b7c9e5260c85390d4f40276907e242a18755923814d2bc
+DIST ntfs-3g_ntfsprogs-2011.4.12AR.7.tgz 1144332 RMD160 333c97dc212f5ae11834124df1e6c0a01c1f7f6b SHA1 84e129624f3115c03a536c09a1688b925c035887 SHA256 62161e32052f47964ebf1209fc01774b13e32412ae07a9b6e01e073b8c4c54c8
+EBUILD ntfs3g-ar-2011.4.12.7.ebuild 2366 RMD160 862ee8c5d51b975d87d1ca678e77e28bacafe0b3 SHA1 2aaf2582b4105e2aeb6e632c8750ae404887a14e SHA256 8be5435761b33555693d98c77e1caba22421caae620ac136329b49cd2ff64bbf
+MISC ChangeLog 2545 RMD160 1dd62b8dbc8717398f895107317b9c307b0bdd3f SHA1 88a8494df9c3c553fed06b6e410150811b8e69fe SHA256 6081d409914f9a1ac68460c82014f492195d87c4649065c149f469b47784d3b7
+MISC metadata.xml 664 RMD160 cea2ce984e5f26c5b72dc05b9788ab304c135432 SHA1 8ac0c9be316b264df3c3af4d678595c182fe4714 SHA256 9e82a37a928f7e3524a277ad50f584c8cf0b2e66e17f1a7de93728c71e6e4355
diff --git a/sys-fs/ntfs3g-ar/files/10-ntfs3g.fdi.2009-r1 b/sys-fs/ntfs3g-ar/files/10-ntfs3g.fdi.2009-r1
deleted file mode 100644
index efeac866d..000000000
--- a/sys-fs/ntfs3g-ar/files/10-ntfs3g.fdi.2009-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-   	<match key="volume.fstype" string="ntfs">
-        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
-        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
-        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
-        <merge key="volume.fstype" type="string">ntfs-3g</merge>
-       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
-        <append key="volume.mount.valid_options" type="strlist">atime</append>
-        <append key="volume.mount.valid_options" type="strlist">noatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
-       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
-       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
-       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
-      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
-       	<append key="volume.mount.valid_options" type="strlist">silent</append>
-       	<append key="volume.mount.valid_options" type="strlist">force</append>
-       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
-       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
-       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
-       	<append key="volume.mount.valid_options" type="strlist">debug</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
-       	<append key="volume.mount.valid_options" type="strlist">sync</append>
-       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
-       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
-       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.valid_options" type="strlist">quiet</append>
-       	<append key="volume.mount.valid_options" type="strlist">remount</append>
-       	<append key="volume.mount.valid_options" type="strlist">exec</append>
-       	<append key="volume.mount.valid_options" type="strlist">recover</append>
-       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
-       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
-       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-	</match>
-  </device>
-</deviceinfo>
\ No newline at end of file
diff --git a/sys-fs/ntfs3g-ar/metadata.xml b/sys-fs/ntfs3g-ar/metadata.xml
index 1a831e403..4aa17c58e 100644
--- a/sys-fs/ntfs3g-ar/metadata.xml
+++ b/sys-fs/ntfs3g-ar/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
 	<use>
-		<flag name='udev'>Instal udev rule for <pkg>sys-apps/udev</pkg></flag>
 		<flag name='external-fuse'>Use external FUSE library instead of internal
 		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-ar/ntfs3g-ar-2010.10.2.3.ebuild b/sys-fs/ntfs3g-ar/ntfs3g-ar-2011.4.12.7.ebuild
index 6bcad59e9..75e50ce1a 100644
--- a/sys-fs/ntfs3g-ar/ntfs3g-ar-2010.10.2.3.ebuild
+++ b/sys-fs/ntfs3g-ar/ntfs3g-ar-2011.4.12.7.ebuild
@@ -7,7 +7,7 @@ inherit linux-info versionator
 
 MY_PN="${PN/3g-ar/-3g}"
 MY_PV="$(get_version_component_range 1-3)AR.$(get_version_component_range 4)"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}_ntfsprogs-${MY_PV}"
 
 DESCRIPTION="NTFS-3G variant supporting ACLs, junction points, compression and more"
 HOMEPAGE="http://pagesperso-orange.fr/b.andre/advanced-ntfs-3g.html"
@@ -16,12 +16,15 @@ SRC_URI="http://pagesperso-orange.fr/b.andre/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl debug external-fuse suid udev"
+IUSE="acl crypt debug +external-fuse ntfsprogs  static-libs suid xattr udev"
 
 RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
-	!sys-fs/ntfs3g
+	ntfsprogs? ( !!sys-fs/ntfsprogs )
+	crypt? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	sys-apps/attr"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,15 +45,18 @@ 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 static-libs static) \
 		$(use_enable debug)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs || die "prepalldocs failed"
-	dodoc AUTHORS ChangeLog CREDITS || die "dodoc failed"
+	dodoc AUTHORS ChangeLog CREDITS README || die "doc failed"
 
 	use suid && { fperms u+s "/bin/${MY_PN}" || die "set suid failed" ; }
 
@@ -58,6 +64,8 @@ src_install() {
 		insinto /etc/udev/rules.d/
 		doins "${FILESDIR}/99-ntfs3g.rules" || die "udev rules install failed"
 	fi
+
+	find "${D}" -name '*.la' -delete
 }
 
 pkg_postinst() {