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.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 24 insertions, 69 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/Manifest b/sys-fs/ntfs3g/Manifest
index ba4a1d4afe70..4a4331b474d9 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -4,19 +4,17 @@ Hash: SHA1
 AUX 10-ntfs3g.fdi 397 RMD160 a09440a0d239db40ce7c6cada0008e425a0a5dc7 SHA1 d26af4f1dcdfad6da384b0e706c79a629fa893dd SHA256 bceb8474647e9dd8a1740d3d3af559cbd9f5ad428f335606f44f87b17c712de7
 AUX 10-ntfs3g.fdi.2009 222 RMD160 f283f92064902b875604f2277da7eda7cad1c923 SHA1 f8d1ee160af691e4a551f563b92b9e55230631e1 SHA256 35eec198d1cabbca7e896b880b645360966ca86cdfea5a0da4767226b45a1817
 DIST ntfs-3g-1.2531.tgz 651157 RMD160 be9bdb788f5ad2914ae417294d0027eed52e3bc7 SHA1 24c814700490665396e6e667870a6ba518145e02 SHA256 e5d834f0be7efdedc36e45808554dafcb53f70b2fa2d511df5b9ae23e6807bbe
-DIST ntfs-3g-1.5130.tgz 649883 RMD160 173b1c7e3a94d440ecaa19d97980ba6f3228e33e SHA1 02b7a874b02827665c97123c6335e1d856054c42 SHA256 a456973a4b44c8fa1b63214425edfd1a72fd7b26ab40d25a4372e2a4f3ac4057
-DIST ntfs-3g-2009.2.1.tgz 652082 RMD160 6f9bbfbfb5a148ba5c4cc75c9f225d3ad24ec715 SHA1 0fc17b8455815de2445363c8ee615842eac4c10f SHA256 47ae17ad20a6435811a3abfa8b471be7fbe9969544153f5b9a9ec212818578b0
 DIST ntfs-3g-2009.3.8.tgz 652489 RMD160 01f723861da5e6d761a570c7eb9a690139b76a32 SHA1 532ae4b6c58ec246eba3b6fc7f0fca78a01cd49b SHA256 c3d54a0f52e558ef21108c3d8aac5f444239178ce75d8bd29f293a1a0b8a4772
-EBUILD ntfs3g-1.2531.ebuild 1147 RMD160 57159939fae077398b1c1f071d2fd41b11a07b5d SHA1 99373cac4aac9af81ff6a9d64d10939f59297e3e SHA256 b2800ed955481bbf9b278a9f419fe3699494d05a78e14ee47d8c3048fef6be2f
-EBUILD ntfs3g-1.5130.ebuild 1278 RMD160 3df05af99ee1dbd668bfadd801e0200cff94e791 SHA1 f818aec769d74c2c9958b26064519ff109b24b34 SHA256 f7872f7b95a39f517e94750b1aa0431e44c2e36701840d65b4e24dd98c4394d6
-EBUILD ntfs3g-2009.2.1.ebuild 1302 RMD160 6433eb162896173d05add28ca03b0612b4f87aa7 SHA1 9752b32c46717de370ea8b7b57c94cf2cc913d52 SHA256 e7189a7e04bd295859799c0c4f89a9b6a2de722c8ff7c191e6caf150c499bd64
+DIST ntfs-3g-2009.4.4.tgz 652496 RMD160 d11b452794dc454396019beacd5f98faa757211f SHA1 a8e54d38e8cae1cdd1178bbbb42a1e5670ae7089 SHA256 bcd39ebe90541f512e605b62911f14f6107239c4ff032d56d5da3dc3c05e0d0f
+EBUILD ntfs3g-1.2531.ebuild 1148 RMD160 79af4395bc7ad86abab86ed7a323af31d8c8787d SHA1 80c8c217bc87148f8763864ca779c2739f09cac9 SHA256 fa3ee464eb7ee3fa90c57535afc07aa0318311794c61cc8f72e83ffdc86a5b89
 EBUILD ntfs3g-2009.3.8.ebuild 1297 RMD160 af3c7657045cb323c6530edef2a834d887ba80ad SHA1 8b503ca4f4cd65156bad1e921166f9f504b5640f SHA256 80aaf29d324c10e0ce311f295765efe504b296d13971820fbb6f354b5f7f38a8
-MISC ChangeLog 12781 RMD160 8892f41f9ac522bccfe80cc49c636bb0be99f9a1 SHA1 ae0f20b1e5f685829c8b24d4cf6c4ceebd30c602 SHA256 92621f55b3a6b138d517ab3c9e69f7017e0c6fa2de67befb1ecad4663f421489
+EBUILD ntfs3g-2009.4.4.ebuild 1415 RMD160 45e39fc58e1985387e903534f816a277b566df4b SHA1 a52d4812d63bda3ece47ab26427c503cff30b592 SHA256 f434bcaffe1e30353530de8a9ee34352957573a261ec3e4e082ffaa1a458b780
+MISC ChangeLog 13166 RMD160 708656f858edeb80807cc5d57aae83d782a2ae6e SHA1 65cd62bf90c179430ccc500456fa0395c83d2a3d SHA256 1e41bb3c3e64f71ae137f964dd35da7d286fe8d2e410012f14e61a27634cbf17
 MISC metadata.xml 641 RMD160 361ae848a3012a236c512a5cfc71cc96026ba072 SHA1 9cc731cc7093ad04c8a3199948f24b2c5ff2cadb SHA256 bb0e59a4fde05b0fbad22547a263d7ef98bb5809fd00bf14c0d4d2c89cab05ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp1lNEACgkQkKaRLQcq0GJ9KgCfXxzhL0UTgXBHkfINvWPKfEWV
-w8cAoJre7iMoihk5CMEgePUgSu9486ib
-=KuTw
+iEYEARECAAYFAkqOsgIACgkQWt/XSf2CZdmE2ACeL8fFa58REMO82J80KwD26GtH
+7AgAn0Q+zRqz4yjG5PrJrDmpZW7c5NRv
+=EV2c
 -----END PGP SIGNATURE-----
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/