--- dbus-1.2.24-r1.ebuild	2010-08-05 21:54:03.000000000 +0200
+++ dbus-1.2.24-r1.ebuild.fixed	2010-09-09 17:14:41.307000062 +0200
@@ -33,7 +33,8 @@
 src_prepare() {
 	# Tests were restricted because of this
 	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-	-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
+	-e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die
+        epatch "${FILESDIR}"/${P}-thread-safety.patch
 }
 
 src_configure() {
@@ -75,7 +76,7 @@
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
+	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die
 
 	if use X ; then
 		# dbus X session script (#77504)
@@ -86,17 +87,17 @@
 	fi
 
 	# needs to exist for the system socket
-	keepdir /var/run/dbus
+	keepdir /var/run/dbus || die
 	# needs to exist for machine id
-	keepdir /var/lib/dbus
+	keepdir /var/lib/dbus || die
 	# needs to exist for dbus sessions to launch
 
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
+	keepdir /usr/lib/dbus-1.0/services || die
+	keepdir /usr/share/dbus-1/services || die
+	keepdir /etc/dbus-1/system.d/ || die
+	keepdir /etc/dbus-1/session.d/ || die
 
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die
 	if use doc; then
 		dohtml doc/*html
 	fi