QA: Rename "audio" USE flag to "sound", bug 357661.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

17 files changed, 150 insertions, 148 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 9021340b302c..3699097bd54a 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.102 2014/04/29 11:49:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.103 2014/05/15 12:05:02 ulm Exp $
+
+  15 May 2014; Ulrich Müller <ulm@gentoo.org> opal-3.6.8-r2.ebuild,
+  opal-3.10.9.ebuild, opal-3.10.10.ebuild, opal-3.10.11.ebuild,
+  opal-3.12.4.ebuild, metadata.xml:
+  QA: Rename "audio" USE flag to "sound", bug 357661.
 
 *opal-3.10.11 (29 Apr 2014)
 
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 128dec7046d2..0f370dcc8d68 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -23,29 +23,26 @@ DIST opal-3.10.9-htmldoc.tar.bz2 3163056 SHA256 c7d2b66415cdcc0544e92dfefdbe0cc0
 DIST opal-3.10.9.tar.bz2 8591506 SHA256 f6a1c380df5c82c24ff6cc82c5c6a94868b112d5914395ad8265e30b0005bf2e SHA512 11e67bbbb7903aa176c0563d48c444d6c3df399dc9f1c7cf1ff9124a96fd719e5608d0e091346de3aa2087e04d28116b14c2c60bb92f2fc83584695e2e61ebcc WHIRLPOOL 5790274802f909f428950d3c249abcdfae03f5046381b631c25c7ccc23a34efd07bfd26d77de755741b786ed69cac8c411d7ec9e70286c828595eac4e00d8c4c
 DIST opal-3.12.4-htmldoc.tar.bz2 3094840 SHA256 858cd14bf2de54a6aeb5397d8627a7e50ea6b63e18b0f47c057386d079b07fbc SHA512 c80ed1b0df9fffbfc07ea590a0e80afd9b985ed2971deb640e92776723f12e6a544eaf3441261d34df0ad0bbca6b03a983f7a7b0b92fbf333f1a8688d2ca735d WHIRLPOOL e2d5ba8e4429c60003dd995add2aea12b22a2f23da8dd3ed0025fa451752412805d4f25160809542dd8d61684edca35d73174037650b3546cedc97495faa29b9
 DIST opal-3.12.4.tar.bz2 9694052 SHA256 2786bc27f83c59d74165e318656ada230164ebcba61f0d8cb1b55bfcd13b2d82 SHA512 83c44dbd077e45a5bf63963b8a5348c24c65e9ab8b25afccacbf4632aa55fce26b6133c8c40f06da90fe73865165509c67b19286e868eada0270adefd3e38733 WHIRLPOOL 3063d5b9d64e690898d60e5e26f3936b28b954ce7fb2a2dc2f78cfde05932efc63ec7874dd73c87561d1a3c3f564837855559ca031121e7d9fe18c25508042d7
-DIST opal-3.6.7-htmldoc.tar.bz2 5842269 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
+DIST opal-3.6.7-htmldoc.tar.bz2 5842269 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b SHA512 83cefcbf098c1c1232fb63817b2a3f9647b78cd1ab0e5410576d882d9334197580bec032f1a2e5cee4b06251ad88cd7b197be0247f4845329301ee0fe44471a3 WHIRLPOOL 37cde59d7d80e7ae46a3a4bfee90b0d5fe29e17ed708b73bbc72f309c4a61aba368e4c0e60fd2e2600b3aeceaa00e4f80fc97ad834e277d33eb58f1c1e731b9b
 DIST opal-3.6.8.tar.bz2 6837993 SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c SHA512 bc9ce66af9fc7a82fc33403139f138d732b4f3e013b91b711533572036f0d965b19961aa1dcec63efb0ed906e7525eebc972cd106e6011e40d80ae0a0b7e8a51 WHIRLPOOL 031a98a0e0e6c6b51271898cf836dc805a7341b04f018a6604560572054e00402f1cf092d2a8828ba476ba1bb0331cbd34e7bd2b078ecd3cd0a3b51b7adbd5d5
