Fixed bug #133743 and bug #161057

(Portage version: 2.1.2)
 (Signed Manifest commit)

3 files changed, 22 insertions, 215 deletions

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index b6bb41093288..6422f6a6cea8 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -53,6 +53,10 @@ AUX hal-0.5.7.1-dbus-close.patch 859 RMD160 942829e237154e6612d806d9f3af0d393582
 MD5 1fa646b45e845031f09515731dba40c7 files/hal-0.5.7.1-dbus-close.patch 859
 RMD160 942829e237154e6612d806d9f3af0d393582f418 files/hal-0.5.7.1-dbus-close.patch 859
 SHA256 7739541fde66bcfcb6bbeb2d5e66976e856ea066aed34c847b38539a2c42b183 files/hal-0.5.7.1-dbus-close.patch 859
+AUX hal-0.5.7.1-hibernate-fix-r1.patch 461 RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 SHA1 e9b0d89943b4eab1e60f86227b7f478fb55abee0 SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021
+MD5 088e3e7a6c3d2be3bf27b13a2ca05333 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
+RMD160 c88c5f307321d4981d3ee1bbaf299e9d42c5c636 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
+SHA256 0230f7686fa8584565776ba4024cc399094ab64414d77b21a68f50318c5ad021 files/hal-0.5.7.1-hibernate-fix-r1.patch 461
 AUX hal-0.5.7.1-hibernate-fix.patch 421 RMD160 126228bda942a061e87d15bdf6df0740b53f924c SHA1 9412c4c6dbab4133bb3dbbb6baae1cef9dd054a1 SHA256 9f27c993bc54010aec22b4955c149882e18ff2629155dcab372fec4695141826
 MD5 eb37b5e42e81753922463ad6f463aee2 files/hal-0.5.7.1-hibernate-fix.patch 421
 RMD160 126228bda942a061e87d15bdf6df0740b53f924c files/hal-0.5.7.1-hibernate-fix.patch 421
@@ -84,18 +88,18 @@ EBUILD hal-0.5.7-r3.ebuild 5770 RMD160 cad0f030042f5fc4a0953fc2fdccfd1e48bd78a9
 MD5 ee0bb11c71fafebd0ed733d11eb9485b hal-0.5.7-r3.ebuild 5770
 RMD160 cad0f030042f5fc4a0953fc2fdccfd1e48bd78a9 hal-0.5.7-r3.ebuild 5770
 SHA256 b2f8275c56ed75e6645ad891f183b6359ec99b3e03d7f3c5f36f3c2cca8ee501 hal-0.5.7-r3.ebuild 5770
