fix bug#278642

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 24 insertions, 312 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c3958bf45c2b..c79173c4e889 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,14 @@
 # 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.292 2009/07/21 19:14:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.293 2009/07/22 14:54:15 dang Exp $
+
+*hal-0.5.13-r1 (22 Jul 2009)
+
+  22 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> -hal-0.5.13.ebuild,
+  +hal-0.5.13-r1.ebuild:
+  Bump to hal-0.5.13-r1
+  - Re-add lost root plugdev dbus policy. bug #278642
+
 
 *hal-0.5.13 (21 Jul 2009)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 895834fc6dbd..519d1cae2897 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 1118 RMD160 bd83a5f0c5b42c7530740e487fa1766e725e8b4d SHA1 cefd7afea19e81d26f529ecba10b70dd1a9920f3 SHA256 30b5364c0cf9c1e4ebf4a9f0fb9479434e8fe03966f863db8aa7ef9736104805
@@ -59,24 +62,29 @@ AUX hal-0.5.7.1-rescan-on-resume.patch 517 RMD160 7b16d9f68e32945951a1f5d6c27f69
 AUX hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 SHA1 8c1538eb5d1192e336627f1c59c365b2b73b0a6d SHA256 52191c2230af31f0bf18f39a5f0e6d24728da5c7e0de627be55046561318ca55
 AUX hal-0.5.9-hide-recovery-partitions.patch 572 RMD160 bb59ba36f8db6724466cbe41404eb11a9bc4e256 SHA1 856113162e0bed503eab43374eae052637fd9d02 SHA256 85e586bbdb5e450d34b691a54d73d6bfa4beac3a38538cac289a104a01927bd7
 AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b
-DIST hal-0.5.11-gentoo-patches-3.tar.bz2 5393 RMD160 651604cfee7664036e9fd96491e4ca4e73e78b4a SHA1 52d4c4157ceacec3f90aef602b2d227f5a5281c1 SHA256 db1ba0031baeaa0330fb876776a069fefd267bbbf61b9434a0fba2cc3e2e9453
 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-5.tar.bz2 4014 RMD160 dab46cd7efb0099be1961970261ec03ea3d6291a SHA1 55a4171b6df37f89df7b9baa0a9f6c19ccb4137a SHA256 339030bf17d4fc5eb4fe42ac9b2267e4bf2a6c1f27267f0666e1f4b18e59dfae
 DIST hal-0.5.12rc1-gentoo-patches-7.tar.bz2 4163 RMD160 deeddd0d71a53667a7aa17b049617a02a7728750 SHA1 e04dfe3c1d78c908bf7df0bb2385545b2fee4f8e SHA256 9ad8a7d8871e2fbfbdd5bf956d8b20001a3474f71b6ec552bcb5902c8a5a1463
 DIST hal-0.5.12rc1-gentoo-patches-8.tar.bz2 4196 RMD160 d503c42a03cca62fab12f3dc15897b20ce8fe37d SHA1 c3782090d2b8a1f0c69e58454a868896618e58a1 SHA256 6e5b3121ebaed2208ad30cd5778ead921e6480c06270da0aac78522a204cdc86
 DIST hal-0.5.12rc1.tar.bz2 1160384 RMD160 dce660d600c18bfd910814516b675f141d369824 SHA1 1dc809e98cea0fc2f183958da24921c2eaf55edc SHA256 eeeb438dcc2a58288ed3def8c1d0076ca16f35b54d501c46f96e89da24fe38f4
-DIST hal-0.5.13-gentoo-patches-0.tar.bz2 3863 RMD160 a49b664637f5b835a10813debcd3400b77e1c33d SHA1 262973dd71c620ebe70df8059aab306594d70e0d SHA256 ebb21a0fa3887b57f5efc5b3a9b0db4b4d1035dacaf46aec4e550760c81b1caf
+DIST hal-0.5.13-gentoo-patches-1.tar.bz2 4049 RMD160 82aa03e2c99a92aadd68f6ada69cc2b06b2371e2 SHA1 546d6752147535607e34ebcb622aabc2948ed13a SHA256 0354b295a4b5f520a28030bb1282101dac9556326648b91c7ca7045ad5a559d6
 DIST hal-0.5.13.tar.bz2 918835 RMD160 34537d5f8bfb96c52ca066e787282b354179eb8f SHA1 788485fa78b2aa7a9d6b7de537a68ceff1564420 SHA256 d47c9799c18929cffbce5bfa48f35c89657d7f630c6da682f193928697c71ab5
 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 9492 RMD160 054420886767ee8aa38596efb4bfaa9d91ae10a2 SHA1 3812fd6e800b0bc1247204c05caf8e195f0d2a46 SHA256 d610b3a5fa9da6329848c8f63b98d4df8da9c58c35f286b9d013168ac49193b7
 EBUILD hal-0.5.11-r8.ebuild 8898 RMD160 ea2eb3ac5b3fa3cafbd740a420d4b9c334ae2fcd SHA1 7eda0152fd68f157d87c26bd53c59aa0cec73c9d SHA256 2b3d3a29d4f09991ae074033e8cae94e137e53472b82ac6f321221bd14f14a33
 EBUILD hal-0.5.11-r9.ebuild 8893 RMD160 82350f2795c3be604aabd4d67fefbf45b98a742e SHA1 1f47d075d01d759b7bf287ba3f4b4bb8cad19b2d SHA256 af6589feba9fb9395f7d1e23bede156800fe3a870b94750c48c31c6a5572e5e8
 EBUILD hal-0.5.12_rc1-r4.ebuild 9457 RMD160 8c36a4e6afd426a17b68c73fb74e70aba18e2f64 SHA1 6e6c100839df5e85af09314e0ae3a83d6acefb60 SHA256 14046c9f90489f57e96319c645ed89dbdbd2dff7393fb6b41ed37b76443fcbf1
 EBUILD hal-0.5.12_rc1-r6.ebuild 9821 RMD160 3861e904a70e10534fbde7af2c2c88f46f154c5d SHA1 c91f15233b0af3fd5661ae66a58646317d9a606e SHA256 f367e528a48ecdf93bd1334299462ec093e8674810b567ceaa9b747f9038b634
 EBUILD hal-0.5.12_rc1-r7.ebuild 9819 RMD160 c7565228183c9e066ec6cdf4be1223ba8776a61a SHA1 81834c54e4daf1197db82b18482f5c26fbaa0e52 SHA256 d0a42e57f36a507e8bfb11cc24a600aeddb8df75485ff7eafdd634a80c7f9387
