Revision bump, add check to see if FUSE is compiled in the kernel sources, and die with instructions on making sure that you have the module from the FUSE package (bug #155637).

Package-Manager: portage-2.1.2_rc1-r6

4 files changed, 77 insertions, 5 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index d37139db7012..ccde49bcc24f 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.15 2006/11/15 03:23:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.16 2006/11/20 16:43:02 chutzpah Exp $
+
+*ntfs3g-0.20061115-r1 (20 Nov 2006)
+
+  20 Nov 2006; Patrick McLean <chutzpah@gentoo.org>
+  +ntfs3g-0.20061115-r1.ebuild:
+  Revision bump, add check to see if FUSE is compiled in the kernel sources,
+  and die with instructions on making sure that you have the module from the
+  FUSE package (bug #155637).
 
 *ntfs3g-0.20061115 (15 Nov 2006)
 
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 4bdceecd2ef2..6e59a499dba7 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -9,14 +9,18 @@ EBUILD ntfs3g-0.20061031.ebuild 825 RMD160 e13985fb8cb176750a3a782ad9fafdac0e0f2
 MD5 c3a2baf9ef6cddd3c4fd1d0124493428 ntfs3g-0.20061031.ebuild 825
 RMD160 e13985fb8cb176750a3a782ad9fafdac0e0f2f4e ntfs3g-0.20061031.ebuild 825
 SHA256 da5294c899c657cd617a86bd43f7ec955af6c5906b74eacddc952d029ff655de ntfs3g-0.20061031.ebuild 825
+EBUILD ntfs3g-0.20061115-r1.ebuild 1412 RMD160 aa4a4c90eb84df41a26da1c5ebeed905cfd26b86 SHA1 4147b77d03ff70d3798ff359192dba774f4e04a8 SHA256 0e1511ae6ecb9b141401ee810b6c4b77b7ea409b049af622038fe7b5fcfab827
+MD5 03369ddb7f6d47bdedf95e8e09c13307 ntfs3g-0.20061115-r1.ebuild 1412
+RMD160 aa4a4c90eb84df41a26da1c5ebeed905cfd26b86 ntfs3g-0.20061115-r1.ebuild 1412
+SHA256 0e1511ae6ecb9b141401ee810b6c4b77b7ea409b049af622038fe7b5fcfab827 ntfs3g-0.20061115-r1.ebuild 1412
 EBUILD ntfs3g-0.20061115.ebuild 825 RMD160 6f8a973d858406b7a4dbf34c79f58ed2357e9ce3 SHA1 4073cd800c77bb36b6932a41c2f60d97374f0bd5 SHA256 03e2df7b0a08a542feb95e5938496867230bdc4de7453074c4abf031d43a377c
 MD5 9e91dffa901dc6f8b3352b26e311cd4d ntfs3g-0.20061115.ebuild 825
 RMD160 6f8a973d858406b7a4dbf34c79f58ed2357e9ce3 ntfs3g-0.20061115.ebuild 825
 SHA256 03e2df7b0a08a542feb95e5938496867230bdc4de7453074c4abf031d43a377c ntfs3g-0.20061115.ebuild 825
-MISC ChangeLog 3057 RMD160 d324be68a6d0f3a4da9d4e39e9ae5e5bb2310d3a SHA1 bd02a39c280739cc568f01f51155282f45cc5fd4 SHA256 c685f8522f9c9aedca0e0483d393a3040a62500677609d87ce8b33f6180cf258
-MD5 d893dfed1d5caa057d97311cfefe657f ChangeLog 3057
-RMD160 d324be68a6d0f3a4da9d4e39e9ae5e5bb2310d3a ChangeLog 3057
-SHA256 c685f8522f9c9aedca0e0483d393a3040a62500677609d87ce8b33f6180cf258 ChangeLog 3057
+MISC ChangeLog 3363 RMD160 387c833d57632de1e70817d5035d09983c02bae2 SHA1 55b4d2a92992096d2d8ccc89be5f8162a2fc0a79 SHA256 d512266a3b1212d7805051a11756b1142cf4e6f2986a54b35afa6370a1276997
+MD5 53e0b9fe1774a17ded20e0502a4715a8 ChangeLog 3363
+RMD160 387c833d57632de1e70817d5035d09983c02bae2 ChangeLog 3363
+SHA256 d512266a3b1212d7805051a11756b1142cf4e6f2986a54b35afa6370a1276997 ChangeLog 3363
 MISC metadata.xml 641 RMD160 361ae848a3012a236c512a5cfc71cc96026ba072 SHA1 9cc731cc7093ad04c8a3199948f24b2c5ff2cadb SHA256 bb0e59a4fde05b0fbad22547a263d7ef98bb5809fd00bf14c0d4d2c89cab05ed
 MD5 ba3112dd7c45f425f5ac83620ac4f0d2 metadata.xml 641
 RMD160 361ae848a3012a236c512a5cfc71cc96026ba072 metadata.xml 641
@@ -30,3 +34,6 @@ SHA256 fe167e9aa87c38ab06bbc7ae3e311a1e87d141a0922fb5c051ce11a28de3c426 files/di
 MD5 5860ddbffee625a2335f97dd5ee23787 files/digest-ntfs3g-0.20061115 262
 RMD160 05f9d2b2d7d693dca873a61c474f005b3e539742 files/digest-ntfs3g-0.20061115 262
 SHA256 20875f12539e660f7903aeacb5f830c1c78045d149bd765d945eaf472321da74 files/digest-ntfs3g-0.20061115 262
+MD5 5860ddbffee625a2335f97dd5ee23787 files/digest-ntfs3g-0.20061115-r1 262
+RMD160 05f9d2b2d7d693dca873a61c474f005b3e539742 files/digest-ntfs3g-0.20061115-r1 262
+SHA256 20875f12539e660f7903aeacb5f830c1c78045d149bd765d945eaf472321da74 files/digest-ntfs3g-0.20061115-r1 262
diff --git a/sys-fs/ntfs3g/files/digest-ntfs3g-0.20061115-r1 b/sys-fs/ntfs3g/files/digest-ntfs3g-0.20061115-r1
new file mode 100644
index 000000000000..e6e2f692e6d2
--- /dev/null
+++ b/sys-fs/ntfs3g/files/digest-ntfs3g-0.20061115-r1
@@ -0,0 +1,3 @@
+MD5 9a0c1a3d2a27deaeda6c39003e9f57c4 ntfs-3g-0.20061115-BETA.tgz 559073
+RMD160 01cc67da61b4405a7a136a7c429a58958b1d717b ntfs-3g-0.20061115-BETA.tgz 559073
+SHA256 07688def198062931fab960e3c44bfd083e109e5e15f4c9d429b824d7c83c2cb ntfs-3g-0.20061115-BETA.tgz 559073
diff --git a/sys-fs/ntfs3g/ntfs3g-0.20061115-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-0.20061115-r1.ebuild
new file mode 100644
index 000000000000..e6ae6ec44749
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-0.20061115-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-0.20061115-r1.ebuild,v 1.1 2006/11/20 16:43:02 chutzpah Exp $
+
+inherit linux-info
+
+MY_PN="${PN/3g/-3g}"
+MY_PV="${PV}-BETA"
+MY_P="${MY_PN}-${MY_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 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-2.6.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="!FUSE_FS"
+ERR=" ${BAD}*${NORMAL}  "
+ERROR_FUSE_FS="For this version of ntfs-3g to work properly, you need to use the
+$ERR kernel module included in the package, not the kernel version. To do this
+$ERR remove FUSE from your kernel, recompile it then remerge FUSE.
+$ERR
+$ERR    emerge -a1 sys-fs/fuse
+$ERR
+$ERR You will need to reboot if you had FUSE in your kernel, if it was a module, this
+$ERR should be enough:
+$ERR
+$ERR    modprobe -r fuse
+$ERR    modprobe fuse
+$ERR
+$ERR If either of these commands have an error, you will need to reboot.
+$ERR"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# default makefile calls ldconfig
+	sed -ie '/ldconfig$/ d' src/Makefile.*
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog CREDITS NEWS README
+}