Version bump (bug #282149). Use external FUSE library instead of internal one, to avoid another case of library bundling, also fixes bug #235966 as sys-fs/fuse checks the kernel config. Clean out some older versions.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 17 insertions, 60 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index c7ad904bbb2f..896a35638f20 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,14 @@
 # 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.80 2009/08/02 13:29:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.81 2009/08/21 14:40:56 chutzpah Exp $
+
+*ntfs3g-2009.4.4 (21 Aug 2009)
+
+  21 Aug 2009; Patrick McLean <chutzpah@gentoo.org> -ntfs3g-1.5130.ebuild,
+  -ntfs3g-2009.2.1.ebuild, +ntfs3g-2009.4.4.ebuild:
+  Version bump (bug #282149). Use external FUSE library instead of internal
+  one, to avoid another case of library bundling, also fixes bug #235966 as
+  sys-fs/fuse checks the kernel config. Clean out some older versions.
 
   02 Aug 2009; Markus Meier <maekke@gentoo.org> ntfs3g-2009.3.8.ebuild:
   x86 stable, bug #272355
diff --git a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild b/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
index 16886ea78bb8..def70e4e84d2 100644
--- a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-1.2531.ebuild,v 1.5 2008/07/17 19:04:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild,v 1.6 2009/08/21 14:40:56 chutzpah Exp $
 
 MY_PN="${PN/3g/-3g}"
 MY_P="${MY_PN}-${PV}"
diff --git a/sys-fs/ntfs3g/ntfs3g-1.5130.ebuild b/sys-fs/ntfs3g/ntfs3g-1.5130.ebuild
deleted file mode 100644
index dd3889dee1b2..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-1.5130.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-1.5130.ebuild,v 1.1 2009/01/19 19:47:03 chutzpah Exp $
-
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.ntfs-3g.org"
-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"
-
-RDEPEND="hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-ldscript \
-		--disable-ldconfig \
-		$(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
-
-	use suid && fperms u+s "/bin/${MY_PN}"
-
-	if use hal; then
-		insinto /etc/hal/fdi/policy/
-		doins "${FILESDIR}/10-ntfs3g.fdi"
-	fi
-}
-
-pkg_postinst() {
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
-	fi
-}
diff --git a/sys-fs/ntfs3g/ntfs3g-2009.2.1.ebuild b/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild
index 9d53512d8b8a..452d5340e7df 100644
--- a/sys-fs/ntfs3g/ntfs3g-2009.2.1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.1 2009/02/12 16:21:24 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2009.4.4.ebuild,v 1.1 2009/08/21 14:40:56 chutzpah Exp $
 
 MY_PN="${PN/3g/-3g}"
 MY_P="${MY_PN}-${PV}"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug hal suid"
 
-RDEPEND="hal? ( sys-apps/hal )"
+RDEPEND=">=sys-fs/fuse-2.6.0
+	hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -24,6 +25,7 @@ src_compile() {
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
+		--with-fuse=external \
 		$(use_enable debug)
 	emake || die "emake failed"
 }
@@ -31,10 +33,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs
+	prepalldocs || die "prepalldocs failed"
 	dodoc AUTHORS ChangeLog CREDITS
 
-	use suid && fperms u+s "/bin/${MY_PN}"
+	use suid && fperms u+s "/bin/${MY_PN}" || die "error enabling suid on binary"
 
 	if use hal; then
 		insinto /etc/hal/fdi/policy/