adding -r1 with rescan on resume patch

(Portage version: 2.1_pre7-r5)

5 files changed, 211 insertions, 4 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 8a7ad4c73b6f..3214b2760dfd 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.82 2006/03/19 14:38:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.83 2006/04/27 02:05:55 compnerd Exp $
+
+*hal-0.5.7-r1 (27 Apr 2006)
+
+  27 Apr 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/hal-0.5.7-rescan-on-resume.patch, +hal-0.5.7-r1.ebuild:
+  Adding patch for rescan on resume for gnome-power-manager
 
   19 Mar 2006; Doug Goldstein <cardoe@gentoo.org> hal-0.5.7.ebuild:
   autoreconf is not needed. fix doexec to doexe
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 8dc2a682e1c1..df6f601a298d 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,6 +1,6 @@
-MD5 5285df7d4f07f3b64c7382ea8a8d4b1b ChangeLog 11590
-RMD160 458d5926edbc0838c98e0ac95dab3c6162a1bf75 ChangeLog 11590
-SHA256 d019019f66a22994cfe86a534701046f9843efff18ddc423837adb027929ee23 ChangeLog 11590
+MD5 3948324dd706b117523a000e88d56065 ChangeLog 11801
+RMD160 87d46ac5ce4da8bb841c1f8412b776144e5a8ef4 ChangeLog 11801
+SHA256 36a474b28d8b32b22063262bee2fe3cb09070f63a01a718517b93276a481010b ChangeLog 11801
 MD5 a1059812bd1e8a1fe46f132c96a3d002 files/0.5-hald.rc 660
 RMD160 6e0d9388502e6d83f9729dd4ceb018ac78470c21 files/0.5-hald.rc 660
 SHA256 0f03055ee662987b1a8010948979d27cce07003a5c9e7e23b7b3901d20c2d82a files/0.5-hald.rc 660
@@ -16,6 +16,9 @@ SHA256 eeffb1e1be7fbdc78d37987f66a0867677f656e6f75463035e7a519c1b0f1318 files/di
 MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7 232
 RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7 232
 SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7 232
+MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r1 232
+RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r1 232
+SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r1 232
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
 RMD160 8ae241d65add4c759b7a5d43924319eafa4acdf7 files/hal-0.4.1-old_storage_policy.patch 1216
 SHA256 b4bfb81a7017fd56d05230ba87d935cc30d0482f7158fe04e93a513872bc8696 files/hal-0.4.1-old_storage_policy.patch 1216
@@ -61,6 +64,9 @@ SHA256 19e5f88a512f8e146f63d43935039638b8e51be71f6eea8adcbf3f0c8ab63239 files/ha
 MD5 935e086508663682ed61c2ea2c0d1d18 files/hal-0.5.7-pmu-fix.patch 982
 RMD160 930d9bed6014167629a93ead6f2bc9f2b03f04d1 files/hal-0.5.7-pmu-fix.patch 982
 SHA256 23b9e12361eb56c481ee747bac8adc6cda148faa6901507bc7e8479ee92aaf98 files/hal-0.5.7-pmu-fix.patch 982
+MD5 98b1f7424a7e64e60dde5cee26bb9e6a files/hal-0.5.7-rescan-on-resume.patch 516
+RMD160 bbf2b4bc576e0aace4a736e15b04a89d5b031f96 files/hal-0.5.7-rescan-on-resume.patch 516
+SHA256 dbcead5b9276ac85862ac88951278fb7e749ae371808cf5d7142bee85ba16456 files/hal-0.5.7-rescan-on-resume.patch 516
 MD5 92141d6b083464e78ce0166e4c60c981 files/hal-0.5.7-sony-brightness.patch 717
 RMD160 85c53fb1c49fbb7325398173a43f256ba179c6a7 files/hal-0.5.7-sony-brightness.patch 717
 SHA256 25522ed95df9838401684184cc08364058dde6b2b064d3d4e1ba4ddaef9263d2 files/hal-0.5.7-sony-brightness.patch 717
@@ -82,6 +88,9 @@ SHA256 20ab981c2b2d490f6cf6358d36414614e5d5c2e9d2b1b4a2293a34d990e7d8ff hal-0.4.
 MD5 59bbdd78799e3dd45740cba91144c873 hal-0.5.5.1-r3.ebuild 3780
 RMD160 376b757b599b4788d4dce9d0d2aa39dddc90d95e hal-0.5.5.1-r3.ebuild 3780
 SHA256 7befb86e2b140e7a760afcb118fe090ee0913d389cf39037203d03fd9fba454d hal-0.5.5.1-r3.ebuild 3780
