--- /usr/portage/app-backup/bacula/bacula-7.0.5.ebuild	2014-08-16 20:05:49.000000000 +1200
+++ /home/duaneg/portage/app-backup/bacula/bacula-7.0.5-r1.ebuild	2014-11-06 10:25:55.067352673 +1300
@@ -142,6 +142,12 @@
 	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
 	# bug 504370
 	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+
+	# Fix tmpfiles config for client-only (no bacula user) install
+	# NOTE: Change only first occurance (user) not second (group)
+	if use bacula-clientonly; then
+		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
+	fi
 }
 
 src_configure() {
@@ -185,7 +191,7 @@
 		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
+		--with-pid-dir=/var/run/bacula \
 		--sysconfdir=/etc/bacula \
 		--with-subsys-dir=/var/lock/subsys \
 		--with-working-dir=/var/lib/bacula \