--- pulseaudio-4.0-r1.ebuild	2014-01-01 21:23:13.212585588 +0100
+++ pulseaudio-4.0-r1.ebuild	2014-01-01 21:39:05.694677923 +0100
@@ -4,7 +4,8 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic multilib-minimal user versionator udev
+AUTOTOOLS_AUTORECONF=1
+inherit eutils flag-o-matic multilib-minimal user versionator udev autotools-multilib
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
@@ -104,7 +105,11 @@
 }
 
 src_prepare() {
-	epatch_user
+	if ! use system-wide; then
+		epatch "${FILESDIR}/${P}-non-system-wide.patch"
+	fi
+
+	autotools-multilib_src_prepare
 }
 
 multilib_src_configure() {
@@ -256,9 +261,6 @@
 		popd
 	fi
 
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
 	prune_libtool_files --all
 }