Version bump, add new "extras" USE flag. Drop some older versions.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

5 files changed, 24 insertions, 145 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index f7f45bb5eb5e..4a6ad00f2ec5 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ntfs3g
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.120 2011/12/29 20:37:13 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.121 2012/01/23 18:32:01 chutzpah Exp $
+
+*ntfs3g-2012.1.15 (23 Jan 2012)
+
+  23 Jan 2012; Patrick McLean <chutzpah@gentoo.org> -ntfs3g-2010.8.8.ebuild,
+  -ntfs3g-2010.10.2.ebuild, -ntfs3g-2011.1.15.ebuild, +ntfs3g-2012.1.15.ebuild,
+  metadata.xml:
+  Version bump, add new "extras" USE flag. Drop some older versions.
 
   29 Dec 2011; Mark Loeser <halcy0n@gentoo.org> ntfs3g-2011.4.12.ebuild:
   Stable for ppc64; bug #378829
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 5c49ad3c32bc..229396350481 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -15,6 +15,7 @@ file ownership, access right.
 	<use>
 		<flag name='external-fuse'>Use external FUSE library instead of internal
 		one. Must be disabled for unprivileged mounting to work.</flag>
+		<flag name='extras'>Enable extra ntfsprogs utilities.</flag>
 		<flag name='udev'>Install udev rule to make udisks use ntfs-3g instead
 		of the kernel NTFS driver.</flag>
 		<flag name='crypt'>Add support for encrypted NTFS drives/partitions.</flag>
diff --git a/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild
deleted file mode 100644
index 772a7cad0734..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild,v 1.4 2011/01/04 16:40:26 chutzpah Exp $
-
-EAPI=2
-inherit linux-info
-
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl debug suid +udev +external-fuse"
-
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-apps/attr"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-ldscript \
-		--disable-ldconfig \
-		--with-fuse=$(use external-fuse && echo external || echo internal) \
-		$(use_enable acl posix-acls) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog CREDITS README
-
-	use suid && fperms u+s "/bin/${MY_PN}"
-
-	if use udev; then
-		insinto /etc/udev/rules.d/
-		doins "${FILESDIR}/99-ntfs3g.rules"
-	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-2010.8.8.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild
deleted file mode 100644
index 78715ccb1508..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild,v 1.9 2011/02/26 07:58:52 xarthisius Exp $
-
-EAPI=2
-inherit linux-info
-
-MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE="acl debug suid udev +external-fuse"
-
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-apps/attr"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-ldscript \
-		--disable-ldconfig \
-		--with-fuse=$(use external-fuse && echo external || echo internal) \
-		$(use_enable acl posix-acls) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog CREDITS README
-
-	use suid && fperms u+s "/bin/${MY_PN}"
-
-	if use udev; then
-		insinto /etc/udev/rules.d/
-		doins "${FILESDIR}/99-ntfs3g.rules"
-	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-2011.1.15.ebuild b/sys-fs/ntfs3g/ntfs3g-2012.1.15.ebuild
index 76b12ea0d30e..06e6bfcf7d49 100644
--- a/sys-fs/ntfs3g/ntfs3g-2011.1.15.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2012.1.15.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2011.1.15.ebuild,v 1.1 2011/02/02 00:01:45 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2012.1.15.ebuild,v 1.1 2012/01/23 18:32:01 chutzpah Exp $
 
 EAPI=2
 inherit linux-info
 
 MY_PN="${PN/3g/-3g}"
-MY_P="${MY_PN}-${PV}"
+MY_P="${MY_PN}_ntfsprogs-${PV}"
 
 DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
 HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
@@ -15,9 +15,12 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl debug suid xattr +udev +external-fuse"
+IUSE="acl crypt debug extras ntfsprogs suid static-libs xattr +udev +external-fuse"
+
+RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
+	ntfsprogs? ( !!sys-fs/ntfsprogs )
+	crypt? ( net-libs/gnutls )"
 
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-apps/attr"
@@ -42,6 +45,10 @@ src_configure() {
 		--disable-ldconfig \
 		--with-fuse=$(use external-fuse && echo external || echo internal) \
 		$(use_enable acl posix-acls) \
+		$(use_enable crypt crypto) \
+		$(use_enable extras) \
+		$(use_enable ntfsprogs) \
+		$(use_enable static-libs static) \
 		$(use_enable xattr xattr-mappings)	\
 		$(use_enable debug)
 }
@@ -57,6 +64,8 @@ src_install() {
 		insinto /etc/udev/rules.d/
 		doins "${FILESDIR}/99-ntfs3g.rules"
 	fi
+
+	find "${D}" -name '*.la' -delete
 }
 
 pkg_postinst() {