diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-03-28 15:10:51 +0200 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-03-28 15:10:51 +0200 |
| commit | 791be15caa5a6d1a44253479239716b52b27e5dd (patch) | |
| tree | b63fc684ec4680d31d3a2ae8f002e4bb8715aae0 /media-sound | |
| parent | gnome-shell: missing tp-logger dep (diff) | |
| download | keruspe-791be15caa5a6d1a44253479239716b52b27e5dd.tar.gz keruspe-791be15caa5a6d1a44253479239716b52b27e5dd.tar.bz2 keruspe-791be15caa5a6d1a44253479239716b52b27e5dd.zip | |
pulse: sync with tree
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/pulseaudio/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio.init.d-5 (renamed from media-sound/pulseaudio/files/pulseaudio.init.d-4) | 12 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-9999-r1.ebuild | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index 83cff81d..189bada2 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -1,3 +1,3 @@ AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd -AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363 -EBUILD pulseaudio-9999-r1.ebuild 6607 RMD160 a85f22db7585be2180e04a50c08e0247c64fbe60 SHA1 ce80763310c6c13cfabb5da39495bc188f0dd11a SHA256 dc4eef8c940c09aa6278f97e3bafc3761adc7714e2d9e9b74de077476eb4922b +AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59 +EBUILD pulseaudio-9999-r1.ebuild 6607 RMD160 d9602bdfc228e1498868b4757359f96603714e2b SHA1 3822711a1691f745e06871b91c07a3c85ce5357c SHA256 086d729bc2ed46a03fecad283aaf06609dbd1d84debb38d7f99c496c501101b8 diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-5 index 30bc2abc..c573c030 100644 --- a/media-sound/pulseaudio/files/pulseaudio.init.d-4 +++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-4,v 1.6 2009/09/13 10:46:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-5,v 1.1 2011/03/27 16:58:49 ssuominen Exp $ depend() { need localmount @@ -34,12 +34,6 @@ depend() { fi #endif -#ifdef HAL - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-hal-detect' "$script"; then - needs="${needs} hald" - fi -#endif - #ifdef AVAHI if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then needs="${needs} avahi-daemon" @@ -54,7 +48,7 @@ depend() { #ifdef ALSA if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || - egrep -q '^[[:space:]]*load-module[[:space:]]+module-((hal|udev)-)?detect' "$script" || + egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" || egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then needs="${needs} alsasound" fi diff --git a/media-sound/pulseaudio/pulseaudio-9999-r1.ebuild b/media-sound/pulseaudio/pulseaudio-9999-r1.ebuild index 9f33ec21..3a31e34b 100644 --- a/media-sound/pulseaudio/pulseaudio-9999-r1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-9999-r1.ebuild @@ -153,7 +153,7 @@ src_install() { $(use_define alsa) \ $(use_define bluetooth) \ $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-4" \ + "${FILESDIR}/pulseaudio.init.d-5" \ > "${T}/pulseaudio" doinitd "${T}/pulseaudio" |