Remove obsolete sys-apps/hal support. This package is shipping with working udev rules.

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

5 files changed, 18 insertions, 72 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index 230a60b1ac6b..b6454c5488c3 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.108 2010/11/27 22:24:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.109 2010/12/19 01:08:07 ssuominen Exp $
+
+  19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -files/10-ntfs3g.fdi.2009-r1, ntfs3g-2010.3.6.ebuild, ntfs3g-2010.8.8.ebuild,
+  ntfs3g-2010.10.2.ebuild:
+  Remove obsolete sys-apps/hal support. This package is shipping with working
+  udev rules.
 
   27 Nov 2010; Michael Weber <xmw@gentoo.org> ntfs3g-2010.8.8.ebuild,
   ntfs3g-2010.10.2.ebuild:
diff --git a/sys-fs/ntfs3g/files/10-ntfs3g.fdi.2009-r1 b/sys-fs/ntfs3g/files/10-ntfs3g.fdi.2009-r1
deleted file mode 100644
index efeac866dedd..000000000000
--- a/sys-fs/ntfs3g/files/10-ntfs3g.fdi.2009-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-   	<match key="volume.fstype" string="ntfs">
-        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
-        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
-        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
-        <merge key="volume.fstype" type="string">ntfs-3g</merge>
-       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
-        <append key="volume.mount.valid_options" type="strlist">atime</append>
-        <append key="volume.mount.valid_options" type="strlist">noatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
-       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
-       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
-       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
-      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
-       	<append key="volume.mount.valid_options" type="strlist">silent</append>
-       	<append key="volume.mount.valid_options" type="strlist">force</append>
-       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
-       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
-       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
-       	<append key="volume.mount.valid_options" type="strlist">debug</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
-       	<append key="volume.mount.valid_options" type="strlist">sync</append>
-       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
-       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
-       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.valid_options" type="strlist">quiet</append>
-       	<append key="volume.mount.valid_options" type="strlist">remount</append>
-       	<append key="volume.mount.valid_options" type="strlist">exec</append>
-       	<append key="volume.mount.valid_options" type="strlist">recover</append>
-       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
-       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
-       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-	</match>
-  </device>
-</deviceinfo>
\ No newline at end of file
diff --git a/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild
index 70c8c5b410bd..1cd530829b8e 100644
--- a/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.2 2010/11/27 22:24:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.10.2.ebuild,v 1.3 2010/12/19 01:08:07 ssuominen Exp $
 
 EAPI=2
 inherit linux-info
@@ -15,10 +15,9 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl debug hal suid udev +external-fuse"
+IUSE="acl debug suid udev +external-fuse"
 
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
-	hal? ( sys-apps/hal )"
+RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-apps/attr"
@@ -53,11 +52,6 @@ src_install() {
 
 	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
-
 	if use udev; then
 		insinto /etc/udev/rules.d/
 		doins "${FILESDIR}/99-ntfs3g.rules"
diff --git a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild
index 3c755517c809..91de2acf2ea8 100644
--- a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild,v 1.6 2010/08/13 13:54:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild,v 1.7 2010/12/19 01:08:07 ssuominen Exp $
 
 EAPI=2
 inherit linux-info
@@ -15,10 +15,9 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="acl debug hal suid udev +external-fuse"
+IUSE="acl debug suid udev +external-fuse"
 
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.6.0 )
-	hal? ( sys-apps/hal )"
+RDEPEND="external-fuse? ( >=sys-fs/fuse-2.6.0 )"
 DEPEND="${RDEPEND}
 	sys-apps/attr"
 
@@ -46,18 +45,13 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die
 
-	prepalldocs || die "prepalldocs failed"
+	prepalldocs
 	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
-
 	if use udev; then
 		insinto /etc/udev/rules.d/
 		doins "${FILESDIR}/99-ntfs3g.rules"
diff --git a/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild
index f9811e76f9ec..98b5fb20aaea 100644
--- a/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.6 2010/11/27 22:24:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.8.8.ebuild,v 1.7 2010/12/19 01:08:07 ssuominen Exp $
 
 EAPI=2
 inherit linux-info
@@ -15,10 +15,9 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="acl debug hal suid udev +external-fuse"
+IUSE="acl debug suid udev +external-fuse"
 
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
-	hal? ( sys-apps/hal )"
+RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-apps/attr"
@@ -53,11 +52,6 @@ src_install() {
 
 	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
-
 	if use udev; then
 		insinto /etc/udev/rules.d/
 		doins "${FILESDIR}/99-ntfs3g.rules"