-EBUILD hal-0.5.7.1-r1.ebuild 5946 RMD160 f759ddd1a40aa7785500b2bbcf9cd064a2ec445c SHA1 e5a259b90ff1b95828a3f1191e555c9129acc8c2 SHA256 e4c184e4c6d87281912ac48fc4a9ff7b6f43977ec874a704955039dbd0bbbb08
-MD5 dce50da872e63e58bb41ff5a2a48c981 hal-0.5.7.1-r1.ebuild 5946
-RMD160 f759ddd1a40aa7785500b2bbcf9cd064a2ec445c hal-0.5.7.1-r1.ebuild 5946
-SHA256 e4c184e4c6d87281912ac48fc4a9ff7b6f43977ec874a704955039dbd0bbbb08 hal-0.5.7.1-r1.ebuild 5946
-EBUILD hal-0.5.7.1-r2.ebuild 5956 RMD160 d64c7699a6fc879a0eb90d057103c0b9627edddb SHA1 e923a184c8200c734976353fad5970f2736a468f SHA256 97029f922e5263b3f1088ebf4580e23e810312bae7840e8295fe21cbe293d3ce
-MD5 62fd6281cff2f894b3d80b74bce069bd hal-0.5.7.1-r2.ebuild 5956
-RMD160 d64c7699a6fc879a0eb90d057103c0b9627edddb hal-0.5.7.1-r2.ebuild 5956
-SHA256 97029f922e5263b3f1088ebf4580e23e810312bae7840e8295fe21cbe293d3ce hal-0.5.7.1-r2.ebuild 5956
-MISC ChangeLog 17305 RMD160 12f18dd0e52e9d4b17cc4b91539ef9f9a30aec42 SHA1 5ab8e70235fcc618e175fa9f165518c2b0373dd3 SHA256 34a0a2b500261e02cf5b3f6c76a64ed754ae47bd720bc66aed5ba9fbcec27fe0
-MD5 59cc5523c1b2919ad95b33e511d19932 ChangeLog 17305
-RMD160 12f18dd0e52e9d4b17cc4b91539ef9f9a30aec42 ChangeLog 17305
-SHA256 34a0a2b500261e02cf5b3f6c76a64ed754ae47bd720bc66aed5ba9fbcec27fe0 ChangeLog 17305
+EBUILD hal-0.5.7.1-r2.ebuild 6250 RMD160 3d43fda979029a82ef10d7248ecd9e947f0bcdcd SHA1 20e33b11240a53e27292f2ee89daff4edead4375 SHA256 f3edf6b2b1dbde75c78a83b1f0833d9f0440fd7d34ceab203ae7e4e6210d1946
+MD5 6c46d418da0afb445a975c6726ae192a hal-0.5.7.1-r2.ebuild 6250
+RMD160 3d43fda979029a82ef10d7248ecd9e947f0bcdcd hal-0.5.7.1-r2.ebuild 6250
+SHA256 f3edf6b2b1dbde75c78a83b1f0833d9f0440fd7d34ceab203ae7e4e6210d1946 hal-0.5.7.1-r2.ebuild 6250
+EBUILD hal-0.5.7.1-r3.ebuild 6253 RMD160 a8ae82eb4f5d8af4ae7578c90fddf204aa09344c SHA1 93f9f85a7d7e81ecf424fa631115fe256334c1a8 SHA256 6ab9754b174db0324dc55b588ea5b5f789722a83a36e62e5a7915a40fb0d920c
+MD5 40ba5ec2ffe780a90b12f88daa3ce5d2 hal-0.5.7.1-r3.ebuild 6253
+RMD160 a8ae82eb4f5d8af4ae7578c90fddf204aa09344c hal-0.5.7.1-r3.ebuild 6253
+SHA256 6ab9754b174db0324dc55b588ea5b5f789722a83a36e62e5a7915a40fb0d920c hal-0.5.7.1-r3.ebuild 6253
+MISC ChangeLog 17538 RMD160 91173b4a9ab7a1113876515c2385383574298dab SHA1 b10956ff3a209531cd19813bde8e269c81cfcab1 SHA256 8c96f519fafbd0592abe36b8dd618067778dc063bde028a8523b0a3c836878f7
+MD5 650884d2af37f920b92c35834c4f61d3 ChangeLog 17538
+RMD160 91173b4a9ab7a1113876515c2385383574298dab ChangeLog 17538
+SHA256 8c96f519fafbd0592abe36b8dd618067778dc063bde028a8523b0a3c836878f7 ChangeLog 17538
 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
 MD5 885e3073744523eaf2450514a311758b metadata.xml 223
 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
@@ -106,16 +110,16 @@ SHA256 51107ff7d6a8b82a6be18a1707160591f325fa1a16d47aa8cc5c0045a1addb14 files/di
 MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r3 232
 RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r3 232
 SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r3 232
-MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r1 238
-RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r1 238
-SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r1 238
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r2 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r2 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r2 238
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFndbyAiZjviIA2XgRAt9jAKCxQ1mtL5ZRiFypkeHw4SJwKK2kUwCgy65y
-QhtvdRd0uJZE3MfhpkFo73o=
-=Hdkg
+iD8DBQFFrwa1oeSe8B0zEfwRAkwIAJ9ZVXPC/AypQ7e69orCLARET0CVDgCfQArw
+YL2Ql1ypQr46wLctPTnk/pI=
+=OeaJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1-r1 b/sys-apps/hal/files/digest-hal-0.5.7.1-r1
deleted file mode 100644
index 3042516ecf0a..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.7.1-r1
+++ /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/hal-0.5.7.1-r1.ebuild b/sys-apps/hal/hal-0.5.7.1-r1.ebuild
deleted file mode 100644
index f5940a565d36..000000000000
--- a/sys-apps/hal/hal-0.5.7.1-r1.ebuild
+++ /dev/null
@@ -1,194 +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-r1.ebuild,v 1.8 2007/01/05 04:41:12 flameeyes 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.90 >=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
-	sys-apps/hotplug-base
-	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}"
-
-	# sony screen brightness patch
-#	epatch "${FILESDIR}"/${PN}-0.5.7-sony-brightness.patch
-
-	# handle ignored volumes properly
-	epatch "${FILESDIR}"/${PN}-0.5.7-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
-}
-
-src_compile() {
-	econf \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-os-type=gentoo \
-		--with-pid-file=/var/run/hald.pid \
-		--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"
-}