Revive a patch by Cardoe to fix test failures, closes bug #176535. Enable support for MacBook/MacBook Pro if USE="laptop", closes bug #200643. Patch from Ambroz Bizjak <ambro@b4ever.net> removes ill-conceived UID checks so NTFS volumes can be automounted, closes bug #205901. Upstream commits scavenged by Ricardo Salveti <ricardo.salveti@openbossa.org> allow mac80211-based wireless devices to be detected properly, closes bug #246026. Reverted partition unhiding from bug #247025, it was already controversial but has been proven to automount recovery partitions.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 310 insertions, 5 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 64b0d29c4787..912a7a01993b 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.269 2009/02/04 14:27:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.270 2009/02/04 22:58:27 chainsaw Exp $
+
+*hal-0.5.11-r8 (04 Feb 2009)
+
+  04 Feb 2009; <chainsaw@gentoo.org> +hal-0.5.11-r8.ebuild:
+  Revive a patch by Cardoe to fix test failures, closes bug #176535. Enable
+  support for MacBook/MacBook Pro if USE="laptop", closes bug #200643. Patch
+  from Ambroz Bizjak <ambro@b4ever.net> removes ill-conceived UID checks so
+  NTFS volumes can be automounted, closes bug #205901. Upstream commits
+  scavenged by Ricardo Salveti <ricardo.salveti@openbossa.org> allow
+  mac80211-based wireless devices to be detected properly, closes bug
+  #246026. Reverted partition unhiding from bug #247025, it was already
+  controversial but has been proven to automount recovery partitions.
 
   04 Feb 2009; <chainsaw@gentoo.org> hal-0.5.11-r7.ebuild:
   Do not break the dependency tree by being silly about hal-info.
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 0b3dc85e99dc..40a66e6eec3c 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -65,6 +65,7 @@ AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 311
 DIST hal-0.5.11-gentoo-patches-1.tar.bz2 3941 RMD160 a33c088dbb9dac955870959238fa8292d6dba460 SHA1 c279a44301841a15d9ebef740953e11184f46d99 SHA256 23498d492e2b14749606d94865c70798a3caa47e3385d5aca02ed2f39422a375
 DIST hal-0.5.11-gentoo-patches-3.tar.bz2 5393 RMD160 651604cfee7664036e9fd96491e4ca4e73e78b4a SHA1 52d4c4157ceacec3f90aef602b2d227f5a5281c1 SHA256 db1ba0031baeaa0330fb876776a069fefd267bbbf61b9434a0fba2cc3e2e9453
 DIST hal-0.5.11-gentoo-patches-4.tar.bz2 7118 RMD160 aa87f6bf7ea7cca404efc4b6d1dab820be5a8f89 SHA1 70f8ada7f76f3da8017253eaa4e28e37bd13e768 SHA256 ab416a9fdeb7e8b37fbf2d1a5a575d70aaf8a37926cd38e38320059eca94bf3d
+DIST hal-0.5.11-gentoo-patches-5.tar.bz2 8890 RMD160 ffa1ae251baa8caff74f343f9852a95b800ed9c5 SHA1 7ff6aa207216ac2fdaf1bb4e468c78a2884ef804 SHA256 f03d8f84f97dc3716aebaabc2af43762a8e1a2ffe5acb532915d31ac9794bc21
 DIST hal-0.5.11.tar.bz2 1281251 RMD160 741cfe82f0bc2d67106b24cfe526a754ab36e45f SHA1 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 SHA256 78a2621209b2db4d71f25fe3a7df7b7dd4b5e866e9c699454b78e611def065cf
 DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad SHA1 32db287e0eff7f4754b89633909daf0f6e957009 SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
