Migrate to EAPI=2. Add a default-on USE flag for external FUSE, as the internal FUSE must be used for unpriviliged mounting to work (bug #282222).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 24 insertions, 13 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index 20b4c5c06d45..3b0e4e581af3 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.82 2009/08/21 15:49:21 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.83 2009/08/21 20:49:53 chutzpah Exp $
+
+  21 Aug 2009; Patrick McLean <chutzpah@gentoo.org> ntfs3g-2009.4.4.ebuild,
+  metadata.xml:
+  Migrate to EAPI=2. Add a default-on USE flag for external FUSE, as the
+  internal FUSE must be used for unpriviliged mounting to work (bug
+  #282222).
 
   21 Aug 2009; Patrick McLean <chutzpah@gentoo.org> ntfs3g-2009.4.4.ebuild:
   Remove suid check as it fails with the suid use flag off.
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 6c8dbfece4da..470e502a2131 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
 The ntfs-3g driver is an open source, GPL licensed, third generation Linux 
 NTFS driver for 32-bit, little-endian architectures which was implemented 
 by the Linux-NTFS project. It provides full read-write access to NTFS, 
 excluding access to encrypted files, writing compressed files, changing 
 file ownership, access right.
-  </longdescription>
+	</longdescription>
+	<use>
+		<flag name='external-fuse'>Use external FUSE library instead of internal
+		one. Must be disabled for unprivileged mounting to work.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild b/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild
index 65b07fd3d687..25d05be4173f 100644
--- a/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild,v 1.2 2009/08/21 15:49:21 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild,v 1.3 2009/08/21 20:49:53 chutzpah Exp $
+
+EAPI=2
 
 MY_PN="${PN/3g/-3g}"
 MY_P="${MY_PN}-${PV}"
@@ -12,7 +14,7 @@ SRC_URI="http://www.ntfs-3g.org/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug hal suid"
+IUSE="debug hal suid +external-fuse"
 
 RDEPEND=">=sys-fs/fuse-2.6.0
 	hal? ( sys-apps/hal )"
@@ -20,14 +22,13 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
-		--with-fuse=external \
+		--with-fuse=$(use external-fuse && echo external || echo internal) \
 		$(use_enable debug)
-	emake || die "emake failed"
 }
 
 src_install() {