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

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

6 files changed, 22 insertions, 77 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/Manifest b/sys-fs/ntfs3g/Manifest
index 6ac0db254209..979b1aa964f4 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,10 +1,9 @@
-AUX 10-ntfs3g.fdi.2009-r1 3065 RMD160 38d92bb8e2be61cc0adde5ff8239b8caff657b91 SHA1 41ca7eeeba9cf01c04032d41e4a8beeaf0165cfe SHA256 680da3e23313260a586b7f986d2cc9440c14485dfbbf16748a6cefab83c38e2d
 AUX 99-ntfs3g.rules 51 RMD160 5c022fc946d0a695f8ef0dde7b8be42080bc8162 SHA1 01c821c46815c8bbe7560455fc22cc355c3844a2 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463
 DIST ntfs-3g-2010.10.2.tgz 875186 RMD160 8c545928cc1741fa0f1d20a9a04b0cde9f4499cf SHA1 97531dc0e556596e6bf2169863e9b8368c7d2bd0 SHA256 17c7e7f1ea22951bdefaa8aa0e36a011f65fbc76fc3511d16433c46d899e9e71
 DIST ntfs-3g-2010.3.6.tgz 837069 RMD160 9a6f69d43a6f59aa2251452fec8f2000e7b15f89 SHA1 ddbecaf15ab8a679024a2c934e692942eaf0d44b SHA256 cca0a36e914824f626b4f6f94318f84ca0d9996ad61e161fe112a6401601895f
 DIST ntfs-3g-2010.8.8.tgz 875039 RMD160 07521bd66c4cd26bb40ac84629159eec8d8da43d SHA1 f9862700905b23b06e7944f663352227b9c776a6 SHA256 f53bf5c3329f177ba2a6e34fa1d9093c47076f8104f4281259fa6df54e597755
-EBUILD ntfs3g-2010.10.2.ebuild 1883 RMD160 f4c72d42c2700c5a89136b810544563cbb6782c9 SHA1 09dde60b83868151429a551169808b3efc32cd75 SHA256 3d4314c65234eda3e1383f5d72cf2ce83aeea1dd42816c5c36a9ef47095ce98f
-EBUILD ntfs3g-2010.3.6.ebuild 1890 RMD160 c937875323f428724bef353771c1e69a3992ab15 SHA1 f3968893fda3271c1a73ecb9ff73f3f32876d521 SHA256 bd417530c3bba33e85593cca2d93e3eb51f4204d5aa28e531bd89b12432c759e
-EBUILD ntfs3g-2010.8.8.ebuild 1880 RMD160 74b6ebefc8d949564c40e8ce1d99baf5fc09833b SHA1 9fcb4cd2477dae9e4d6d4c788ac26a5aef38e04b SHA256 6989c5c275d3795db51d27d3cfee39ecac411c16852dba8c9f733ef778de0f73
-MISC ChangeLog 17404 RMD160 5a96fff3a53c67a33c8f72cb9fcf9922567ccbe8 SHA1 d6ad17d920b7079267749056622b6b3dfbbc24da SHA256 3a9ccfe70572d4a11e94c904c0daefa9888c83bfd04934839e083b7ed63cb722
+EBUILD ntfs3g-2010.10.2.ebuild 1747 RMD160 45c76c93fa727e1e90703357cbc2f892e39d438d SHA1 78050b4b78b900291f0272917d4d3eb1b6bf2acf SHA256 7dd07822eacdc1e55a7274c9fe27e5fa09e350e5645e70e77ef22c68c9c2aeaf
+EBUILD ntfs3g-2010.3.6.ebuild 1706 RMD160 9f6daee2db329f84dce61ccd636d6a68b211802a SHA1 9577703e298c5a0e2f09d93575fec977a94c3698 SHA256 cd3c571e0d23241aa81faf1d3a6ef49ec8108c9f891f111db40212a19d8bc5e4
+EBUILD ntfs3g-2010.8.8.ebuild 1744 RMD160 e2a030b9a3ad195d33fc40ae4d72eb037030ee93 SHA1 6706a443b9d9c6fd44be03d8ffc597461785ff5d SHA256 affa93a8ad0b560abda88927d0e50366c39f9f1333be0dd3db3256285536ebf1
+MISC ChangeLog 17664 RMD160 16d87e4bd17b2cf0138224f0b32c850fdf827d89 SHA1 6f955a5075810454e62e3ee73388935346cb4d84 SHA256 419fd930fe5a039f73271e7e5fdaf98fc6b9aac37a044088a679b025b1cca2d6
 MISC metadata.xml 897 RMD160 76187fd12b99183da3bed1f7199d0ba53a519347 SHA1 293925db5b659fff430f529bffa3c1e28cc7c4dd SHA256 a252ae0382b9ed05cf32b86abb147bfd08c00f64a5a55929fa675f8b3b16c53f
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"