+MD5 be1dce2817d2c09b7d340c74d5619c26 hal-0.5.7-r1.ebuild 5148
+RMD160 689e57a7f0c8296e02e480a4411d45c50d129b54 hal-0.5.7-r1.ebuild 5148
+SHA256 8a395bca6068a2b61d523f53e5852abca0983f61c578be86b267a1148aa8b8ee hal-0.5.7-r1.ebuild 5148
 MD5 b0a6ef9b315285aa8046b1aee5be4a17 hal-0.5.7.ebuild 5062
 RMD160 2c483606c288cd2779ce5d4f36c85badbcbba4d8 hal-0.5.7.ebuild 5062
 SHA256 3bb53cb91533ec69558df70326579142ecd871203f3c41f837aa4fd3321cbd47 hal-0.5.7.ebuild 5062
diff --git a/sys-apps/hal/files/digest-hal-0.5.7-r1 b/sys-apps/hal/files/digest-hal-0.5.7-r1
new file mode 100644
index 000000000000..5c84accce85a
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.7-r1
@@ -0,0 +1,3 @@
+MD5 4163afb8285db64e00e7b1392b401d92 hal-0.5.7.tar.gz 1528632
+RMD160 342b00bea138ddf9f0f75e769612373bcf935d43 hal-0.5.7.tar.gz 1528632
+SHA256 63c78e9b9c8308914372f9a762b02fa057bca2c6a1c7478ab595ba0fa92781d5 hal-0.5.7.tar.gz 1528632
diff --git a/sys-apps/hal/files/hal-0.5.7-rescan-on-resume.patch b/sys-apps/hal/files/hal-0.5.7-rescan-on-resume.patch
new file mode 100644
index 000000000000..64fc537214b1
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.7-rescan-on-resume.patch
@@ -0,0 +1,16 @@
+--- tools/hal-system-power-hibernate	2006-04-26 19:25:40.000000000 -0500
++++ tools/hal-system-power-hibernate	2006-04-26 19:34:00.000000000 -0500
+@@ -53,4 +53,13 @@
+ 		fi
+ 	fi
+ 
++# Refresh devices when resuming from a hibernate
++for type in button battery ac_adapter ; do
++   devices=$(hal-find-by-capbility --capability $type)
++   for device in $devices ; do
++      dbus-send --system --print-reply --dest=org.freedesktop.Hal $device \
++                org.freedesktop.Hal.Device.Rescan
++   done
++done
++
+ exit $RET
diff --git a/sys-apps/hal/hal-0.5.7-r1.ebuild b/sys-apps/hal/hal-0.5.7-r1.ebuild
new file mode 100644
index 000000000000..6a63b179a774
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.7-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/04/27 02:05:55 compnerd Exp $
+
+inherit eutils linux-info debug
+
+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 ~sparc ~x86"
+IUSE="acpi crypt debug doc dmi pcmcia selinux"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=sys-apps/dbus-0.60
+	>=sys-fs/udev-078
+	>=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
+	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
+
+	die "KOBJECT_UEVENT is not set"
+}
+
+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
+
+	die "HOTPLUG is not set"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	kernel_is ge 2 6 13 \
+		|| die "You need a 2.6.13 or newer kernel to run this package"
+
+	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 \
+			|| die "ACPI support requires PROC_FS support in kernel"
+	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.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
+}
+
+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
+
+	# remove dep on gnome-python
+	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
+
+	# hal umount for unclean unmounts
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/hal-unmount.dev hal-unmount.sh
+
+	# initscript
+	newinitd "${FILESDIR}"/0.5-hald.rc hald
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+	# Script to unmount devices if they are yanked out (from upstream)
+	exeinto /etc/dev.d/default
+	doexe "${FILESDIR}"/hal-unmount.dev
+}
+
+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/
+	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
+
+	einfo "The HAL daemon needs to be running for certain applications to"
+	einfo "work. Suggested is to add the init script to your start-up"
+	einfo "scripts, this should be done like this :"
+	einfo "\`rc-update add hald default\`"
+}