ingore sun disklabel partition. remove old versions

Package-Manager: portage-2.1.3_rc9

10 files changed, 46 insertions, 723 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c83c569bd232..9a37975aec70 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.198 2007/07/26 19:27:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.199 2007/08/01 13:40:16 cardoe Exp $
+
+  01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/99_sun_disklabel_ignore.patch, -hal-0.5.7.1-r3.ebuild,
+  -hal-0.5.9.ebuild, -hal-0.5.9.1.ebuild, hal-0.5.9.1-r1.ebuild:
+  ingore sun disklabel partition. remove old versions
 
 *hal-0.5.9.1-r1 (26 Jul 2007)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index be2783e95c3c..fd073e992642 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -121,6 +121,10 @@ AUX 0.5.9/98_hald_cache_test_path.patch 898 RMD160 da4949adae527cee5379566602724
 MD5 5b0e12ba184d9d5049af5b2c2fb17100 files/0.5.9/98_hald_cache_test_path.patch 898
 RMD160 da4949adae527cee53795666027243161a20400e files/0.5.9/98_hald_cache_test_path.patch 898
 SHA256 dd60c1165b79301099053cf299f9b1aaea23c1a767a5494ab896590fd2a368e0 files/0.5.9/98_hald_cache_test_path.patch 898
+AUX 0.5.9/99_sun_disklabel_ignore.patch 841 RMD160 268f8ada789f6ff8dfce8dcc460af4d722655be1 SHA1 b89e57f89d12d702ae662657c3e985cd0c499f66 SHA256 16746216e574f2d257c39bea791cd6c97f4287b5666c2b041314ba5d286a923f
+MD5 716cf856265e1a6ee44e557eca6e58e4 files/0.5.9/99_sun_disklabel_ignore.patch 841
+RMD160 268f8ada789f6ff8dfce8dcc460af4d722655be1 files/0.5.9/99_sun_disklabel_ignore.patch 841
+SHA256 16746216e574f2d257c39bea791cd6c97f4287b5666c2b041314ba5d286a923f files/0.5.9/99_sun_disklabel_ignore.patch 841
 AUX 0.5.9/series 913 RMD160 2a2b8a1f05b5c05836d2256de76b93881f641c9c SHA1 1295f0bab008dd35aec23a76d277ac2b788d7929 SHA256 6f14ceebefb7ece24416b44f88a4016a80e4a43069717bf3209bb054258cd49b
 MD5 98505549c8d42b7863533161f2fa27fe files/0.5.9/series 913
 RMD160 2a2b8a1f05b5c05836d2256de76b93881f641c9c files/0.5.9/series 913
@@ -216,10 +220,6 @@ SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b files/ha
 DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
-EBUILD hal-0.5.7.1-r3.ebuild 6200 RMD160 b16cab4908cf6687cd940899722619c340f341b9 SHA1 3509ce31085492b4484a5626adcbd9d60cf2d411 SHA256 6f504c8738b91084766b814a5b5bbbe94d014c585da3d28db80fb92b0c3621ea
-MD5 1c7bec06ad8f2ac5ea2940d7e1c60f7f hal-0.5.7.1-r3.ebuild 6200
-RMD160 b16cab4908cf6687cd940899722619c340f341b9 hal-0.5.7.1-r3.ebuild 6200
-SHA256 6f504c8738b91084766b814a5b5bbbe94d014c585da3d28db80fb92b0c3621ea hal-0.5.7.1-r3.ebuild 6200
 EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 3c73c97453ac22538ab89eec51eda26521806c16 SHA1 5266847a40d9ee1ecfcc07d11f3bfb90107fed68 SHA256 f4579e19f2c36c4cc8e4e9c659363e02ba7cdb50dc292d2f055aa255bf3a7118
 MD5 587f5a6b4bd251fdf0763d7a30ec7546 hal-0.5.7.1-r5.ebuild 6426
 RMD160 3c73c97453ac22538ab89eec51eda26521806c16 hal-0.5.7.1-r5.ebuild 6426
