From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1D4E138334 for ; Fri, 22 Jun 2018 10:10:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBF9CE07D0; Fri, 22 Jun 2018 10:10:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0ED3E07D0 for ; Fri, 22 Jun 2018 10:10:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F472335C75 for ; Fri, 22 Jun 2018 10:10:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B295F2B0 for ; Fri, 22 Jun 2018 10:09:58 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1529662194.fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild X-VCS-Directories: media-sound/pulseaudio/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541 X-VCS-Branch: master Date: Fri, 22 Jun 2018 10:09:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2aab3c1f-c543-403e-bd84-50e3ad809329 X-Archives-Hash: 015116821a94ff9674f15c44617e6cd4 commit: fa966f8dc24b4f0a0f48dfc2f046bcdd88fe9541 Author: Lars Wendler gentoo org> AuthorDate: Fri Jun 22 10:09:40 2018 +0000 Commit: Lars Wendler gentoo 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 }