@@ -72,13 +73,14 @@ EBUILD hal-0.5.11-r1.ebuild 9416 RMD160 435f9ebf2893476c51a0dbd9ac5444d2092726ac
 EBUILD hal-0.5.11-r4.ebuild 9493 RMD160 dfede0559f07ccafe98301de4550493abcf5d2d1 SHA1 030f68de81db95a2583e7e40fcff7bb840733b2a SHA256 7421991e965a040a4a29e9875771bffb5aacbdfb401b3e2d595caa70365b34ad
 EBUILD hal-0.5.11-r6.ebuild 9574 RMD160 af71da4cf940751e3a13f792daa6f153d819485a SHA1 84753106fc3bebefd0f64574589977309a21ccc1 SHA256 a6f820dbf1c2567d5b14e96c22a8305ad67462d14c0a233a39b84777320df20c
 EBUILD hal-0.5.11-r7.ebuild 8816 RMD160 9090a14aad5eff0acf97a7b9b345985c75a60e3c SHA1 a03553bc66b97e3ebc25b3be403cbe7a4b2353dd SHA256 a5244f2d60b4d44e75adfb4e115c5a4de5fd32d9ea80469893a5f1e0ef556276
+EBUILD hal-0.5.11-r8.ebuild 8876 RMD160 eb5b7b7ecb9d6b2aa6cadb8a9c89b0e148b9a675 SHA1 ef197534917ec126ead10edd24bd928e213f1a65 SHA256 bb5c980a721aca1bc596bf981514a887a4f87a39302d52f2bd7777c0f76b5398
 EBUILD hal-0.5.9.1-r3.ebuild 6694 RMD160 91f751aa5525c0879cf23bcbb95a9fb343742d0f SHA1 a0b0da643a6c7dab8f0517e01bae4d774224b15a SHA256 09338520c2c1278f1fec32c0c8e9fa95ac906d35eefe52f1f4e1507b12953452
-MISC ChangeLog 43889 RMD160 b22ce5b4c36f122a8438ca0be3289e2b80faf9f5 SHA1 fbfe0855ee71db35d9c11a4ec235e5775ba69116 SHA256 8705e4c8abfb1aaa5b8547f8326270290a3f2e4b3549f8d746599dc5cc3a520f
+MISC ChangeLog 44562 RMD160 8118337493e87e1bd2dc061610dba28b1272fbdd SHA1 6eae45440a6c15b7baaded948ee3575d3881c495 SHA256 789dbaddfd03f55af596e5f460d669da1b5e27e7d463152a71ff945e2d06f277
 MISC metadata.xml 1984 RMD160 263001c76f3c12d226f06e19e5a77997945eef53 SHA1 43d34fe6e9836b1291c144985ca017f0cc5cc143 SHA256 e389394a84294db6330bf3f300e3a511caab2460b9f35d9c922763101e4dad13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmJpdcACgkQp5vW4rUFj5oQQQCbBEsnTYegefuFRqlGLbPHEWVW