-EBUILD opal-3.10.10.ebuild 7575 SHA256 97aaa8326679e412531c2f6942dda02d63300910a8fb40ecc657af361a77af5e SHA512 a932e59c0d2b31d829be3d7abf007e26e0a201157dae4924d16807a8dba901b6e285e1c6eb5f5814a1acbe696a0cc78a183ff16a635da9f2324710d537137eb0 WHIRLPOOL 3aa5ed1ff207b3ade0328dfb7bb80ee8fb47a78d01a03a974f2feaaf1700545eb84ae2043b19ef2dab6d6a2466f0601d801516ce79575edfddbf3abc4b413a39
-EBUILD opal-3.10.11.ebuild 7626 SHA256 480ce9be7e942466469ef5da3f2d7faa61e212b3fa4827e94c49419929023c7a SHA512 cfdd4ebcfdd679f85dbf2adeb9308c1c0c7549126feeda9be8da9a3aeec0613a4a0688778603a36f8d8231554bd44f4b0ab142e6e2c87ea6588ed2f2faa1642e WHIRLPOOL efe22213283a3bf2784af1dafdb858dafcc4f2f0e8680daf57cc602e3cb6ac764fb5c56f5ac0ae5a46291965c0e897d2184194f292af909a655a4b4da00b93eb
-EBUILD opal-3.10.9.ebuild 7499 SHA256 a848325025549d7d03120018307c932d56e49d4b4f69241dc2d6f08da01d2a87 SHA512 2ec660c2e210439aee9d07dbe963aee0352c724d791244d3deaa0209a9e01cd6a8eae01ffda543ffed6879b0fffa5dceb4822f127278f8b67e405283dca4868e WHIRLPOOL 8983c174c7864b50ee4d523d41d7bf34ef5c0ba4efbc11367f236a6b7f8171a8031df8597eb954487ff8ef1547a1557394252cdb52f85f74a6e8a77b9e5e35f6
-EBUILD opal-3.12.4.ebuild 7038 SHA256 efeeb3db5056c1df69fbccd2fa97d214d5cb257e72fa3617c9a7dcb94fdf504c SHA512 4b0951eaadf2ecb50481510eb81e3ab1188f0206ab85528ce5e449efbf66974bd6dd2b9304753d7da2e2c70572401f176d270b63b4c9ebdc7412d73fc401403a WHIRLPOOL 882d5838d030d128d6fcb39cc7754eb0120a5f8b2594929f016041c2fa4272318d241d78146b5acdf7c54564c896778a853cd9621aa21db1d53995e4cfa93165
-EBUILD opal-3.6.8-r2.ebuild 8585 SHA256 c6c1ef36127128af903bab827af9461a9356f6b9d142c85983ccc1534abbb615 SHA512 8e48150a179a5cbdba9fc9bb5802057727d11929f84ebe6e9e6fe9299dde2d53a8c4bb8f23d5d5a333c96d2056e1d44240c32a25b6fd03fcd08134356f297c34 WHIRLPOOL c7ce0b8f6d64eb62e8681651d90efe85a26351403fadd43c1a474df3dbfb8c641e92986900d6b79ea524aaeaf3a256c902a41d09355e38b0e074ad933bf3c605
-MISC ChangeLog 15134 SHA256 5176000e57db45a4305ebeba3304039812d6d64d0679b3324b95da534d00d9ba SHA512 58d08e88ef21a04e94b59f31fda7eb9f5a47a3a2fe6cc764237b0be90d81ccbda63cbff45462a1597d827541223fe4a3e1e39de04388183a463344602084a8dc WHIRLPOOL 9b4ac8dc5eeda38fa5b6b4c32ac7c70468d075765c6df7077a2d127253030791b247cc4b616b3eb4afc6e16eb503994e6ed2ea133d463881017f2b1f7fe9f989
-MISC metadata.xml 1983 SHA256 f969f663ec04d6d49561f82dcee92da943f4ac35c9db43e61e0e6475837e73e5 SHA512 91798e7a3581515ecb1beea68c5021e3dc9674792d695e46181b2dc055968ff06536a7e0a7a4c39015f330b4d7132df7c405a20e467f1ff753292f8b3d62fe76 WHIRLPOOL e9d062f3d78057bee270f365187212bede3b1906e74aaf7498fd3bcbd2133813b7f7cfbf01e791fa11e031771f6c1d44f4041431d45729ea38b584815ca86072
+EBUILD opal-3.10.10.ebuild 7573 SHA256 00cf9f8101384c8fc840ef862af72d22f939e5a8b254db951030f8713c001244 SHA512 fa2ab0d71a775a3da93bb06c71a3a90d92dc738785eae863360f8b945d3e1fd7a5533e99df8b4382c8ca0e4c1c81ca456694deb3abad161f032966f9c2217452 WHIRLPOOL 7c828e360cf209964922f7ab07cd3170c28cb94705a9d22301af8199a63ca51ef0d0cb5ca736a4f49a8b0b7895a4d111ffccb7255a74476d90baa851156a5a57
+EBUILD opal-3.10.11.ebuild 7617 SHA256 0ea50cc700a9370158d85937180b5585f1623449954eff50dc36fd5a84e99950 SHA512 9c72521218c58336e75d125ff14f20754ea51e0ae9b3f0c2a2b8b4a87448cd1e09bc781c4302f4be279e8f3e170b249662e16c8f6060667187e9bb6bb959ac5c WHIRLPOOL d677c6b3fd11174308eec30fd712b5940ee58402cfd2d153968e123854d9defe1263b3850cf783514d070b4c9b5613501765e7e0f39b088cad6a90d34da7186a
+EBUILD opal-3.10.9.ebuild 7494 SHA256 1c3344e9475c7662d93c49b56db861a65f66b429638178cecb8a0726a97b7027 SHA512 373723bcecb85d6cf856d56f712ff68fb3417b7ae8d6be290c2c7f91944f252c507cbffa7d9d093442f3e4d7dd519c7ef70071c177c27f56a854ceccf876fe4f WHIRLPOOL d398c7f8463d2da45fcd2ab42df61a3155427aa97d7268148ec63ca627b0bc06bf2e7eb9e5f4bb609507298769bc34a1ed938a4b6c9408334d08d8c4024160a9
+EBUILD opal-3.12.4.ebuild 7032 SHA256 51517a11a1e4aed1bd1dcc768d15cd1b4ec22b76210bacca580f79b6781efc34 SHA512 bd9253592b42c169df578a0b4d31e07b7fb6b7b96642792a8242294ae89f896665411c694336db77511f0be66f5eb1479905e68070c4ff5f0c10d9dfe44b8e06 WHIRLPOOL 91924dfb2354eb2ca86f178fce890503b5e3eaaddc355f601518a80a1eb4e6385a27e219e218829b787929254d8a26a677253bfd188d2056ab6cb659bb7c4c09
+EBUILD opal-3.6.8-r2.ebuild 8582 SHA256 5cc44a330efe3652770d65af355250f58b13e7b5bbcc5b41303f9fa04730ec7f SHA512 e28376a527907f381e08e8f6e6b5f2c30395a4558902d524f89c17c7a640c86a9324bde5dd901a76e97547019de30b94709bc4591635f4e1553560fa442908e0 WHIRLPOOL 10075f1285f8fed51c02fc201a3b1f03c90de8fffcada8134efaf611c510b07a21a567cb9d188f7f5e55e4cd7027183dcb8ebb4dd78c0ace7df109e591a71d86
+MISC ChangeLog 15349 SHA256 f7efdd9c663a6c6e5ea176a8bb771aae9fd0809fef6074138d84895396097150 SHA512 ed4ded3b237305d4b132b69abdf970abaf869fde489221ad24fb8e4438209a80c44a457141976eedd2f1aebfcebf1060f4a63b3e13c1531bdc87c2688c4433f0 WHIRLPOOL e982cd26ad836ff03dcfb68b98b0304ac82d9c4ce06f7f203a402aeb656fb30a195243bac8fef078f635c594e2fd5cf0b22b04b46177cd6f4456714f1b2c43cb
+MISC metadata.xml 1934 SHA256 5f53486d7d83eb7823a8b3007744eb7a5a1d1d6849e112e4c74acd7a78e1b07d SHA512 6da5ad6db58c999c715763690733b8ae776862e922f88a87c0d0819fe13e339a7d7cd834f8623a4ffec6cd253532db81f8313ceb304bab3e5034e8d7a4146f4b WHIRLPOOL 9c4fe8f421f0086c758581668ebeb4598c90bfac5b80cddc797b432c529bb61a0fbf23785afbd3cc75f7adfc339a45e81bcd39122b75ae8f2543c91578856398
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTX5HnAAoJEPiazRVxLXTFMAgP/Riw//nPqZQt7w6TuEo8U4Da
-4plmL4jhhLbagyLtNMvVh+P2UCzc0S50tDumVXIpdWEKVxAmTdjAZ1pbQz1O8NeG
-uhOG/sL9TcjdhPnQRJZKapYmCa/TBzHa1PLdxgmxqnnDuEuaD8KPAF+ryIePCbBU
-TDm0O+xTKIhTcSud/5nr5oOMFq+7U82UbsmPv3SDXci13alDAp0xRA+N5k4/WYwR
-/KOG2oAUxhMK+KvS1EzykNeyHg6LwdYIYDGWCDT3iAgMDyaK9pbLokvTIQCzTxpC
-7cJfIj0akHz9M4juH8iBrk4SEYqoTZmJOlCMOgH5fpvp9lRzLb8441bZzOa3XMht
-tgPGLM2wvsCOHpgksXka190zO283q4T2OFLB7JoTVqJ1e9QdGtpBA0ZrMWYrlFhB
-GwauXIxq1r94tKDFdMNg8j0fm5k0+HNFEYomRz0vYAmotzgmZW4c7/y1bQpJeVfl
-8Al8f2+kkbfkhaWehieEumQvJLlw6VrqJ1aYYcWXB/Fj+xGb6o+PkJlW+K1nFsn6
-6fkCRVudBLSQJMP12ih/POoVLQ5l0/CdDYQkU3IuGsYHlTe87epJjKhmbUwZyFFo
-lAQ0o8EJ5n39aHfdEQX4LwvZoZoDOCZWnilUX5IMHqrfP0PH2vOuNfCSoOfS774z
-X5J/5G58rsOKp+XAwHQv
-=9iWV
+iQGcBAEBCAAGBQJTdK18AAoJEJQzkH1pP7W49RsMAJHC2erg/2m8abbDLraDu2b6
+TxlqKkMM7RCHTEi/KYSNJEAw0Xx93PpLrhOVfCMHoDGMLa83iRGa/oMCnB8AFfnD
+xaA7uctkbbdYCPgCwCv62fBCni3K7rwegYS2kp3m8cVPZ5HuKy+NL6dnH34JoJOl
+5Sb2RX9fzqN4RjxPnnLB5Pbsv4OuyRz/jXHc1YBdQsyIGcUdh5QoiiCN0o0Kj2B6
+ka1dLD/hINZK5B8HQ4d/AoajuhA9LUKt4E/sUvzUz4udhDvQwLINZwPEs7qNIDSo
+ziwJdLNuxq81W6n+HigklimiVAQj+Z9HZ9Faubm2yCKrYXV4fwBnRYOTmt15IpC9
+wV283lTHp7HiLR0eEStWpvx7vu/ScybWJQPw2sXebpi/1H/HxzBbD2VdraR9qRf7
+oND6sZLgfSpIOziFWIr5/HXFqATrq077zB3NsYZl/oYmJBPbfNqTlofKOoRMGs+W
+gEKx02K7g8lx5KLtniwR7tal69rrFd0EE9DhRJjMuQ==
+=YLAS
 -----END PGP SIGNATURE-----
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index cd39484420b4..ba4c06a954a6 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -6,7 +6,6 @@
         <name>Jesus Rivero</name>
 </maintainer>
 	<use> 
