Bump to hal-0.5.12_rc1-r1

 - I'm taking primary maintainership from chainsaw,  with his permission
 - Add policykit and consolekit flags.  Since pk support depends on ck support,
   the policykit flag will enable consolekit support, even if the consolekit
   flag is not set.  This allows proper USE-depend from other packages.
 - Add CPUFreq to the dbus allow lists
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 336 insertions, 4 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 1db5531670b8..937fcfc7c036 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,23 @@
 # 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.279 2009/04/29 22:33:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.280 2009/04/30 19:20:44 dang Exp $
+
+*hal-0.5.12_rc1-r1 (30 Apr 2009)
+
+  30 Apr 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +hal-0.5.12_rc1-r1.ebuild, metadata.xml:
+  Bump to hal-0.5.12_rc1-r1
+
+  - I'm taking primary maintainership from chainsaw, with his permission
+
+  - Add policykit and consolekit flags. Since pk support depends on ck
+  support,
+
+  the policykit flag will enable consolekit support, even if the consolekit
+
+  flag is not set. This allows proper USE-depend from other packages.
+
+  - Add CPUFreq to the dbus allow lists
 
   29 Apr 2009; Mike Frysinger <vapier@gentoo.org> hal-0.5.12_rc1:
   Drop useless ||() construct since there is only one atom in it.
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index cff8d3a29403..ebe1b5cf4a03 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 AUX 0.5.10-hald.conf 119 RMD160 06e205ba7fa8acfb6f68e84a247845a3ad028351 SHA1 c8a62a808c7f632154dda1686fe344a4a136e28f SHA256 b19e6df9c78b6f813405a7cbff20e049714db1a000e6b71ab2eca02d372d58af
 AUX 0.5.10-hald.rc 1111 RMD160 e4b6aaf254a8b909781006151d40060990681412 SHA1 3ab3c81517ee286a6407ff7e068b1ab0e2695fe5 SHA256 6c36fb7d9c2e3f29e9f35332a7ea97ba85d977de4cdd6b355e3a7d6c2b82aca7
@@ -63,12 +66,21 @@ DIST hal-0.5.11-gentoo-patches-3.tar.bz2 5393 RMD160 651604cfee7664036e9fd96491e
 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.12rc1-gentoo-patches-1.tar.bz2 3828 RMD160 3c313dd63c4f7b81bb61701222252086aeeafc1c SHA1 11d74bde76f6b03daa0afa03d3d7ccb83f8d6e27 SHA256 0f182436469223e6a2b06cfe2f2fc893f17c351075b259977f217756962a05dd
+DIST hal-0.5.12rc1-gentoo-patches-2.tar.bz2 3888 RMD160 ac48ef79686ce2e43dea86f810c41676eabdc041 SHA1 354f328f77d4f8357b00be1ea215854711cee656 SHA256 051ee462177ec635297764fd73b2bb938f5e28ad82fd331d2a0d7a06692be8ab
 DIST hal-0.5.12rc1.tar.bz2 1160384 RMD160 dce660d600c18bfd910814516b675f141d369824 SHA1 1dc809e98cea0fc2f183958da24921c2eaf55edc SHA256 eeeb438dcc2a58288ed3def8c1d0076ca16f35b54d501c46f96e89da24fe38f4
 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
 EBUILD hal-0.5.11-r4.ebuild 9500 RMD160 680791c2e323066bb90300179741133b51a54bbb SHA1 0c4d64fa18f9c9203e48660e85b57cb6c7255299 SHA256 a946413903f29c195a8f3326f07dc9ef1b8963351ff01e09368174446e33ab22
 EBUILD hal-0.5.11-r8.ebuild 8905 RMD160 ba2f97b013ae5c679860da801b7edef1c3f17d8a SHA1 cffa0f28bad0b0a2fc87be4bce88c8d0ce64fe50 SHA256 4a51ca34499fb2ee6ca76855e3d8aa6a74b173e72e91a0f9937c0942f784aae1
