fix deps, build, and install

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc3-git3 i686

3 files changed, 16 insertions, 7 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 6695ea74d60a..824241ce7fde 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.248 2008/09/04 06:07:54 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.249 2008/09/04 22:29:09 compnerd Exp $
+
+  04 Sep 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  hal-0.5.11-r2.ebuild:
+  Fix deps for udev (thanks to zzam for pointing out that it had been left
+  unchanged accidentally). sonypic support requires linux, move it inside
+  the kernel_linux check.
 
 *hal-0.5.11-r2 (04 Sep 2008)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 0fe1324cb896..89290ae9d893 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -71,12 +71,12 @@ DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 EBUILD hal-0.5.10.ebuild 8248 RMD160 c56d241e26b5482852dd5aed247ba7ac1b41c583 SHA1 4c923eefc4bbc0198b6f9f70b2270a9cfdb71ab7 SHA256 92d43d08a805e5dc2471aaa50b56f353061d49bcd220e29fb5f62d44d18d8e22
 EBUILD hal-0.5.11-r1.ebuild 9159 RMD160 63fe25020dc3330d3b883280c65f1e86d89f225e SHA1 92e8f894d5e7ffa59d9405da5fd08756e6308ec9 SHA256 de17a7078483c35af09e10115a5536c892e34c20dfaaba0834b8f1a1d7c155da
-EBUILD hal-0.5.11-r2.ebuild 9216 RMD160 77fe00238b601c50ae7bc4a162861bf599001118 SHA1 fc474fdc65cca65b39a89acd4607317662200775 SHA256 48a86ac02630a1713ad6c449ed6ce1508cc2dc4a3220025ed2a016435e7f4a28
+EBUILD hal-0.5.11-r2.ebuild 9331 RMD160 2f7e9ffb82e5eaa0929dc66c11f9f3c3229431aa SHA1 e400215b9605e0e4470797cbb6dd395fe5756392 SHA256 d311137f07edba8225a03c7e8248411c58b87960c54f6af7fb1f1d49bd61a21a
 EBUILD hal-0.5.11.ebuild 9067 RMD160 1cbcf4a96e0e60ca93076650cdad77fe1319e351 SHA1 9bcafee905a2e46659275d997bb100e790546c77 SHA256 0a45c5fc921ab371fe98739fd8dbd39d67a8d79aa475348bc479aebf7876880c
 EBUILD hal-0.5.7.1-r5.ebuild 6071 RMD160 60716b2c7ee1a8975437ce7202693d6afe4f4827 SHA1 a5ff8967f35cd274f0332d31375c40a2dc7b0365 SHA256 2d0ad70486b0daea4427e7fe175d2efe83c6b26eb7a65118383c5b612c4276cf
 EBUILD hal-0.5.9-r1.ebuild 8126 RMD160 5fa699350af9035dc46ce28ae47fbbbf1372d73f SHA1 fbb47635761675592f1dab9366d17aca9078bd42 SHA256 0eed38206886b8b27ec7021c5e098e204c6dcb610b5d38cc46928fc94cc8be1d
 EBUILD hal-0.5.9.1-r1.ebuild 7200 RMD160 825b2e12573f0e164fc95c747f883a4ff8fe407d SHA1 c411dd412d4bea656d36b8b5f337d7153c789e23 SHA256 acb2a201f38e6479155270fbbb2bf1866cc5729b0bac0e0ce1e776e5776959e5
 EBUILD hal-0.5.9.1-r2.ebuild 6876 RMD160 44e9c3c9dec8212f35b1b2bc2c29e0379ccfa2e6 SHA1 985e45b257741dcd5906a9af30cab854fc65fbd7 SHA256 9eda880949eb2ffb864102ec240b594be465cf5a5f26180c393bc3ffb0a89fd2
 EBUILD hal-0.5.9.1-r3.ebuild 6866 RMD160 74d77db8e6d4909a01ce886238ff3ea1c38790cb SHA1 830da9dbe53cadeccf4cf53766e39f19fc9f3801 SHA256 0bf9e0b12000ffab6bf9541c140eabfbd22942652bcf1dbf50edcfdd7ff703dc
-MISC ChangeLog 39731 RMD160 86dd517d89263dc90f34aab80228935de3ff98bc SHA1 fcb027e6af89659be946e3a0350ac5dd60171b9e SHA256 f802a79422d1cc3dd5fc9962f79d3d6589bbe09ee91dc5f0c9d128867a2b2e7f
+MISC ChangeLog 39987 RMD160 93088ce6b9dce046b671b7af066fa33fca0b91e7 SHA1 ceded337bf46f0841d7e9b26be5d3b9aba1e2830 SHA256 1150bd2d5eaa98671b755e8ab608f44cbf463c52fd0322c11c84f74b43818ae0
 MISC metadata.xml 2117 RMD160 b71094e3b086495c13fb59821096e055dab9ea57 SHA1 9c00ef716aaaa6db8dd389c58cc1631b9c68a199 SHA256 d70d7e6244bd2c73d835612df8b21b22990ca79cf83c2cbf5df8ec2abcb27855
diff --git a/sys-apps/hal/hal-0.5.11-r2.ebuild b/sys-apps/hal/hal-0.5.11-r2.ebuild
index dd6734ff8a6f..50f4a22460bf 100644
--- a/sys-apps/hal/hal-0.5.11-r2.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/09/04 06:07:54 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.2 2008/09/04 22:29:09 compnerd Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.61
 		 disk-partition? ( >=sys-apps/parted-1.8.0 )
 		 ia64? ( >=sys-apps/dmidecode-2.7 )
 		 kernel_linux?	(
-							>=sys-fs/udev-111
+							>=sys-fs/udev-117
 							>=sys-apps/util-linux-2.13
 							>=sys-kernel/linux-headers-2.6.19
 							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
@@ -171,11 +171,14 @@ src_compile() {
 		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} \
@@ -189,7 +192,6 @@ src_compile() {
 		  --disable-console-kit \
 		  --disable-acl-management \
 		  --enable-pci \
-		  --enable-sonypic \
 		  $(use_enable apm) \
 		  $(use_enable arm pmu) \
 		  $(use_enable debug verbose-mode) \
@@ -231,7 +233,8 @@ src_install() {
 
 		# 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" || die
+		"${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