-		<flag name="audio">Enable audio support</flag>
 		<flag name="capi">Enable CAPI support</flag>
 		<flag name="celt">Enable CELT ultra-low delay audio codec</flag>
 		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
diff --git a/net-libs/opal/opal-3.10.10.ebuild b/net-libs/opal/opal-3.10.10.ebuild
index 2cb56f8f597c..6636bb3c5b64 100644
--- a/net-libs/opal/opal-3.10.10.ebuild
+++ b/net-libs/opal/opal-3.10.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.9 2014/04/03 10:10:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.10 2014/05/15 12:05:02 ulm Exp $
 
 EAPI=5
 
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )
 	sip? ( sipim )"
 
-RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -243,8 +243,8 @@ pkg_postinst() {
 		ewarn "it will depend of the enabled USE flags in ptlib and opal"
 	fi
 
-	if ! use plugins || ! use audio || ! use video; then
-		ewarn "You have disabled audio, video or plugins USE flags."
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
 		ewarn "Most audio/video features or plugins have been disabled silently"
 		ewarn "even if enabled via USE flags."
 		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
diff --git a/net-libs/opal/opal-3.10.11.ebuild b/net-libs/opal/opal-3.10.11.ebuild
index 68576fa744c2..39376ff1e80f 100644
--- a/net-libs/opal/opal-3.10.11.ebuild
+++ b/net-libs/opal/opal-3.10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.11.ebuild,v 1.1 2014/04/29 09:02:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.11.ebuild,v 1.2 2014/05/15 12:05:02 ulm Exp $
 
 EAPI=5
 
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )
 	sip? ( sipim )"
 
-RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -244,8 +244,8 @@ pkg_postinst() {
 		ewarn "it will depend of the enabled USE flags in ptlib and opal"
 	fi
 
-	if ! use plugins || ! use audio || ! use video; then
-		ewarn "You have disabled audio, video or plugins USE flags."
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
 		ewarn "Most audio/video features or plugins have been disabled silently"
 		ewarn "even if enabled via USE flags."
 		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
diff --git a/net-libs/opal/opal-3.10.9.ebuild b/net-libs/opal/opal-3.10.9.ebuild
index 131fc77b99db..9fa014e613af 100644
--- a/net-libs/opal/opal-3.10.9.ebuild
+++ b/net-libs/opal/opal-3.10.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.3 2013/06/25 16:11:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.4 2014/05/15 12:05:02 ulm Exp $
 
 EAPI=4
 
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )
 	sip? ( sipim )"
 
-RDEPEND=">=net-libs/ptlib-2.10.9[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.9[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -243,8 +243,8 @@ pkg_postinst() {
 		ewarn "it will depend of the enabled USE flags in ptlib and opal"
 	fi
 
-	if ! use plugins || ! use audio || ! use video; then
-		ewarn "You have disabled audio, video or plugins USE flags."
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
 		ewarn "Most audio/video features or plugins have been disabled silently"
 		ewarn "even if enabled via USE flags."
 		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
diff --git a/net-libs/opal/opal-3.12.4.ebuild b/net-libs/opal/opal-3.12.4.ebuild
index 479d6848986b..6a7a1254394b 100644
--- a/net-libs/opal/opal-3.12.4.ebuild
+++ b/net-libs/opal/opal-3.12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.12.4.ebuild,v 1.2 2013/06/24 16:43:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.12.4.ebuild,v 1.3 2014/05/15 12:05:02 ulm Exp $
 
 EAPI=5
 
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )
 	sip? ( sipim )"
 
-RDEPEND=">=net-libs/ptlib-2.12.4:=[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -226,8 +226,8 @@ pkg_postinst() {
 		ewarn "it will depend of the enabled USE flags in ptlib and opal"
 	fi
 
-	if ! use plugins || ! use audio || ! use video; then
-		ewarn "You have disabled audio, video or plugins USE flags."
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
 		ewarn "Most audio/video features or plugins have been disabled silently"
 		ewarn "even if enabled via USE flags."
 		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
diff --git a/net-libs/opal/opal-3.6.8-r2.ebuild b/net-libs/opal/opal-3.6.8-r2.ebuild
index 16f38457ea18..5dfd07966ed3 100644
--- a/net-libs/opal/opal-3.6.8-r2.ebuild
+++ b/net-libs/opal/opal-3.6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.12 2014/04/03 10:10:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.13 2014/05/15 12:05:02 ulm Exp $
 
 EAPI="4"
 
@@ -15,14 +15,14 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+audio capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax
-ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+IUSE="capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )"
 
