--- hal-0.5.11-r1.ebuild.orig	2008-05-30 15:52:14.000000000 -0700
+++ hal-0.5.11-r1.ebuild	2008-05-30 15:55:39.000000000 -0700
@@ -232,12 +232,15 @@
 
 	if use X ; then
 		# New Configuration Snippets
-		dodoc "${WORKDIR}/${P}-extras/"*.fdi
-		dobin "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py"
+		dodoc "${WORKDIR}/hal-config-examples/"*.fdi || die
+		dobin "${WORKDIR}/hal-config-examples/migrate-xorg-to-fdi.py" || die
 
 		# Automagic conversion!
 		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..."
-		"${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi"
+		# TODO: this should have something to detect failures.  Redirecting
+		# stderr stikes me as a bad idea
+		"${WORKDIR}/hal-config-examples/migrate-xorg-to-fdi.py" \
+			2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi"
 	fi
 
 	# We now create and keep /media here as both gnome-mount and pmount