[patch] Same as before with some fixups

ntfs3g-fuse.patch (text/plain), 9.06 KB, created by Peter Levine on 2009-08-06 00:19:16 UTC

--- ntfs3g-1.2531.ebuild.old	2008-07-17 15:07:08.000000000 -0400
+++ ntfs3g-1.2531.ebuild	2009-08-05 20:08:39.060372656 -0400
@@ -2,8 +2,9 @@
 # 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 $
 
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
+inherit linux-info
+
+MY_P="${PN/3g/-3g}-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.ntfs-3g.org"
@@ -14,26 +15,44 @@
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="debug suid"
 
-RDEPEND=""
-DEPEND=""
+[[ ${KERNEL} == "linux" ]] && IUSE="${IUSE} fuse"
+
+RDEPEND="!kernel_linux? ( sys-fs/fuse )
+	kernel_linux? ( fuse? ( sys-fs/fuse ) )"
+
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="This build of ntfs-3g will continue but your kernel needs to be built 
+			with FUSE support for it to function at runtime."
+		linux-info_pkg_setup
+	fi
+}
+
 src_compile() {
+	local myconf
+
+	use kernel_linux && use fuse && myconf="--with-fuse=external"
+
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${myconf}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
+	prepalldocs || die "prepalldocs failed"
+	dodoc AUTHORS ChangeLog CREDITS || die "dodoc failed"
 
-	use suid && fperms u+s "/bin/${MY_PN}"
+	use suid && { fperms u+s "/bin/${PN/3g/-3g}" || die "could not change file permisions"; }
 }
 
 pkg_postinst() {
@@ -44,4 +63,12 @@
 		ewarn "then local users may be able to gain root access on your machine."
 		ewarn
 	fi
+
+	if  ! use kernel_linux || use kernel_linux && use fuse  ; then
+		ewarn
+		ewarn "ntfs-3g has been built with external FUSE support."
+		ewarn "If your system's FUSE package gets updated please rebuild ntfs-3g,"
+		ewarn "as failure to do so may break ntfs-3g functionality."
+		ewarn
+	fi
 }
--- ntfs3g-1.5130.ebuild.old	2009-01-19 14:47:03.000000000 -0500
+++ ntfs3g-1.5130.ebuild	2009-08-05 20:09:16.133372507 -0400
@@ -2,8 +2,9 @@
 # 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}"
+inherit linux-info
+
+MY_P="${PN/3g/-3g}-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.ntfs-3g.org"
@@ -14,31 +15,50 @@
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug hal suid"
 
-RDEPEND="hal? ( sys-apps/hal )"
+[[ ${KERNEL} == "linux" ]] && IUSE="${IUSE} fuse"
+
+RDEPEND="hal? ( sys-apps/hal )
+	!kernel_linux? ( sys-fs/fuse )
+	kernel_linux? ( fuse? ( sys-fs/fuse ) )"
+
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="This build of ntfs-3g will continue but your kernel needs to be built 
+			with FUSE support for it to function at runtime."
+		linux-info_pkg_setup
+	fi
+}
+
 src_compile() {
+	local myconf
+
+	use kernel_linux && use fuse && myconf="--with-fuse=external"
+
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${myconf}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
+	prepalldocs || die "prepalldocs failed"
+	dodoc AUTHORS ChangeLog CREDITS || die "dodoc failed"
 
-	use suid && fperms u+s "/bin/${MY_PN}"
+	use suid && { fperms u+s "/bin/${PN/3g/-3g}" || die "could not change file permisions"; }
 
 	if use hal; then
 		insinto /etc/hal/fdi/policy/
-		doins "${FILESDIR}/10-ntfs3g.fdi"
+		doins "${FILESDIR}/10-ntfs3g.fdi" || die "installation of 10-ntfs3g.fdi.2009 failed"
 	fi
 }
 
@@ -50,4 +70,12 @@
 		ewarn "then local users may be able to gain root access on your machine."
 		ewarn
 	fi
+
+	if  ! use kernel_linux || use kernel_linux && use fuse  ; then
+		ewarn
+		ewarn "ntfs-3g has been built with external FUSE support."
+		ewarn "If your system's FUSE package gets updated please rebuild ntfs-3g,"
+		ewarn "as failure to do so may break ntfs-3g functionality."
+		ewarn
+	fi
 }
--- ntfs3g-2009.2.1.ebuild.old	2009-02-12 11:21:24.000000000 -0500
+++ ntfs3g-2009.2.1.ebuild	2009-08-05 20:09:35.691372335 -0400
@@ -2,8 +2,9 @@
 # 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 $
 
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
+inherit linux-info
+
+MY_P="${PN/3g/-3g}-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.ntfs-3g.org"
@@ -14,31 +15,50 @@
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug hal suid"
 
