summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-06-22 12:09:40 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-06-22 12:09:54 +0200
commitfa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541 (patch)
tree71ca8f8059350bc3591004afa8403f7b96120368 /media-sound/pulseaudio
parentmedia-libs/openjpeg: mark s390 stable (diff)
downloadgentoo-fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541.tar.gz
gentoo-fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541.tar.bz2
gentoo-fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541.zip
media-sound/pulseaudio: Minor ebuild simplifications.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'media-sound/pulseaudio')
-rw-r--r--media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild14
1 files changed, 6 insertions, 8 deletions
diff --git a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
index 7244e687d132..4b4924da9440 100644
--- a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
@@ -277,6 +277,12 @@ multilib_src_install_all() {
doinitd "${T}/pulseaudio"
systemd_dounit "${FILESDIR}/${PN}.service"
+
+ # We need /var/run/pulse, bug #442852
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+ else
+ # Prevent warnings when system-wide is not used, bug #447694
+ rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
fi
if use zeroconf ; then
@@ -289,14 +295,6 @@ multilib_src_install_all() {
# Create the state directory
use prefix || diropts -o pulse -g pulse -m0755
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- if ! use system-wide ; then
- rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
- fi
-
find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
}