@@ -228,48 +228,31 @@ EBUILD hal-0.5.9-r1.ebuild 8494 RMD160 fe58efe116ef6813695bdd4e4ba43b4c3fbf16d0
 MD5 8ad7d1d5ea9942608cc07894b5991328 hal-0.5.9-r1.ebuild 8494
 RMD160 fe58efe116ef6813695bdd4e4ba43b4c3fbf16d0 hal-0.5.9-r1.ebuild 8494
 SHA256 744df25cd7bfa05d7ff63b665d1c3c1caf2c41704672a414355d1f988458d85d hal-0.5.9-r1.ebuild 8494
-EBUILD hal-0.5.9.1-r1.ebuild 7495 RMD160 13af2df6fbfed992b3e681a4ac82900641396524 SHA1 b88914c3a7e8caafc1eea7634e16e0cec01a1942 SHA256 be42ccf34283f284f9d09296765088daec0734f6b91afb00b8ce2751e958b251
-MD5 b3c36acef358a1a4adff4e91658e5e6e hal-0.5.9.1-r1.ebuild 7495
-RMD160 13af2df6fbfed992b3e681a4ac82900641396524 hal-0.5.9.1-r1.ebuild 7495
-SHA256 be42ccf34283f284f9d09296765088daec0734f6b91afb00b8ce2751e958b251 hal-0.5.9.1-r1.ebuild 7495
-EBUILD hal-0.5.9.1.ebuild 7436 RMD160 aa24bacea7c7332f2e1b7e2e737076ef56e9b422 SHA1 31e2f6ad3376b0389ef2c2f3cce50bf53c13d6b1 SHA256 2ab4e12698f45e8bfd38f7bcbba5b2aa2c05c602b090c612d4694b6cdcd5c0c0
-MD5 808ebd0508d8fd53bc547ba1bc0c9fd3 hal-0.5.9.1.ebuild 7436
-RMD160 aa24bacea7c7332f2e1b7e2e737076ef56e9b422 hal-0.5.9.1.ebuild 7436
-SHA256 2ab4e12698f45e8bfd38f7bcbba5b2aa2c05c602b090c612d4694b6cdcd5c0c0 hal-0.5.9.1.ebuild 7436
-EBUILD hal-0.5.9.ebuild 7206 RMD160 879864b58d120952660fdd73a653255e649a4a5e SHA1 ca3bc937091e2cae2621ec888c20f36507e9f876 SHA256 d8e0c00f44943c2d2b49c0b522c8f5cd25bae203219289e95038ca03beca895f
-MD5 6ef09e5ba99c67fc9df07e7ad39575ec hal-0.5.9.ebuild 7206
-RMD160 879864b58d120952660fdd73a653255e649a4a5e hal-0.5.9.ebuild 7206
-SHA256 d8e0c00f44943c2d2b49c0b522c8f5cd25bae203219289e95038ca03beca895f hal-0.5.9.ebuild 7206
-MISC ChangeLog 32694 RMD160 0ce3587b5b3a5174b6f57d8b3e1a3f3894e0bf80 SHA1 e32baa255c4099195c90f1407bc269fc8453b3a3 SHA256 eac3453dd3784487da83d455c9ef2defe0596660ec19f397b6a132d39d5ee872
-MD5 019e8afa7eb753c9bb8a03ff57bb57a1 ChangeLog 32694
-RMD160 0ce3587b5b3a5174b6f57d8b3e1a3f3894e0bf80 ChangeLog 32694
-SHA256 eac3453dd3784487da83d455c9ef2defe0596660ec19f397b6a132d39d5ee872 ChangeLog 32694
+EBUILD hal-0.5.9.1-r1.ebuild 7549 RMD160 fba98604643801ddee19765a11c7c5366f6e92ab SHA1 de46196d08d6bbb299f6fe85ecd3865130f8c84d SHA256 ffb2f8403baabd78c9210136f00448f88a2eb5276253d7760e9e0b345881b495
+MD5 8d9dc402a368fc77d67b10d6727ef6c9 hal-0.5.9.1-r1.ebuild 7549
+RMD160 fba98604643801ddee19765a11c7c5366f6e92ab hal-0.5.9.1-r1.ebuild 7549
+SHA256 ffb2f8403baabd78c9210136f00448f88a2eb5276253d7760e9e0b345881b495 hal-0.5.9.1-r1.ebuild 7549
+MISC ChangeLog 32932 RMD160 60307f2583b86c1431ccddac279ebb311729effb SHA1 cbb5e514b1149c7cf01a8802d2de601952d0ba35 SHA256 69894bdaa2b3532b292d43a770bb48de4dd40787fdc7f527e9d81092d6fc3474
+MD5 0392151a73b948602156c5e3691d0a73 ChangeLog 32932
+RMD160 60307f2583b86c1431ccddac279ebb311729effb ChangeLog 32932
+SHA256 69894bdaa2b3532b292d43a770bb48de4dd40787fdc7f527e9d81092d6fc3474 ChangeLog 32932
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
 SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d metadata.xml 345
-MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r3 238
-RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r3 238
-SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r3 238
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r5 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r5 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r5 238
-MD5 75c89219e1c767bdbfa9942258c86827 files/digest-hal-0.5.9 232
-RMD160 6244ab5be8bbc652f1130c2715f32bf881710f31 files/digest-hal-0.5.9 232
-SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/digest-hal-0.5.9 232
 MD5 75c89219e1c767bdbfa9942258c86827 files/digest-hal-0.5.9-r1 232
 RMD160 6244ab5be8bbc652f1130c2715f32bf881710f31 files/digest-hal-0.5.9-r1 232
 SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/digest-hal-0.5.9-r1 232
-MD5 0b6b9a1ce7f87610dbda3f922db15fa9 files/digest-hal-0.5.9.1 238
-RMD160 2cb1ef22b4ce904b95d1f944b9d0263a93c0f968 files/digest-hal-0.5.9.1 238
-SHA256 a4b6fc77fa4c4a013240b9cb2eea17745527ec0175bd22f395733d386ae31b2b files/digest-hal-0.5.9.1 238
 MD5 0b6b9a1ce7f87610dbda3f922db15fa9 files/digest-hal-0.5.9.1-r1 238
 RMD160 2cb1ef22b4ce904b95d1f944b9d0263a93c0f968 files/digest-hal-0.5.9.1-r1 238
 SHA256 a4b6fc77fa4c4a013240b9cb2eea17745527ec0175bd22f395733d386ae31b2b files/digest-hal-0.5.9.1-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGqPWRKRy60XGEcJIRAkyLAJwIDYVPi1WO+Z2wW+SNnPxez10p2gCgqaiU