-bMcAninxpQDiVJ/bT7Rp4wwo6j1BpiUp
-=NrNk
+iEYEARECAAYFAkmKHYIACgkQp5vW4rUFj5rFhQCdE65ei2a8cEz5mAJ7zyzWejFe
+mSkAoKShnICltItRr44ldCdDVjsMvExU
+=nd0b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.11-r8.ebuild b/sys-apps/hal/hal-0.5.11-r8.ebuild
new file mode 100644
index 000000000000..c04d7b0ed1eb
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.11-r8.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r8.ebuild,v 1.1 2009/02/04 22:58:27 chainsaw Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+PATCH_VERSION="5"
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
+		 http://dev.gentoo.org/~chainsaw/files/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61
+		 >=dev-libs/glib-2.14
+		 >=dev-libs/expat-1.95.8
+		 >=dev-libs/libusb-0.1.10a
+		 >=sys-apps/pciutils-2.2.7-r1
+		 >=dev-util/gperf-3.0.3
+		   sys-apps/usbutils
+		   virtual/eject
+		 amd64? ( >=sys-apps/dmidecode-2.7 )
+		 dell? ( >=sys-libs/libsmbios-0.13.4 )
+		 disk-partition? ( >=sys-apps/parted-1.8.0 )
+		 ia64? ( >=sys-apps/dmidecode-2.7 )
+		 kernel_linux?	(
+							>=sys-fs/udev-117
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
+						)
+		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
+		 x86? ( >=sys-apps/dmidecode-2.7 )
+		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		doc?	(
+					app-text/xmlto
+					dev-libs/libxml2
+					dev-util/gtk-doc
+					app-text/docbook-sgml-utils
+				)"
+PDEPEND="|| (
+	>=app-misc/hal-info-20081219 )
+	!gnome-extra/hal-device-manager
+	laptop? ( >=sys-power/pm-utils-0.99.3 )"
+
+## 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 check_hotplug_net() {
+	local CONFIG_CHECK="~HOTPLUG ~NET"
+	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
+	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_inotify() {
+	local CONFIG_CHECK="~INOTIFY_USER"
+	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_acpi_proc() {
+	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
+	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
+	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
+			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
+
+			if kernel_is lt 2 6 23 && use acpi ; then
+				check_acpi_proc
+			fi
+		fi
+
+		check_hotplug_net
+		check_inotify
+	fi
+
+	# http://devmanual.gentoo.org/ebuild-writing/functions/
+	# http://bugs.gentoo.org/show_bug.cgi?id=191605
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon
+	enewgroup plugdev
+
+	# 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}
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
+	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
+}
+
+S="${WORKDIR}/${PF/-r*/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	eautoreconf
+}
+
+src_compile() {
+	local acpi="$(use_enable acpi)"
+	local backend=
+	local hardware=
+
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if use kernel_linux ; then
+		if use acpi ; then
+			# Using IBM ACPI and Toshiba ACPI results in double notification as this
+			# was merged into the Linux Kernel 2.6.22
+			if kernel_is lt 2 6 22 ; then
+				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
+			else
+				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			fi
+
+			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
+		else
+			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
+		fi
+
+		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
+		use arm && hardware="$hardware --with-omap --enable-pmu"
+		use ppc && hardware="$hardware --enable-pmu"
+		use laptop && hardware="--with-macbook --with-macbookpro"
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+
+		hardware="$hardware --enable-sonypic"
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --without-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+		hardware="$hardware --disable-sonypic"
+	fi
+
+	econf --with-backend=${backend} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-hwdata=/usr/share/misc \
+		  --with-socket-dir=/var/run/hald \
+		  --enable-umount-helper \
+		  --enable-man-pages \
+		  --disable-policy-kit \
+		  --disable-console-kit \
+		  --disable-acl-management \
+		  --enable-pci \
+		  $(use_enable apm) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
+
+	# initscript
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
+
+	# configuration
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
+
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
+	fi
+	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
+		die "failed to install hald.conf"
+
+	if use X ; then
+		# New Configuration Snippets
+		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \
+			die "dodoc X examples failed"
+	fi
+
+	# 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
+	keepdir /var/lib/hal
+}
+
+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/
+
+	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"
+	echo
+	elog "IF you have additional applications which consume ACPI events, you"
+	elog "should consider installing acpid to allow applications to share ACPI"
+	elog "events."
+	if use X ; then
+		echo
+		elog "If you wish to use a non US layout, you may do so by executing:"
+		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
+		elog "Keyboard Layout Settings mechanism."
+		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
+		elog "it is kxkb."
+	fi
+	echo
+	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
+	elog "(such as gnome-power-manager), you should build HAL with the laptop"
+	elog "useflag which will install pm-utils."
+	if use X ; then
+		echo
+		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
+		elog "reads user specific configuration from /etc/hal/fdi/policy/."
+		echo
+		elog "You should remove the Input sections from your xorg.conf once you have"
+		elog "migrated the rules to a HAL fdi file."
+	fi
+
+	ebeep 5
+	epause 5
+}