diff options
| author | Eric Sandall | 2009-08-23 17:25:42 -0700 |
|---|---|---|
| committer | Eric Sandall | 2009-08-23 17:25:42 -0700 |
| commit | 2f49663448ad9f0372cfeefade31dc633986e481 (patch) | |
| tree | cb9a96283160078e15ab52835a43c673f86c7c69 /audio-drivers/pulseaudio | |
| parent | 62231585b0b03dd1c04f1aa33ecb3e0b10eb08fa (diff) | |
Revert "pulseaudio: Optionally depend on avahi for ZeroConf support"
This reverts commit 2c131e1865def6bed042d10485cbd2658ecc15eb.
SUB_DEPENDS contains SASL not AVAHI! Bad Eric.
Conflicts:
audio-drivers/pulseaudio/HISTORY
Diffstat (limited to 'audio-drivers/pulseaudio')
| -rwxr-xr-x | audio-drivers/pulseaudio/DEPENDS | 4 | ||||
| -rw-r--r-- | audio-drivers/pulseaudio/HISTORY | 3 | ||||
| -rwxr-xr-x | audio-drivers/pulseaudio/PRE_SUB_DEPENDS | 7 | ||||
| -rwxr-xr-x | audio-drivers/pulseaudio/REPAIR^none^PRE_SUB_DEPENDS | 7 | ||||
| -rwxr-xr-x | audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS | 8 | ||||
| -rwxr-xr-x | audio-drivers/pulseaudio/SUB_DEPENDS | 8 |
6 files changed, 0 insertions, 37 deletions
diff --git a/audio-drivers/pulseaudio/DEPENDS b/audio-drivers/pulseaudio/DEPENDS index 83c88d8b1f..48f3cf20b3 100755 --- a/audio-drivers/pulseaudio/DEPENDS +++ b/audio-drivers/pulseaudio/DEPENDS @@ -52,10 +52,6 @@ optional_depends policykit \ "--enable-polkit" \ "--disable-polkit" \ "for PolicyKit authentication support" && -optional_depends avahi \ - "--enable-avahi" \ - "--disable-avahi" \ - "for ZerConf configuration support" && suggest_depends padevchooser '' '' 'for Preferences tool' && suggest_depends paprefs '' '' 'for Preferences tool' && diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY index e5dd9571cb..08468aae34 100644 --- a/audio-drivers/pulseaudio/HISTORY +++ b/audio-drivers/pulseaudio/HISTORY @@ -2,11 +2,8 @@ * DEPENDS: Suggested depends on PulseAudio tools: pavucontrol, pavumeter, paprefs, paman, and padevchooser Fix flags for enabling/disabling X11 support - Optionally depend on avahi for ZeroConf support Optionally depends on udev Optionally depends on dbus - * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing ZeroConf (avahi) - Also include REPAIR^none^ files for the above 2009-04-14 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.9.15 diff --git a/audio-drivers/pulseaudio/PRE_SUB_DEPENDS b/audio-drivers/pulseaudio/PRE_SUB_DEPENDS deleted file mode 100755 index 64424c8259..0000000000 --- a/audio-drivers/pulseaudio/PRE_SUB_DEPENDS +++ /dev/null @@ -1,7 +0,0 @@ -case $THIS_SUB_DEPENDS in - SASL) is_depends_enabled $SPELL avahi && - return 0 - ;; -esac - -return 1 diff --git a/audio-drivers/pulseaudio/REPAIR^none^PRE_SUB_DEPENDS b/audio-drivers/pulseaudio/REPAIR^none^PRE_SUB_DEPENDS deleted file mode 100755 index 64424c8259..0000000000 --- a/audio-drivers/pulseaudio/REPAIR^none^PRE_SUB_DEPENDS +++ /dev/null @@ -1,7 +0,0 @@ -case $THIS_SUB_DEPENDS in - SASL) is_depends_enabled $SPELL avahi && - return 0 - ;; -esac - -return 1 diff --git a/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS b/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS deleted file mode 100755 index e58e6bba1d..0000000000 --- a/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS +++ /dev/null @@ -1,8 +0,0 @@ -case $THIS_SUB_DEPENDS in - AVAHI) echo "ZeroConf support requested, forcing avahi dependency." - depends avahi '--enable-avahi' - ;; - *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!" - return 1 - ;; -esac diff --git a/audio-drivers/pulseaudio/SUB_DEPENDS b/audio-drivers/pulseaudio/SUB_DEPENDS deleted file mode 100755 index e58e6bba1d..0000000000 --- a/audio-drivers/pulseaudio/SUB_DEPENDS +++ /dev/null @@ -1,8 +0,0 @@ -case $THIS_SUB_DEPENDS in - AVAHI) echo "ZeroConf support requested, forcing avahi dependency." - depends avahi '--enable-avahi' - ;; - *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!" - return 1 - ;; -esac |