-m9NYZU55HwgisuEtAcE3KLE=
-=qk0L
+iD8DBQFGsI1IoeSe8B0zEfwRAuilAJ41Wd0x03rdEaZ/AfXKb6+KzHD9RACdGFmH
+QWZgMGHU94PowOoEkYIpLA0=
+=S96R
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch
new file mode 100644
index 000000000000..451ab4fb0abf
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch
@@ -0,0 +1,22 @@
+Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-07-27 12:26:05.000000000 -0400
++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-07-27 12:26:22.000000000 -0400
+@@ -16,4 +16,17 @@
+       </match>
+     </match>
+   </device>
++
++  <!-- sun disklabel -->
++  <device>
++    <match key="volume.fsusage" string="filesystem">
++      <match key="volume.partition.number" int="3">
++        <match key="volume.partition.start" uint64="0">
++          <match key="@block.storage_device:storage.size" uint64="@volume.size">
++            <merge key="volume.ignore" type="bool">true</merge>
++          </match>
++        </match>
++      </match>
++    </match>
++  </device>
+ </deviceinfo>
diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1-r3 b/sys-apps/hal/files/digest-hal-0.5.7.1-r3
deleted file mode 100644
index 3042516ecf0a..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.7.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz 1503156
-RMD160 2861818b29546bd3628b1bda3d41238cf644c644 hal-0.5.7.1.tar.gz 1503156
-SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b hal-0.5.7.1.tar.gz 1503156
diff --git a/sys-apps/hal/files/digest-hal-0.5.9 b/sys-apps/hal/files/digest-hal-0.5.9
deleted file mode 100644
index bf095eb8f645..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a6f532770cf9286e1de38d6570cbc6bc hal-0.5.9.tar.gz 1587364
-RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 hal-0.5.9.tar.gz 1587364
-SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d hal-0.5.9.tar.gz 1587364
diff --git a/sys-apps/hal/files/digest-hal-0.5.9.1 b/sys-apps/hal/files/digest-hal-0.5.9.1
deleted file mode 100644
index 1964bb97ee92..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a40f49f964e64358e53652038f3059f hal-0.5.9.1.tar.gz 1596347
-RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f hal-0.5.9.1.tar.gz 1596347
-SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b hal-0.5.9.1.tar.gz 1596347
diff --git a/sys-apps/hal/hal-0.5.7.1-r3.ebuild b/sys-apps/hal/hal-0.5.7.1-r3.ebuild
deleted file mode 100644
index 3b300dc3a925..000000000000
--- a/sys-apps/hal/hal-0.5.7.1-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r3.ebuild,v 1.14 2007/07/08 05:58:39 mr_bones_ Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="acpi crypt debug doc dmi pcmcia selinux"
-
-RDEPEND=">=dev-libs/glib-2.6
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.60 )
-	>=sys-fs/udev-083
-	>=sys-apps/util-linux-2.12r
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	dev-libs/expat
-	sys-libs/libcap
-	sys-apps/pciutils
-	dev-libs/libusb
-	virtual/eject
-	dmi? ( >=sys-apps/dmidecode-2.7 )
-	crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-
-function notify_uevent() {
-	eerror
-	eerror "You must enable Kernel Userspace Events in your kernel."
-	eerror "This can be set under 'General Setup'.  It is marked as"
-	eerror "CONFIG_KOBJECT_UEVENT in the config file."
-	eerror
-	ebeep 5
-}
-
-function notify_uevent_2_6_16() {
-	eerror
-	eerror "You must enable Kernel Userspace Events in your kernel."
-	eerror "For this you need to enable 'Hotplug' under 'General Setup' and"
-	eerror "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
-	eerror "in the config file."
-	eerror
-	ebeep 5
-}
-
-function notify_procfs() {
-	eerror
-	eerror "You must enable the proc filesystem in your kernel."
-	eerror "For this you need to enable '/proc file system support' under"
-	eerror "'Pseudo filesystems' in 'File systems'.  It is marked"
-	eerror "CONFIG_PROC_FS in the config file."
-	eerror
-	ebeep 5
-}
-
-pkg_setup() {
-	get_version || eerror "Unable to calculate Linux Kernel version"
-
-	kernel_is ge 2 6 15 || eerror "HAL requires a kernel version 2.6.15 or newer"
-
-	if kernel_is lt 2 6 16 ; then
-		linux_chkconfig_present KOBJECT_UEVENT || notify_uevent
-	else
-		(linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET) \
-			|| notify_uevent_2_6_16
-	fi
-
-	if use acpi ; then
-		linux_chkconfig_present PROC_FS || notify_procfs
-	fi
-
-	if [ -d ${ROOT}/etc/hal/device.d ]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# handle ignored volumes properly
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-ignored-volumes.patch
-
-	# Fix bash in hald scripts
-	epatch "${FILESDIR}"/${PN}-0.5.7-hald-scripts.patch
-
-	# probe partition table
-	epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch
-
-	# fix pmu support crash
-	epatch "${FILESDIR}"/${PN}-0.5.7-pmu-fix.patch
-
-	# unclean unmount
-	epatch "${FILESDIR}"/${PN}-0.5.7-unclean-unmount-r1.patch
-
-	# allow plugdev group people to mount
-	epatch "${FILESDIR}"/${PN}-0.5.7-plugdev-allow-send.patch
-
-	# rescan devices on resume
-	epatch "${FILESDIR}"/${PN}-0.5.7-rescan-on-resume.patch
-
-	# detect hibernate-ram script as well
-	epatch "${FILESDIR}"/${PN}-0.5.7-hibernate.patch
-
-	# dbus deprecated dbus_connection_disconnect
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch
-
-	# sr driver fix
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-sr-driver.patch
-
-	# hibernate sequence fix
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix.patch
-}
-
-src_compile() {
-	if [ -r "${ROOT}/usr/share/misc/pci.ids.gz" ] ; then
-		hwdata="${ROOT}/usr/share/misc/pci.ids.gz"
-	elif [ -r "${ROOT}/usr/share/misc/pci.ids" ] ; then
-		hwdata="${ROOT}/usr/share/misc/pci.ids"
-	else
-		die "pci.ids file not found. please file a bug @ bugs.gentoo.org"
-	fi
-
-	econf \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-os-type=gentoo \
-		--with-pid-file=/var/run/hald.pid \
-		--with-hwdata=${hwdata} \
-		--enable-hotplug-map \
-		$(use_enable debug verbose-mode) \
-		$(use_enable pcmcia pcmcia-support) \
-		$(use_enable acpi acpi-proc) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable selinux) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5-hald.rc hald
-
-	# Script to unmount devices if they are yanked out (from upstream)
-	exeinto /etc/dev.d/default
-	doexe "${FILESDIR}"/hal-unmount.dev
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	dodir /media
-	keepdir /media
-}
-
-pkg_postinst() {
-	# Despite what people keep changing this location. Either one works.. it doesn't matter
-	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
-	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
-
-	# HAL drops priviledges by default now ...
-	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	usermod -G ${HALDAEMON_GROUPS} haldaemon
-
-	elog "The HAL daemon needs to be running for certain applications to"
-	elog "work. Suggested is to add the init script to your start-up"
-	elog "scripts, this should be done like this :"
-	elog "\`rc-update add hald default\`"
-	echo
-	elog "Looking for automounting support? Add yourself to the plugdev group"
-}
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
index 13a3d2033fba..fa715424ed03 100644
--- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.1 2007/07/26 19:27:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.2 2007/08/01 13:40:16 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -119,6 +119,7 @@ src_unpack() {
 	epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch
 	epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch
 	epatch ${FILESDIR}/0.5.9/98_hald_cache_test_path.patch
+	epatch ${FILESDIR}/0.5.9/99_sun_disklabel_ignore.patch
 
 	eautoreconf
 }