+EBUILD hal-0.5.12_rc1-r1.ebuild 9325 RMD160 6e0c22a4ffbc5501bdff8c3e72f40685e017220f SHA1 03d22b63423b5d757bb25fe40e17abf4074a138d SHA256 090c03f025f05c0fc01f34752d3b702b013b59c5c13012dfe82ae540b33a435c
 EBUILD hal-0.5.12_rc1.ebuild 8915 RMD160 e0ea0414013b4966064c237c77d7c2ec5402632f SHA1 1f47631c43cd82b21db23346739384a2e5b8c16a SHA256 bcf5f79ea719f98e31b3bec93525a8055895c328387143fa97af195dfb1f6865
 EBUILD hal-0.5.9.1-r3.ebuild 6704 RMD160 86eb2621d6b9c84e8a4f42d5421819137e4f27c4 SHA1 f554bb7afb5f8a382309c3b1f876ada8fc122857 SHA256 311fee1a7d36f23cbda362459bfa04a5bdcc119518c44bfd00724461e4607f2a
-MISC ChangeLog 46618 RMD160 88bb8d8665bda26d5216ef407da497a97398e5f8 SHA1 118429325a6e156e524461d8b9d5bfc7ba228dad SHA256 fde061a66efa67479eea9832b8b72f4beae50289bdb2031effcafbe9183adc8a
-MISC metadata.xml 1984 RMD160 263001c76f3c12d226f06e19e5a77997945eef53 SHA1 43d34fe6e9836b1291c144985ca017f0cc5cc143 SHA256 e389394a84294db6330bf3f300e3a511caab2460b9f35d9c922763101e4dad13
+MISC ChangeLog 47119 RMD160 893f029835852b40731a8d316699f07a5f2fd71b SHA1 c793efa9b50b6c42d1447d6cbc818580de6f5f35 SHA256 90cb9b445bd396e40db00124c61b1f7d1ec9759d2670a5471d2bd2274382b570
+MISC metadata.xml 2155 RMD160 1fcdfa6184292a67ea656d4f7ccb088fc6bdd1ae SHA1 9f176d6b9b599758551116a9e373f03450d861a6 SHA256 149100f02d310a485d9d543ec0bdf0848fbd079b813a6f8bb7e2f1a53790ebce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFJ+fosomPajV0RnrERAsC3AJ4pCGAENz7AI4rtoS1TJ7OmFrkNUQCfSQHr
+XNqHsOXQQ7LudyTZwnoJalI=
+=U2t9
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild
new file mode 100644
index 000000000000..deb79a0e6171
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild
@@ -0,0 +1,300 @@
+# 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-r1.ebuild,v 1.1 2009/04/30 19:20:44 dang Exp $
+
+EAPI="2"
+
+inherit eutils linux-info autotools flag-o-matic
+
+PATCH_VERSION="2"
+
+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
+		 >=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 )
+		 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
+				)"
+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/metadata.xml b/sys-apps/hal/metadata.xml
index e1a3c37fc38f..d99f82a375d6 100644
--- a/sys-apps/hal/metadata.xml
+++ b/sys-apps/hal/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>freedesktop</herd>
 <maintainer>
-	<email>chainsaw@gentoo.org</email>
+	<email>dang@gentoo.org</email>
 </maintainer>
 <use>
 	<flag name='acpi'>Enables HAL to attempt to read from /proc/acpi/event, if
@@ -12,6 +12,9 @@
 		runlevel (rc-update add acpid default) along with HAL. This will also
 		enable HAL to read Toshiba and IBM acpi events which do not get sent
 		via /proc/acpi/event</flag>
+	<flag name='consolekit'>Enables HAL to interact with consolekit for
+		determining whether a given process is running on behalf of the person
+		setting at the console.</flag>
 	<flag name='crypt'>Allows HAL to mount volumes that are encrypted using
 		LUKS. <pkg>sys-fs/cryptsetup-luks</pkg> which has recently been renamed
 		to <pkg>sys-fs/cryptsetup</pkg> allows you to create such encrypted