-EBUILD hal-0.5.13.ebuild 9812 RMD160 440a1b9f5ea1d318cb92f8869e484e60e722a15b SHA1 d09d60c8fab28ffeda5fb8099a04aa6c41010aab SHA256 157fba1c22cff05c73faa72475fc0267c5bbfad7cc53ae4b020f02d46981601c
+EBUILD hal-0.5.13-r1.ebuild 9815 RMD160 9c87133605c2010b4ed6afff3bc1afeef484416a SHA1 0cd072583e021b4b75c9a56afbdf0a5eeda359d4 SHA256 02a00788e824cbb9a02370cea63619f2ba975c96b4581d80b26a550db78ea5e3
 EBUILD hal-0.5.9.1-r3.ebuild 6696 RMD160 ef27a83167b45d014a5c165f74c6f9c951577edb SHA1 84bd6a256c6ad2eba888aed3c88869b2de2954bb SHA256 aee788e6497051c4c2a89478f31d49cdcb024b2fa216e0d7db9ef2f6a1a1a186
-MISC ChangeLog 49595 RMD160 5577942bc652cedf06d3e6146ebfd03ca54198e8 SHA1 846881c5f2098f1935efd4d4b8d0c6eecb98ecbe SHA256 b12cd7a7f9da3232daf57469ea9946c97af503aaf80f8a667dbc2d2c0f815353
+MISC ChangeLog 49801 RMD160 a749f3f9fbc2ba45da4ed30f4e77ccbf10c24def SHA1 6bf7dabef005b6c4a6f421009ed8d86b6be4f9af SHA256 3c10ea984e15b15d3871de960de6ca31fa3b2157b6f6187c693e617c976d746c
 MISC metadata.xml 2155 RMD160 1fcdfa6184292a67ea656d4f7ccb088fc6bdd1ae SHA1 9f176d6b9b599758551116a9e373f03450d861a6 SHA256 149100f02d310a485d9d543ec0bdf0848fbd079b813a6f8bb7e2f1a53790ebce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFKZyhZomPajV0RnrERAgWtAJ9T9d8ck+BPFEM15lVSVk18HJsJ5QCeI8Lc
+p6XP4cAeGMtD/3+GmfTvQpw=
+=XGvn
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.11-r4.ebuild b/sys-apps/hal/hal-0.5.11-r4.ebuild
deleted file mode 100644
index 34f822b681c0..000000000000
--- a/sys-apps/hal/hal-0.5.11-r4.ebuild
+++ /dev/null
@@ -1,304 +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.11-r4.ebuild,v 1.8 2009/05/16 08:49:29 robbat2 Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="3"
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
-		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
-
-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
-		 =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 )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		X? ( >=dev-python/pyxf86config-0.3.34-r1 )
-		doc?	(
-					app-text/xmlto
-					dev-libs/libxml2
-					dev-util/gtk-doc
-					app-text/docbook-sgml-utils
-				)"
-PDEPEND="|| ( =app-misc/hal-info-20080310 =app-misc/hal-info-20080508 )
-		 !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
-
-	epatch "${FILESDIR}"/${P}-ppc64.patch
-
-	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"
-
-		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 arm pmu) \
-		  $(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"
-		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \
-			die "dodoc X migration script failed"
-
-		# Automagic conversion!
-		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file"
-		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \
-			> "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
-			ewarn "Failed to migrate your keyboard configuration."
-	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/."
-		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
-		then
-			elog "We have converted your existing xorg.conf rules and the FDI is stored"
-			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
-		fi
-		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.13.ebuild b/sys-apps/hal/hal-0.5.13-r1.ebuild
index 04048f169d2f..6a4480492c17 100644
--- a/sys-apps/hal/hal-0.5.13.ebuild
+++ b/sys-apps/hal/hal-0.5.13-r1.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.13.ebuild,v 1.1 2009/07/21 19:14:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.13-r1.ebuild,v 1.1 2009/07/22 14:54:15 dang Exp $
 
 EAPI="2"
 
 inherit eutils linux-info autotools flag-o-matic multilib
 
-PATCH_VERSION="0"
+PATCH_VERSION="1"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}