diff --git a/sys-apps/hal/hal-0.5.9.1.ebuild b/sys-apps/hal/hal-0.5.9.1.ebuild
deleted file mode 100644
index b7b01565ca1d..000000000000
--- a/sys-apps/hal/hal-0.5.9.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1.ebuild,v 1.5 2007/07/10 12:52:55 armin76 Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=dev-libs/dbus-glib-0.61
-		kernel_linux? ( >=sys-fs/udev-104 )
-		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
-		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
-		kernel_FreeBSD? ( dev-libs/libvolume_id )
-		>=dev-libs/expat-1.95.8
-		>=sys-apps/pciutils-2.2.3
-		>=dev-libs/libusb-0.1.10a
-		sys-apps/usbutils
-		virtual/eject
-		amd64? ( >=sys-apps/dmidecode-2.7 )
-		x86? ( >=sys-apps/dmidecode-2.7 )
-		ia64? ( >=sys-apps/dmidecode-2.7 )
-		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( >=sys-apps/parted-1.7.1 )
-		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) )
-		selinux? ( sys-libs/libselinux
-					sec-policy/selinux-hal )"
-#		pam? ( sys-auth/consolekit )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc? ( app-doc/doxygen
-				app-text/docbook-sgml-utils
-				app-text/xmlto )"
-
-PDEPEND="app-misc/hal-info"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
-
-function notify_uevent() {
-	ewarn
-	ewarn "You must enable Kernel Userspace Events in your kernel."
-	ewarn "For this you need to enable 'Hotplug' under 'General Setup' and"
-	ewarn "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
-	ewarn "in the config file."
-	ewarn
-	ebeep 5
-}
-
-function notify_procfs() {
-	ewarn
-	ewarn "You must enable the proc filesystem in your kernel."
-	ewarn "For this you need to enable '/proc file system support' under"
-	ewarn "'Pseudo filesystems' in 'File systems'.  It is marked"
-	ewarn "CONFIG_PROC_FS in the config file."
-	ewarn
-	ebeep 5
-}
-
-function notify_inotify() {
-	ewarn
-	ewarn "You must enable the Inotify system in your kernel."
-	ewarn "For this you need to enable 'Inotify support for userspace'"
-	ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file."
-	ewarn
-	ebeep 5
-}
-
-pkg_setup() {
-	if built_with_use --missing false sys-apps/pciutils zlib ; then
-		eerror "You MUST build sys-apps/pciutils without the zlib USE flag"
-		die "You MUST build sys-apps/pciutils without the zlib USE flag"
-	fi
-
-	if use kernel_linux; then
-		kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
-
-		if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
-		then
-			notify_uevent
-		fi
-
-		linux_chkconfig_present INOTIFY_USER || notify_inotify
-
-		if use acpi ; then
-			linux_chkconfig_present PROC_FS || notify_procfs
-		fi
-	fi
-
-	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Gentoo patchset
-	epatch ${FILESDIR}/0.5.9/07_malloc_h_for_stdlib_h.patch
-	#epatch ${FILESDIR}/0.5.9/95_gentoo_man_page.patch
-	epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch
-	epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch
-	epatch ${FILESDIR}/0.5.9/98_hald_cache_test_path.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local backend=""
-	local acpi=""
-
-	# TODO :: policykit should have a pam useflag
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if ! use acpi ; then
-		acpi="--disable-acpi-proc --disable-acpi-acpid"
-	fi
-
-	econf --disable-policy-kit \
-		  --docdir=/usr/share/doc/${PF} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-socket-dir=/var/run/hald \
-		  --with-hwdata=/usr/share/misc \
-		  --enable-hotplug-map \
-		  --enable-man-pages \
-		  --with-backend=${backend} \
-		  $(use_enable debug verbose-mode) \
-		  $(use_with dell dell-backlight) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable pcmcia pcmcia-support) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  $(use_enable selinux) \
-		  --disable-console-kit \
-		  ${acpi} \
-	|| die "configure failed"
-#$(use_enable pam console-kit)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
-#	if use pam; then
-#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
-#	fi
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-		-i "${WORKDIR}"/0.5.9-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	keepdir /media
-
-	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
-	# or else hal bombs.
-	keepdir /etc/hal/fdi/{information,policy,preprobe}
-
-	# HAL stores it's fdi cache in /var/lib/cache/hald
-	keepdir /var/lib/cache/hald
-
-	# HAL keeps its unix socket here
-	keepdir /var/run/hald
-}
-
-pkg_postinst() {
-	# Despite what people keep changing this location. Either one works.. it doesn't matter
-	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
-	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
-
-	# HAL drops priviledges by default now ...
-	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
-	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
-	fi
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	if [[ ${ROOT} == / ]] ; then
-		if use kernel_linux; then
-			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
-		elif use kernel_FreeBSD; then
-			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
-		fi
-	fi
-
-	elog "The HAL daemon needs to be running for certain applications to"
-	elog "work. Suggested is to add the init script to your start-up"
-	elog "scripts, this should be done like this :"
-	elog "\`rc-update add hald default\`"
-	echo
-	elog "Looking for automounting support? Add yourself to the plugdev group"
-}
diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
deleted file mode 100644
index dc42ca4fadc4..000000000000
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.28 2007/06/28 23:19:25 vapier Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=dev-libs/dbus-glib-0.61
-		kernel_linux? ( >=sys-fs/udev-104 )
-		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
-		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
-		kernel_FreeBSD? ( dev-libs/libvolume_id )
-		>=dev-libs/expat-1.95.8
-		>=sys-apps/pciutils-2.2.3
-		>=dev-libs/libusb-0.1.10a
-		sys-apps/usbutils
-		virtual/eject
-		amd64? ( >=sys-apps/dmidecode-2.7 )
-		x86? ( >=sys-apps/dmidecode-2.7 )
-		ia64? ( >=sys-apps/dmidecode-2.7 )
-		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( >=sys-apps/parted-1.7.1 )
-		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) )
-		selinux? ( sys-libs/libselinux
-					sec-policy/selinux-hal )"
-#		pam? ( sys-auth/consolekit )"
-
-DEPEND="${RDEPEND}
-		  dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
-
-PDEPEND="app-misc/hal-info"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
-
-function notify_uevent() {
-	ewarn
-	ewarn "You must enable Kernel Userspace Events in your kernel."
-	ewarn "For this you need to enable 'Hotplug' under 'General Setup' and"
-	ewarn "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
-	ewarn "in the config file."
-	ewarn
-	ebeep 5
-}
-
-function notify_procfs() {
-	ewarn
-	ewarn "You must enable the proc filesystem in your kernel."
-	ewarn "For this you need to enable '/proc file system support' under"
-	ewarn "'Pseudo filesystems' in 'File systems'.  It is marked"
-	ewarn "CONFIG_PROC_FS in the config file."
-	ewarn
-	ebeep 5
-}
-
-function notify_inotify() {
-	ewarn
-	ewarn "You must enable the Inotify system in your kernel."
-	ewarn "For this you need to enable 'Inotify support for userspace'"
-	ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file."
-	ewarn
-	ebeep 5
-}
-
-pkg_setup() {
-	if built_with_use --missing false sys-apps/pciutils zlib ; then
-		eerror "You MUST build sys-apps/pciutils without the zlib USE flag"
-		die "You MUST build sys-apps/pciutils without the zlib USE flag"
-	fi
-
-	if use kernel_linux; then
-		kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
-
-		if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
-		then
-			notify_uevent
-		fi
-
-		linux_chkconfig_present INOTIFY_USER || notify_inotify
-
-		if use acpi ; then
-			linux_chkconfig_present PROC_FS || notify_procfs
-		fi
-	fi
-
-	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Gentoo Patch Set
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${FILESDIR}/${PV}
-
-	eautoreconf
-}
-
-src_compile() {
-	local backend=""
-	local acpi=""
-
-	# TODO :: policykit should have a pam useflag
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if ! use acpi ; then
-		acpi="--disable-acpi-proc --disable-acpi-acpid"
-	fi
-
-	econf --disable-policy-kit \
-		  --with-doc-dir=/usr/share/doc/${PF} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-socket-dir=/var/run/hald \
-		  --with-hwdata=/usr/share/misc \
-		  --enable-hotplug-map \
-		  --enable-man-pages \
-		  --with-backend=${backend} \
-		  $(use_enable debug verbose-mode) \
-		  $(use_with dell dell-backlight) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable pcmcia pcmcia-support) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  $(use_enable selinux) \
-		  --disable-console-kit \
-		  ${acpi} \
-	|| die "configure failed"
-#$(use_enable pam console-kit)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
-#	if use pam; then
-#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
-#	fi
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-		-i "${WORKDIR}"/0.5.9-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	keepdir /media
-
-	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
-	# or else hal bombs.
-	keepdir /etc/hal/fdi/{information,policy,preprobe}
-
-	# HAL stores it's fdi cache in /var/lib/cache/hald
-	keepdir /var/lib/cache/hald
-
-	# HAL keeps its unix socket here
-	keepdir /var/run/hald
-}
-
-pkg_postinst() {
-	# Despite what people keep changing this location. Either one works.. it doesn't matter
-	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
-	# Create groups for hotplugging and HAL
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewgroup plugdev || die "Problem adding plugdev group"
-
-	# HAL drops priviledges by default now ...
-	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
-			|| die "Problem adding haldaemon user"
-	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
-			|| die "Problem addding haldaemon user"
-	fi
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	if [[ ${ROOT} == / ]] ; then
-		if use kernel_linux; then
-			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
-		elif use kernel_FreeBSD; then
-			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
-		fi
-	fi
-
-	elog "The HAL daemon needs to be running for certain applications to"
-	elog "work. Suggested is to add the init script to your start-up"
-	elog "scripts, this should be done like this :"
-	elog "\`rc-update add hald default\`"
-	echo
-	elog "Looking for automounting support? Add yourself to the plugdev group"
-}