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

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

6 files changed, 33 insertions, 19 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/Manifest b/media-sound/pulseaudio/Manifest
index 37246e81c1bb..3a5f4395eb40 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -15,16 +15,16 @@ DIST pulseaudio-0.9.23.tar.gz 2095454 RMD160 1f5d19a40279327dcd04908e4f441c95a98
 DIST pulseaudio-1.1.tar.xz 1306168 RMD160 26faa0831a97ce02b1d9b256f5171ece797c721b SHA1 5ff451389951f79949a461b95168558cc4120e73 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee
 EBUILD pulseaudio-0.9.22-r2.ebuild 6770 RMD160 b84c8a4ac87cd7a4c1d4aa67d99292189d46b340 SHA1 10c5cde72a03eaf7f35bdfbcd526fa135263adf4 SHA256 84752ed5d692070f9680fb59016a5b1a937e78efa570ad59e33c3f2659d069fd
 EBUILD pulseaudio-0.9.22.ebuild 6642 RMD160 ae91ab6f182f82d1d57b97c54c8e604752ab51b1 SHA1 87eba7c04df4f9d83cf09b882035f957362f34f4 SHA256 b46d3b58beee09be02cc608add451b08f3d6ca8823c071fb087c31ddd448ac5d
-EBUILD pulseaudio-0.9.23-r1.ebuild 6411 RMD160 75584bc1827509256fba9928d470ea37347153bc SHA1 3f5d0a9a73d4af421da0ad7dce345d857cb60085 SHA256 bb38c86193aed9552405616b9e078dfbb5b2b4c96121585d61f470872fc02d87
-EBUILD pulseaudio-1.1-r1.ebuild 6279 RMD160 30b5950c0459692ec7c938e02027bbcf0b225918 SHA1 e22c405b80cce133170381a437d280cc2631493e SHA256 a29233e8b311a016b625d52d984ab9c34acc900cc1809542a2b64f29d2837301
+EBUILD pulseaudio-0.9.23-r1.ebuild 6472 RMD160 a102585405f89c2ad0919f8f9c9ec7bd4f7b9351 SHA1 35d5ef9c244d48df409bb31b81d5e4c62c414d26 SHA256 c4c86ec0b265882bfc695d9155db9c7c458e2bad0a6a68a16fa382f5f3d72dc4
+EBUILD pulseaudio-1.1-r1.ebuild 6340 RMD160 301c50b9b1a6a742877c0b03d55c4fd81190bf79 SHA1 c9ee47860fa3f9a447060453da5723e9b345b067 SHA256 2226441626a7bab920d9930b7528f74be186c80a363a6a14e69b5bc36fd075ba
 EBUILD pulseaudio-1.1.ebuild 6086 RMD160 5b46afd75b8b15f07601a72597d53a7d42debe62 SHA1 9100add556bcc38e21ba35a038ab60d81acfe08e SHA256 1e2e6fa19cc70307e8d785521dd26954d2ff28ad346a8c4b32e5ff78382e2bea
-EBUILD pulseaudio-9999.ebuild 6094 RMD160 de185ae8b2141cddb92d531f99fc28780ca61530 SHA1 3a35963903edd00ddcd890020f9b8b5b668bbc78 SHA256 000fbdf468bb660d13705e61baef76bdca0ef33317cf2c6651a47530e234abc2
-MISC ChangeLog 49401 RMD160 5ffb2d037a4caf1c18a4bae4e118eb0eca620fed SHA1 14cc39207aab9fbb0991781c708af276eb137d76 SHA256 5dac225dd3073e3cb952ad0fa203efb24c605a8b58db7e4c7a9c8ce02043d8e4
-MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b
+EBUILD pulseaudio-9999.ebuild 6155 RMD160 55516795fd1f7d0410a97d6369464c2cdb65651c SHA1 4e6f60086fdc0d6500f4a96905f8921664137cbb SHA256 fac2c2f403f0f50e6d224b8a13869028f4b3805372bc4caaf5c81dbc9b42bc05
+MISC ChangeLog 49623 RMD160 6021ae90de54a8f51c4e9434a9febe7d6d74d69c SHA1 f12540680a0433bc6c72a8b891707899bfb500d1 SHA256 daad2310934b67ea8b4dcad3436d6babdd2b5df28944c8ae53fa79218e3b9a19
+MISC metadata.xml 2364 RMD160 9bd91096af1532d34f0c315c17ae5481ad8a08c2 SHA1 af8a4b2ddcdd6c6038f8596847cac08b4f544448 SHA256 2764e0ce5b2a6011addf59afac9de9be7c5e6fbadf37826b1c6192247da1fc05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk80ZhcACgkQAiZjviIA2XiXYQCdGH13CdgjsVW1XBLsbuWbdTgr
-4A0AoMZDxeN+bMfyk6Dca6d9lP16zmys
-=2BTq
+iEYEARECAAYFAk80avAACgkQAiZjviIA2XjKdwCg5A+q/2IebgS4yImdeSj6e9t3
+1lsAoNve8o75RoS4nYM5ojTrnTPe+H+I
+=eoZw
 -----END PGP SIGNATURE-----
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 \