Fix bug #267042 and bug #269897

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 21 insertions, 308 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 60049f0f7ef3..39a09cbc4140 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.285 2009/05/16 08:49:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.286 2009/05/29 17:42:22 dang Exp $
+
+*hal-0.5.12_rc1-r5 (29 May 2009)
+
+  29 May 2009; Daniel Gryniewicz <dang@gentoo.org>
+  -hal-0.5.12_rc1-r2.ebuild, -hal-0.5.12_rc1-r3.ebuild,
+  +hal-0.5.12_rc1-r5.ebuild:
+  Fix bug #267042 and bug #269897
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org> hal-0.5.9.1-r3.ebuild,
   hal-0.5.11-r4.ebuild, hal-0.5.11-r8.ebuild, hal-0.5.12_rc1-r2.ebuild,
diff --git a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild
deleted file mode 100644
index c8c7c3b05463..000000000000
--- a/sys-apps/hal/hal-0.5.12_rc1-r2.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# 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.12_rc1-r2.ebuild,v 1.3 2009/05/16 08:49:29 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="3"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
-	 http://dev.gentoo.org/~dang/files/${MY_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 consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
-		 >=dev-libs/glib-2.14
-		 >=dev-libs/expat-1.95.8
-		 =virtual/libusb-0*
-		 >=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 )
-		 consolekit?	(
-		 					sys-auth/consolekit[policykit=]
-					)
-		 policykit?	(
-		 					sys-auth/consolekit[policykit]
-							sys-auth/policykit[pam]
-		 			)"
-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
-				)
-		!<gnome-extra/gnome-power-manager-2.24.4-r2"
-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
-}
-
-src_prepare() {
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	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"
-		if use x86 || use amd64; then
-			hardware="$hardware --with-macbook --with-macbookpro"
-		fi
-
-		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
-
-	# Policykit support depends on consolekit support.  Therefore, force on
-	# consolekit, even if it's USE flag is off, if policykit support is on.
-	# This enables packages to USE-depend on hal[policykit?]
-	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-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) \
-		  $(use_enable consolekit console-kit) \
-		  $(use_enable policykit console-kit) \
-		  $(use_enable policykit policy-kit) \
-		  --docdir=/usr/share/doc/${PF} \
-		  --localstatedir=/var \
-		  ${acpi} ${hardware} \
-	|| die "configure 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
-}
diff --git a/sys-apps/hal/hal-0.5.12_rc1-r3.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r5.ebuild
index 9b56abcaf17b..48cfd5e227c1 100644
--- a/sys-apps/hal/hal-0.5.12_rc1-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.12_rc1-r5.ebuild
@@ -1,12 +1,12 @@
 # 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.12_rc1-r3.ebuild,v 1.3 2009/05/16 08:49:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r5.ebuild,v 1.1 2009/05/29 17:42:22 dang Exp $
 
 EAPI="2"
 
-inherit eutils linux-info autotools flag-o-matic
+inherit eutils linux-info autotools flag-o-matic multilib
 
-PATCH_VERSION="4"
+PATCH_VERSION="6"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -130,9 +130,16 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Only apply one of the policy patches.  Bug #267042
+	if use policykit ; then
+		rm "${WORKDIR}/${PATCHNAME}/patches/0001-plugdev-dbus-policy.patch"
+	else
+		rm "${WORKDIR}/${PATCHNAME}/patches/0002-policykit-dbus-policy.patch"
+	fi
+
 	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
 	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/${P}-patches/" \
+	EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/patches/" \
 	EPATCH_FORCE="yes" \
 	epatch
 
@@ -227,7 +234,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
 
 	# hal umount for unclean unmounts
-	exeinto /lib/udev/
+	exeinto /$(get_libdir)/udev/
 	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
 
 	# initscript
@@ -246,7 +253,7 @@ src_install() {
 
 	if use X ; then
 		# New Configuration Snippets
-		dodoc "${WORKDIR}/${PATCHNAME}/${PN}-config-examples/"*.fdi || \
+		dodoc "${WORKDIR}/${PATCHNAME}/config-examples/"*.fdi || \
 			die "dodoc X examples failed"
 	fi