-RDEPEND="hal? ( sys-apps/hal )"
+[[ ${KERNEL} == "linux" ]] && IUSE="${IUSE} fuse"
+
+RDEPEND="hal? ( sys-apps/hal )
+	!kernel_linux? ( sys-fs/fuse )
+	kernel_linux? ( fuse? ( sys-fs/fuse ) )"
+
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="This build of ntfs-3g will continue but your kernel needs to be built 
+			with FUSE support for it to function at runtime."
+		linux-info_pkg_setup
+	fi
+}
+
 src_compile() {
+	local myconf
+
+	use kernel_linux && use fuse && myconf="--with-fuse=external"
+
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${myconf}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
+	prepalldocs || die "prepalldocs failed"
+	dodoc AUTHORS ChangeLog CREDITS || die "dodoc failed"
 
-	use suid && fperms u+s "/bin/${MY_PN}"
+	use suid && { fperms u+s "/bin/${PN/3g/-3g}" || die "could not change file permisions"; }
 
 	if use hal; then
 		insinto /etc/hal/fdi/policy/
-		newins "${FILESDIR}/10-ntfs3g.fdi.2009" "10-ntfs3g.fdi"
+		newins "${FILESDIR}/10-ntfs3g.fdi.2009" "10-ntfs3g.fdi" || die "installation of 10-ntfs3g.fdi.2009 failed"
 	fi
 }
 
@@ -50,4 +70,12 @@
 		ewarn "then local users may be able to gain root access on your machine."
 		ewarn
 	fi
+
+	if  ! use kernel_linux || use kernel_linux && use fuse  ; then
+		ewarn
+		ewarn "ntfs-3g has been built with external FUSE support."
+		ewarn "If your system's FUSE package gets updated please rebuild ntfs-3g,"
+		ewarn "as failure to do so may break ntfs-3g functionality."
+		ewarn
+	fi
 }
--- ntfs3g-2009.3.8.ebuild.old	2009-08-02 09:39:09.000000000 -0400
+++ ntfs3g-2009.3.8.ebuild	2009-08-05 20:09:50.154621890 -0400
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2009.3.8.ebuild,v 1.4 2009/08/02 13:29:02 maekke Exp $
 
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
+inherit linux-info
+
+MY_P="${PN/3g/-3g}-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.ntfs-3g.org"
@@ -14,31 +15,50 @@
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 IUSE="debug hal suid"
 
-RDEPEND="hal? ( sys-apps/hal )"
+[[ ${KERNEL} == "linux" ]] && IUSE="${IUSE} fuse"
+
+RDEPEND="hal? ( sys-apps/hal )
+	!kernel_linux? ( sys-fs/fuse )
+	kernel_linux? ( fuse? ( sys-fs/fuse ) )"
+
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="This build of ntfs-3g will continue but your kernel needs to be built 
+			with FUSE support for it to function at runtime."
+		linux-info_pkg_setup
+	fi
+}
+
 src_compile() {
+	local myconf
+
+	use kernel_linux && use fuse && myconf="--with-fuse=external"
+
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-ldscript \
 		--disable-ldconfig \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${myconf}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
-	prepalldocs
-	dodoc AUTHORS ChangeLog CREDITS
+	prepalldocs || die "prepalldocs failed"
+	dodoc AUTHORS ChangeLog CREDITS || die "dodoc failed"
 
-	use suid && fperms u+s "/bin/${MY_PN}"
+	use suid && { fperms u+s "/bin/${PN/3g/-3g}" || die "could not change file permisions"; }
 
 	if use hal; then
 		insinto /etc/hal/fdi/policy/
-		newins "${FILESDIR}/10-ntfs3g.fdi.2009" "10-ntfs3g.fdi"
+		newins "${FILESDIR}/10-ntfs3g.fdi.2009" "10-ntfs3g.fdi" || die "installation of 10-ntfs3g.fdi.2009 failed"
 	fi
 }
 
@@ -50,4 +70,12 @@
 		ewarn "then local users may be able to gain root access on your machine."
 		ewarn
 	fi
+
+	if  ! use kernel_linux || use kernel_linux && use fuse  ; then
+		ewarn
+		ewarn "ntfs-3g has been built with external FUSE support."
+		ewarn "If your system's FUSE package gets updated please rebuild ntfs-3g,"
+		ewarn "as failure to do so may break ntfs-3g functionality."
+		ewarn
+	fi
 }