summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/ntfs3g/ChangeLog8
-rw-r--r--sys-fs/ntfs3g/files/10-ntfs3g.fdi10
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2009.11.14.ebuild (renamed from sys-fs/ntfs3g/ntfs3g-1.2531.ebuild)25
3 files changed, 24 insertions, 19 deletions
diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index 479bdd5f84c2..6c02b790cd79 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.85 2009/10/28 22:32:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.86 2009/11/17 05:39:48 chutzpah Exp $
+
+*ntfs3g-2009.11.14 (17 Nov 2009)
+
+ 17 Nov 2009; Patrick McLean <chutzpah@gentoo.org> -files/10-ntfs3g.fdi,
+ -ntfs3g-1.2531.ebuild, +ntfs3g-2009.11.14.ebuild:
+ Version bump, clean out final 1.x version.
*ntfs3g-2009.4.4-r1 (28 Oct 2009)
diff --git a/sys-fs/ntfs3g/files/10-ntfs3g.fdi b/sys-fs/ntfs3g/files/10-ntfs3g.fdi
deleted file mode 100644
index 488f47bb72cd..000000000000
--- a/sys-fs/ntfs3g/files/10-ntfs3g.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
- <device>
- <match key="volume.fstype" string="ntfs">
- <merge key="volume.fstype" type="string">ntfs-3g</merge>
- <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
- <append key="volume.mount.valid_options" type="strlist">locale=</append>
- </match>
- </device>
-</deviceinfo>
diff --git a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild b/sys-fs/ntfs3g/ntfs3g-2009.11.14.ebuild
index def70e4e84d2..e14e07fb72ff 100644
--- a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2009.11.14.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-1.2531.ebuild,v 1.6 2009/08/21 14:40:56 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2009.11.14.ebuild,v 1.1 2009/11/17 05:39:48 chutzpah Exp $
+
+EAPI=2
MY_PN="${PN/3g/-3g}"
MY_P="${MY_PN}-${PV}"
@@ -11,29 +13,36 @@ SRC_URI="http://www.ntfs-3g.org/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="debug suid"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug hal suid +external-fuse"
-RDEPEND=""
-DEPEND=""
+RDEPEND=">=sys-fs/fuse-2.6.0
+ hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
-src_compile() {
+src_configure() {
econf \
--docdir="/usr/share/doc/${PF}" \
--enable-ldscript \
--disable-ldconfig \
+ --with-fuse=$(use external-fuse && echo external || echo internal) \
$(use_enable debug)
- emake || die "emake failed"
}
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}"
+
+ if use hal; then
+ insinto /etc/hal/fdi/policy/
+ newins "${FILESDIR}/10-ntfs3g.fdi.2009-r1" "10-ntfs3g.fdi"
+ fi
}
pkg_postinst() {