diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-08-21 23:18:46 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-08-21 23:18:46 +0000 |
| commit | 8d08a7751fbe18b50a3de0990bbc2613da8310b3 (patch) | |
| tree | 747524fa344ca3ed854c07da8550093ae44503ed /media-sound | |
| parent | Depend on libtool 1.5 for 0.9.9 (bug #281342), fix dependency on udev for 0.9... (diff) | |
| download | gentoo-2-8d08a7751fbe18b50a3de0990bbc2613da8310b3.tar.gz gentoo-2-8d08a7751fbe18b50a3de0990bbc2613da8310b3.tar.bz2 gentoo-2-8d08a7751fbe18b50a3de0990bbc2613da8310b3.zip | |
Fix install of init.d script when all service USE flags are disabled (bug #267734).
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index 8b7f3e05ad9c..78fb3aa7da56 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.143 2009/08/21 23:16:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.144 2009/08/21 23:18:46 flameeyes Exp $ + + 21 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> + pulseaudio-0.9.9-r54.ebuild: + Fix install of init.d script when all service USE flags are disabled (bug + #267734). 21 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> pulseaudio-0.9.9-r54.ebuild, pulseaudio-0.9.16_rc5.ebuild, diff --git a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild index 9c9e5ec1698d..18f7d56e0110 100644 --- a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild +++ b/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild,v 1.2 2009/08/21 23:16:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild,v 1.3 2009/08/21 23:18:46 flameeyes Exp $ inherit eutils libtool autotools flag-o-matic @@ -123,7 +123,11 @@ src_install() { use avahi && neededservices="$neededservices avahi-daemon" use hal && neededservices="$neededservices hald" use bluetooth && neededservices="$neededservices bluetooth" - [[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio" + if [[ -n ${neededservices} ]]; then + sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio" + else + sed -e "/@neededservices@/d" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio" + fi doinitd "${T}/pulseaudio" use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa" |