-RDEPEND="<net-libs/ptlib-2.10.8[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND="<net-libs/ptlib-2.10.8[stun,debug=,dtmf?,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, dtmf, ldap, sound, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -271,8 +271,8 @@ pkg_postinst() {
 		ewarn "it will depend of the enabled USE flags in ptlib and opal"
 	fi
 
-	if ! use plugins || ! use audio || ! use video; then
-		ewarn "You have disabled audio, video or plugins USE flags."
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
 		ewarn "Most audio/video features or plugins have been disabled silently"
 		ewarn "even if enabled via USE flags."
 		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 1b600becf82b..4b2608371302 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.51 2014/04/29 07:58:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.52 2014/05/15 12:04:06 ulm Exp $
+
+  15 May 2014; Ulrich Müller <ulm@gentoo.org> ptlib-2.6.7-r1.ebuild,
+  ptlib-2.10.9.ebuild, ptlib-2.10.10.ebuild, ptlib-2.10.11.ebuild,
+  ptlib-2.12.4.ebuild, ptlib-2.12.9.ebuild, metadata.xml:
+  QA: Rename "audio" USE flag to "sound", bug 357661.
 
 *ptlib-2.12.9 (29 Apr 2014)
 *ptlib-2.10.11 (29 Apr 2014)
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index 4ffaed83001c..b99c84170f01 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -18,30 +18,27 @@ DIST ptlib-2.12.4-htmldoc.tar.bz2 4194043 SHA256 61439b61736fd1f9145353850571ee5
 DIST ptlib-2.12.4.tar.bz2 4049589 SHA256 e5ec52f9e39d4d73f73f966a52d67a158c78058ef3d8af33a43d17dfcc7a89ab SHA512 2154d2f7afdb76c58e1ad72d5b2f9053fee55ba42624dbf51699b3934c60397cfe8567a265f00e4bc8db43f4be54112a33c359de8fa87507bf2931f4fb06da2f WHIRLPOOL a82ffee2afc0d2a8793d912a30ba0c2cd47189afb1dcd4104e08923a14bdd9ad7e4c178cc7290654e3d03a18dee028a8bea320a5e4cfa1085c7ebb543bbc74ae
 DIST ptlib-2.12.9-htmldoc.tar.bz2 6069775 SHA256 1c03474f1c27a8b7648497b1cc95296f07aa398f1b45d9ae4dc2cfad95b1c7f7 SHA512 08800ef09be97573d9e861da80d98723ffbf55ec76c3e3a7788f811cf7d04bbad35d4c2363cc696a2aff9f890dd8e09967825266cbba4a6cfdb916f9df26d70d WHIRLPOOL 9606e2538bb842fea5382dfd95a83b41fd7062336b058e2a95615725e688ad4b40a95cf0ce9669cd786c3c94884cb82f77660ee490ae6e780f8307d55767713d
 DIST ptlib-2.12.9.tar.bz2 4134345 SHA256 e38d31a24a41546b7a84673f9c42ffab60ebd83727254cf5bdfb85da46565adf SHA512 1a7869203aff7779d318c6a2f70e0fe6181381696493f7c1ea69113c9795e6a13e4423ed3609b5e6d8900388eedc3bcdb6a19e9d6f03357348b21e1003ef917a WHIRLPOOL 5652bdee09d5d8ed3079080bc1d4b8bb495a8812bd49b2e963645c47673af3789a80c9d0a9aeaf0d4ec9d2782637b8763e625db340c0cc94ce362bb952c9fb9e
-DIST ptlib-2.6.6-htmldoc.tar.bz2 2089135 SHA256 b72ce069519850c76e943a7c38f09181028792e449a60e5b0b09ed2aed5c99c7
+DIST ptlib-2.6.6-htmldoc.tar.bz2 2089135 SHA256 b72ce069519850c76e943a7c38f09181028792e449a60e5b0b09ed2aed5c99c7 SHA512 7815ed49f17f1de50b1f3e239dbb74daa81206438698c58aa0162876d27dad23778927ab08f5daf2b93e6a6fac7ce565214ab4111992fa90bdda9efad3301ec8 WHIRLPOOL 0d3d316101ec24c96965435c466a72da002c6f04526b24949a2b01091c73520aa43b8a89a2c45e65704639e26ad7738ab5bb1dba000884a18e26fd6c60d05adb
 DIST ptlib-2.6.7.tar.bz2 3275152 SHA256 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f SHA512 bb897896f407f32923472b077f58ad8190f90ef2f9d276f9053aa777e919828a366c7e8dbcddfb800d08ea811cc4435e2ab0b814349946fbad4f9ddf4e53492e WHIRLPOOL 4b5bbee794fd3fb2d69a5b11a2fecc38c8d1552001679920cd6bc7fc71a1830da653b165ae12281c0de8715b996074ce8da75d3edc2ffa49e32c69efdaf7c586
-EBUILD ptlib-2.10.10.ebuild 6514 SHA256 05d38ddfafe9d142456ed7843b566e45a53ea489177d1633c5af31aa05904590 SHA512 22553483c55413600687b0d6f2f3c39b97cedf79c68f35f575703d445ad6c3438fa8439d0a992bc66e87237cb70fff9f1c2a33ef47020c88acd0fcaf00d84819 WHIRLPOOL 8bee45fefd5c2dfba81d4065b581f49470621acc0c4a6f4959603a33510a37e4925d3c6b626492c00add34ede6041d1d39ea099c5becc16b7a6da9b8864e0c42
-EBUILD ptlib-2.10.11.ebuild 6583 SHA256 e768b9f6eb51e7211641123357c5e8a32fc0c9842dcbade3133dbdb81daaf5a3 SHA512 51ebdc8aadfc4d2f7651c5ba709e810a7bff378d02ff87eb59a1da3fb04d28ad33611494fbb6b69a0930e97c509577f0ba1b48af689b85dd9081f7b1ce77251e WHIRLPOOL c81299c860263aa4474299dde41bcecd1dd1168e23d1e3b27bd0ca5c306f2d43c6b76f18162fc0419c5998adfd9aec899d4d8480d1533a0861b7cc0e8a8d9be2
-EBUILD ptlib-2.10.9.ebuild 6342 SHA256 b7e9f369b2066f0c1a2df472d04d66ca9a8c2a7b353bd0d2e704c2ab2322edba SHA512 005373868fcd3626443a7c313e9acfde945b115cda8ff4ff790b77d6949f00f0b9faeb023fdbbe78e11648f8342cdd3fae6716a74f6dce34048da6dc7f7bf276 WHIRLPOOL b6ef7353a31d4c37249869b75aab1c49d1428e557eef8b855546a971f2b560d4ee8c88798be6c45e1e2dfb5e621e1ca423fbe4853c1e7681f7f64e3042c70c09
-EBUILD ptlib-2.12.4.ebuild 6261 SHA256 16e5c5e4f49f103e1b7870e15fac72d3c9d970fe48520a73107df62f9189cb85 SHA512 ed22b0817da79f329235683ab1007ebad56d4328ec8c445b02483682c3fcd1aa2784f60ad8eb67b660cfb1c448bc72a9a68669dcfcc138970bb10056c5db15ce WHIRLPOOL 5487411fa8eb30f446ce769b25e7de476042d02297aeacb03e887684020ca485b544e296447a45b4949a8db5f89b6281acf1e37ca1c68b189de7e6b31643187a
-EBUILD ptlib-2.12.9.ebuild 6252 SHA256 43322cb969f625c6672a664cf0c6c0e3178fd3731f5e6d324d95347be50ddd88 SHA512 f23864e25b129c33b9cb361db28cb06de9d60307f3d57f10e1dbf4e60a209e50c1fd46727f23e35d6b2cc188d45286c92876e2e997b5aa64a81668a10df272e4 WHIRLPOOL dd8b3bf49d87d39857e7c693710960861a422c6dbe92258d915e6d5760535a57b212e2150b987ecf63a4750e2c458830c921383c69770424b452f30d35d9a858
-EBUILD ptlib-2.6.7-r1.ebuild 7532 SHA256 155aaa9f67da69f6424b8d892172fdf04975cf1f185195e3af91a961592249a0 SHA512 2edaff054d46a8824ef8b4ec4672a1d41e1400b204ad464e070b9434e0ca3011655777c04a9ab4b879b178c1b237a5764ea3ce0d0fecea43ef082d3f590fa9c8 WHIRLPOOL cf17fb6515d69272e403aa3f2a3176121c334ea06834b00e82cc59d1f3e782966435eab49e916020acd2e41a34047a6d9c20df8e150f8e066cc9f13faf86aafa
-MISC ChangeLog 8353 SHA256 efd368dd5484190f945cda3401f9a595beeb14e42ea238d7c00af66667fb3486 SHA512 579f46e9f998c4b14184bd06043aa180ec9cfaecf17494ac0d1e5add62d7d67e5b0e7254818ef3a25be87698a285d7b48a530a9d0147630fd927fb7175718ad8 WHIRLPOOL d94fe6876295e7e22806335d106327f443b1d4ea88696a8ac80848d8993324edd8ad8b60718b09f893c9c62a2fdd63f25db2ed2bb2e850a105222b54a403d416
-MISC metadata.xml 1141 SHA256 6afb72cf8f6e9c3339aa66beb3c142b56bc4c941bb511a3c500ec78cd9dbb85f SHA512 aa174533e7633cadd5955c26bbeb6af713766ae00e0e4f1b6e4783eae923ccf50bad319291eb42be40d2b23448c90aeb06efe059a6d450f776940bea32a69b1c WHIRLPOOL ca9a23d9142d8fc6ba741a51790dcc9cde3d0e16f7f09cc581cfe3cbeed02a9a7866be0f0f3f0963d6114bda2c93eede633f71072c50476c3c2c4a0b51729db6
+EBUILD ptlib-2.10.10.ebuild 6515 SHA256 16c452f9590e403a036cc54bc7cd803a87da0228f60e107016f286db3818c3a5 SHA512 b6f9c887e1c1b77f130aac1da3ebb3665deaa8e6f0512e3540f3a37faa97a61fdd96ecd98b1bd017c1e523006b8f45644885054afdcb6bba6f95d95e0a7c0f8c WHIRLPOOL f6b1efaff95a5d49da76366c79f0932b7fa264f15010ed80b7f1c6dc7a83dc1e6f7e9a5e4b2f8dda683f616879a4de03a88843dd6146c6b90c31b4b190fedb3c
+EBUILD ptlib-2.10.11.ebuild 6580 SHA256 bb6438973ef3a59131c95f8bc97c92cce6aef98968a9066abd90b79b815769ca SHA512 c430846beb2ac56ad5d16d7e2fa16d30298589ff1dc101bacaea3317c5a4403066995b80f6eab0aae896be1d32637dc1c5f8d209845482b686289e08ee82ace2 WHIRLPOOL 63708b943d2ddaba4191bf496caa4928c9812db0260b6cfa2d5a67bc09b30cbdb9a2db11ce3178ae74dbc261222dc0fc525700da10eafe5c2c5fa05129eee4a2
+EBUILD ptlib-2.10.9.ebuild 6342 SHA256 0a18d96a4a8c0167e7f5ae5320b8016ea50f85e5d807d18318aad08499952ca0 SHA512 d71ec1255f6a7f627c7197fafc0e124c72c08a6791ab89029bcf0ed582c77d00d866220920d04a939d86b6a9a0bfd6699df698625e740e0656f5176cd6a3258e WHIRLPOOL 204aaaa3abbb9b7f516908741cb9b32f2d469af51b90a53db887478c11ae8adfe1fc36408675fae6ced9105acb98b6b5ff102ecd2eb2d48b20cc3849f9a60bc5
+EBUILD ptlib-2.12.4.ebuild 6261 SHA256 2e400fc82ef810b448b266f0ecf36d7cf4ed37d002b288c38b27dc446b4eb5b3 SHA512 126365e0c73a2b29e0ae4dbd4480999df69554ff4038c6089ee389cf276052c6efb450fa5056733fd63f8d74f50452996fe3d64b74ade5ad2841fc6ce8af1e0b WHIRLPOOL 203c36306b2ad46dca4078042905037dc945e4258f94ddd80d39951b58c692a37505ffe7f9b3e9c6c0716b3f658b3d6af8ff3de303095d64110e68ba9480b13c
+EBUILD ptlib-2.12.9.ebuild 6249 SHA256 28f0682a38cf7f3ff7fa1dde5cda304260eb50dd7b446fa6ebcd28c11a2729c5 SHA512 c38d5f4e43571730353355b5222951df6ec737403470c6b9398682db50a12379030e5e9395310ca439807dfc99b03cdc35a52e2dd6f117e91de9ab093e40730e WHIRLPOOL aeb01414502096d05c7394526a67407d93eb3a26c12a788d7a4f90126024e6085269f435031e27b371365ad7c8653deb20222a776c4d13c161d780ef81d78a6a
+EBUILD ptlib-2.6.7-r1.ebuild 7534 SHA256 fc742cdcdf6b8f38a1ed7acac62985dd68fbc684839cc5e7d90122354237533f SHA512 1ae181e25047a3040490dfb69045f3898083ac7411e7b2b464539258c8e3f09599035474f7afc839491892bd03f479815e966a96832859706fa80583de9f8f28 WHIRLPOOL 8441620f27f65679b558b21bdd75ad4355b3c5114df09a290db1516d536746abc7eb3d0a51e7fc04f8f136c31f7ba9c3c7cfa80c4af9de5342ab304540bc2a69
+MISC ChangeLog 8594 SHA256 aeffb4cc4464268328813ead55c2ae02d408efe92112131025f4a9db484ab9a4 SHA512 c493941cd1a391c483e1de88beae08ddf20501f4f54153c65c24886c5dc1d270071fbd75709ae2261a268b237fe304bc1972220dff60a278d751dcf7c490c900 WHIRLPOOL bacbe157a848359f82a3398bd58eac6b1d9ce4a6cc274d4e3420c09e0af5bfefcfb8ea04de40a89a37c80a4f16b2ac1a05fc457fbdd9935d18bc7a1f821932d5
+MISC metadata.xml 1092 SHA256 e8290617c7dcc015e6c6e16fc153ec29fdcb017d7a963802f56dcd9591f835b6 SHA512 7a5733e92ac482c2fa2988af90b761581f8363921748dce3e0c425b6532265645e342cd396bb045d9e362d168fa12143dc27e74556639d4b04f66a5bdd05e46f WHIRLPOOL c6c383cfa1c259a1f2b62c9f6b369dcf83d49c082b625a96d1b6fb52cd1ac04035cc0c950cef48adbe9704a27068c35195e71cd63637eb79475c67e323168570
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTX1uYAAoJEPiazRVxLXTFwRcQAI4MGXBDgK2AX2FeLhFXL1Yb
-yZTGXDRoVW4WsH/3ol1QI41a1FX/yw2D/deniv8ytFF5mS9K8bdxd29P+3y8vVl1
-WJ0AiGBAZj+ZbJ3A+Y6c/hAatS10k4NMi63Sc9VWj8iNslRzi/x+5dm/yGmQ9QBC
-93tEHBfFETPmkC8Vf7JmbbcnTS/NhKKC8epN+PDmJLytIqFb5nyivRPAr5fMEjMp
-DRxxOLkLx6DnXjFSZ737WhXL92zQgbt+m+7REeDhb7cM0H/sZi2gn1/YE+gjqcgN
-XpFX7qJYBb+zOQR/gEqNZGbX4QX8n20e+H+sFEdmNvvLPQxE4baUNzJfyg+yRiZc
-2t9euF6ON84rLsAZiz90yNZf/aNLfXCWu/hNSCc5Ir+I/C5dvGasM1MGrkbqkOZ7
-Ruyk6x246IzGJfSfwV4Q9Xw9ttS8itV6Hj7Aa+Rx5oQzF0nBSt37PDoCjj87q9gS
-iJ2YU2y4fyq5sxztfKYW54b/zNkaky3XdKIZBVv9trE5hGPH0VH3ijebWpX7e7VY
-4uoX+SNK3duB7nqUralXNZMeZzK0ZFm4tjhSu593Qob7vgpsz2QERtsfkVMZid82
-BpEqHEF03YJcdCM7YN7J01RVGdV65R+Smm1rKpumyc6+i5S0z/blS3/81/KnuVKF
-DQGG9PoZ3VrROCQdF6Y/
-=MVsl
+iQGcBAEBCAAGBQJTdK1QAAoJEJQzkH1pP7W43g0L/3kqU3/0RvDr97Vi7wzndUB5
+5oIEADCA/MopnzFDrP+GKhbsRJs3I1HqDmKj1N9fsiWfcQFWtzZpY8j/I3XCLCtB
+D/Bj2blYUuXDOZYd2z1QkpOOXY3oT4flL47ZhOIkjVVJGzpXphsmy54O3u/a3Ono
+U6fuR/TS5AICRlEeePDmPoVF7fckpl/EehmFPNzLxW0O0g/aN6mijfmp+o/j+CqG
+jx6rxnmU588pec/QLgI3rNasQgxHtb+ZZOqC2r8KQmbpHkpAr0hRlvHapa5K1we5
+PDYjNPWNDMirCKQ5BYVSQ3soUbv6lfXTTOB0OgOMlgsS5Iv+lq3cIrpbEg4TblPF
+1LyZjpZCm9a+n8r3T7g5GXKPLsj45G5XHcIjGq7Vo/twB1BU396eCpxz++9cSNsv
+IVHPlML1ADvE07k/syTNQoaQlDSpLhECjv8x0tkzDYIVBQ+fQY6s1QAz8XOZZKpr
+z+0jpQggPiHttboyJT3J68m6+P9g/vL+h47f5OGpgQ==
+=SI1J
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
index 082e331fa64a..e90093bc27db 100644
--- a/net-libs/ptlib/metadata.xml
+++ b/net-libs/ptlib/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="asn">Enable ASN decoding/encoding support</flag>
-		<flag name="audio">Enable audio support</flag>
 		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
 		<flag name="http">Enable HTTP support</flag>
 		<flag name="mail">Enable mail protocols (POP3/SMTP)</flag>
diff --git a/net-libs/ptlib/ptlib-2.10.10.ebuild b/net-libs/ptlib/ptlib-2.10.10.ebuild
index 02b9926322b1..eb53f6a3c44b 100644
--- a/net-libs/ptlib/ptlib-2.10.10.ebuild
+++ b/net-libs/ptlib/ptlib-2.10.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.10.ebuild,v 1.8 2013/04/16 13:27:50 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.10.ebuild,v 1.9 2014/05/15 12:04:06 ulm Exp $
 
 EAPI="5"
 
@@ -15,19 +15,19 @@ LICENSE="MPL-1.0"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc +dtmf examples ffmpeg ftp +http ipv6
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
 jabber ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
-shmvideo snmp soap socks ssl static-libs +stun telnet tts v4l +video
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
 vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	odbc? ( dev-db/unixODBC )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -82,8 +82,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf="${myconf} --disable-plugins"
 	else
 		myconf="${myconf} --enable-plugins"
@@ -114,7 +114,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -146,6 +145,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -187,7 +187,7 @@ src_install() {
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
 	fi
 
@@ -215,8 +215,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi
diff --git a/net-libs/ptlib/ptlib-2.10.11.ebuild b/net-libs/ptlib/ptlib-2.10.11.ebuild
index f3ebfce86906..31e63aa67128 100644
--- a/net-libs/ptlib/ptlib-2.10.11.ebuild
+++ b/net-libs/ptlib/ptlib-2.10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.11.ebuild,v 1.1 2014/04/29 07:58:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.11.ebuild,v 1.2 2014/05/15 12:04:06 ulm Exp $
 
 EAPI="5"
 
@@ -15,19 +15,19 @@ LICENSE="MPL-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc +dtmf examples ffmpeg ftp +http ipv6
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
 jabber ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
-shmvideo snmp soap socks ssl static-libs +stun telnet tts v4l +video
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
 vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	odbc? ( dev-db/unixODBC )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -83,8 +83,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf="${myconf} --disable-plugins"
 	else
 		myconf="${myconf} --enable-plugins"
@@ -115,7 +115,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -147,6 +146,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -188,7 +188,7 @@ src_install() {
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
 	fi
 
@@ -216,8 +216,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi
diff --git a/net-libs/ptlib/ptlib-2.10.9.ebuild b/net-libs/ptlib/ptlib-2.10.9.ebuild
index 451a6a446c48..5237ff93cf01 100644
--- a/net-libs/ptlib/ptlib-2.10.9.ebuild
+++ b/net-libs/ptlib/ptlib-2.10.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.9.ebuild,v 1.1 2012/12/03 23:16:28 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.9.ebuild,v 1.2 2014/05/15 12:04:06 ulm Exp $
 
 EAPI="4"
 
@@ -15,19 +15,19 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc +dtmf examples ffmpeg ftp +http ipv6
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
 jabber ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
-shmvideo snmp soap socks ssl static-libs +stun telnet tts v4l +video
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
 vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	odbc? ( dev-db/unixODBC )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -77,8 +77,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf="${myconf} --disable-plugins"
 	else
 		myconf="${myconf} --enable-plugins"
@@ -109,7 +109,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -141,6 +140,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -182,7 +182,7 @@ src_install() {
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
 	fi
 
@@ -210,8 +210,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi
diff --git a/net-libs/ptlib/ptlib-2.12.4.ebuild b/net-libs/ptlib/ptlib-2.12.4.ebuild
index bf62542fafa2..5ff9443bc1d6 100644
--- a/net-libs/ptlib/ptlib-2.12.4.ebuild
+++ b/net-libs/ptlib/ptlib-2.12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.12.4.ebuild,v 1.2 2013/06/24 09:57:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.12.4.ebuild,v 1.3 2014/05/15 12:04:06 ulm Exp $
 
 EAPI=5
 
@@ -15,19 +15,19 @@ LICENSE="MPL-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc +dtmf examples ffmpeg ftp +http ipv6
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
 jabber ldap lua mail odbc oss pch pulseaudio remote sasl sdl serial
-shmvideo snmp soap socks ssl static-libs +stun telnet tts v4l +video
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
 vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	odbc? ( dev-db/unixODBC )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -78,8 +78,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf+=" --disable-plugins"
 	else
 		myconf+=" --enable-plugins"
@@ -110,7 +110,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -141,6 +140,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -182,7 +182,7 @@ src_install() {
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt
 	fi
 
@@ -210,8 +210,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi
diff --git a/net-libs/ptlib/ptlib-2.12.9.ebuild b/net-libs/ptlib/ptlib-2.12.9.ebuild
index 0fd8e7a30704..e4a82941983f 100644
--- a/net-libs/ptlib/ptlib-2.12.9.ebuild
+++ b/net-libs/ptlib/ptlib-2.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.12.9.ebuild,v 1.1 2014/04/29 07:58:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.12.9.ebuild,v 1.2 2014/05/15 12:04:06 ulm Exp $
 
 EAPI=5
 
@@ -15,19 +15,19 @@ LICENSE="MPL-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc +dtmf examples ffmpeg ftp +http ipv6
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
 jabber ldap lua mail odbc oss pch pulseaudio remote sasl sdl serial
-shmvideo snmp soap socks ssl static-libs +stun telnet tts v4l +video
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
 vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
 	odbc? ( dev-db/unixODBC )
 	pulseaudio? ( media-sound/pulseaudio )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -78,8 +78,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf+=" --disable-plugins"
 	else
 		myconf+=" --enable-plugins"
@@ -110,7 +110,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -141,6 +140,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -182,7 +182,7 @@ src_install() {
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt
 	fi
 
@@ -210,8 +210,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi
diff --git a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
index 0e5fcbdc79ff..61110345697f 100644
--- a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
+++ b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.15 2012/09/30 18:15:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.16 2014/05/15 12:04:06 ulm Exp $
 
 EAPI="2"
 
@@ -16,16 +16,16 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc dtmf examples ffmpeg ftp http ipv6
+IUSE="alsa +asn debug doc dtmf examples ffmpeg ftp http ipv6
 jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
-socks ssl static-libs +stun telnet tts v4l +video vxml wav xml xmlrpc"
+socks +sound ssl static-libs +stun telnet tts v4l +video vxml wav xml xmlrpc"
 
 CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib ) )
 	ldap? ( net-nds/openldap )
 	odbc? ( dev-db/unixODBC )
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	sdl? ( media-libs/libsdl )
+	sound? ( alsa? ( media-libs/alsa-lib ) )
 	ssl? ( dev-libs/openssl )
 	video? ( v4l? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )
@@ -129,8 +129,8 @@ src_prepare() {
 src_configure() {
 	local myconf=""
 
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
+	# plugins are disabled only if ! sound and ! video
+	if ! use sound && ! use video; then
 		myconf="${myconf} --disable-plugins"
 	else
 		myconf="${myconf} --enable-plugins"
@@ -161,7 +161,6 @@ src_configure() {
 		--enable-pipechan \
 		--enable-resolver \
 		--enable-url \
-		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
 		$(use_enable debug exceptions) \
@@ -191,6 +190,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_enable soap) \
 		$(use_enable socks) \
+		$(use_enable sound audio) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
 		$(use_enable telnet) \
@@ -235,7 +235,7 @@ src_install() {
 	# This version (2.6.7) doesn't have a ChangeLog file.
 	#dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
 
-	if use audio || use video; then
+	if use sound || use video; then
 		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
 	fi
 
@@ -263,8 +263,8 @@ pkg_postinst() {
 		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
 	fi
 
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
+	if ! use sound || ! use video; then
+		ewarn "You have disabled sound or video USE flags."
 		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
 		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
 	fi