Add an USE flag 'ssl' to disable raop (and add missing dependency).

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

5 files changed, 25 insertions, 11 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 9953a51a7eff..f7ecd834f840 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.255 2012/02/10 00:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.256 2012/02/10 00:55:34 flameeyes Exp $
+
+  10 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  pulseaudio-0.9.23-r1.ebuild, pulseaudio-1.1-r1.ebuild, pulseaudio-9999.ebuild:
+  Add an USE flag 'ssl' to disable raop (and add missing dependency).
 
   10 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   pulseaudio-0.9.22-r2.ebuild, pulseaudio-0.9.22.ebuild,
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index e1fe6f39710a..665d228b47d5 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -41,11 +41,15 @@
       Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
       real-time priority while running.
     </flag>
-	<flag name="equalizer" restrict="=media-sound/pulseaudio-9999">
+    <flag name="equalizer" restrict="=media-sound/pulseaudio-9999">
       Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
-	</flag>
-	<flag name="orc" restrict="=media-sound/pulseaudio-9999">
+    </flag>
+    <flag name="orc" restrict="=media-sound/pulseaudio-9999">
       Use <pkg>dev-lang/orc</pkg> for runtime optimisations.
-	</flag>
+    </flag>
+    <flag name="ssl">
+      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
+      (AirPort) streaming.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
index 0ad8c5d1ac07..1c4cc2f8fb76 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild,v 1.2 2012/02/10 00:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild,v 1.3 2012/02/10 00:55:34 flameeyes Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.gz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime"
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime ssl"
 
 RDEPEND="app-admin/eselect-esd
 	X? (
@@ -42,6 +42,7 @@ RDEPEND="app-admin/eselect-esd
 	asyncns? ( net-libs/libasyncns )
 	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
 	realtime? ( sys-auth/rtkit )
+	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	>=media-libs/libsndfile-1.0.20
 	sys-libs/gdbm
@@ -101,6 +102,7 @@ src_configure() {
 		$(use_enable test default-build-tests) \
 		$(use_enable udev) \
 		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
 		$(use_with caps) \
 		--localstatedir="${EPREFIX}"/var \
 		--disable-per-user-esound-socket \
diff --git a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
index 1529a1aaa9ab..35e5b9580fdf 100644
--- a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.3 2012/02/10 00:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.4 2012/02/10 00:55:34 flameeyes Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl"
 
 RDEPEND="app-admin/eselect-esd
 	X? (
@@ -44,6 +44,7 @@ RDEPEND="app-admin/eselect-esd
 	realtime? ( sys-auth/rtkit )
 	equalizer? ( sci-libs/fftw:3.0 )
 	orc? ( >=dev-lang/orc-0.4.9 )
+	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	>=media-libs/libsndfile-1.0.20
 	sys-libs/gdbm
@@ -114,6 +115,7 @@ src_configure() {
 		$(use_enable test default-build-tests) \
 		$(use_enable udev) \
 		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--localstatedir="${EPREFIX}"/var \
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index e8ac2616b426..286256378766 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.16 2012/02/10 00:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.17 2012/02/10 00:55:34 flameeyes Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/pulseaudio/pulseaudio.git"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl"
 
 RDEPEND="app-admin/eselect-esd
 	X? (
@@ -44,6 +44,7 @@ RDEPEND="app-admin/eselect-esd
 	realtime? ( sys-auth/rtkit )
 	equalizer? ( sci-libs/fftw:3.0 )
 	orc? ( >=dev-lang/orc-0.4.9 )
+	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	>=media-libs/libsndfile-1.0.20
 	sys-libs/gdbm
@@ -109,6 +110,7 @@ src_configure() {
 		$(use_enable test default-build-tests) \
 		$(use_enable udev) \
 		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--localstatedir="${EPREFIX}"/var \