--- hal-0.5.11-r1.ebuild.old	2008-07-28 20:01:08.000000000 +0200
+++ hal-0.5.11-r1.ebuild	2008-07-28 20:01:40.000000000 +0200
@@ -212,17 +212,17 @@
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die
 
 	# hal umount for unclean unmounts
 	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die
 
 	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die
 
 	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || die
 
 	if use debug; then
 		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
@@ -232,12 +232,12 @@
 
 	if use X ; then
 		# New Configuration Snippets
-		dodoc "${WORKDIR}/${P}-extras/"*.fdi
-		dobin "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py"
+		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || die
+		dobin "${WORKDIR}/${PN}-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"
+		"${WORKDIR}/${PN}-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