commit: fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Jun 22 10:09:40 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Jun 22 10:09:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa966f8d
media-sound/pulseaudio: Minor ebuild simplifications. Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild | 14 ++++++-------- 1 file 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 7244e687d13..4b4924da944 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 }