Version bump. This fixes the CVE-2008-0008 security issue reported as bug #207214. Version -r1 also implements the request in bug #204754 (glib USE flag, thanks to Matthijs Kooijman). All three revision also fixes bug #204748 (broken default.pa with hal USE flag unset).

Package-Manager: portage-2.1.4

16 files changed, 171 insertions, 310 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index b2f3f1bb0ede..a142975f5c7b 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.92 2008/01/08 22:17:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.93 2008/01/24 02:07:11 flameeyes Exp $
+
+*pulseaudio-0.9.9-r2 (24 Jan 2008)
+*pulseaudio-0.9.9-r1 (24 Jan 2008)
+*pulseaudio-0.9.9 (24 Jan 2008)
+
+  24 Jan 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -files/pulseaudio-0.9.5-CVE-2007-1804.patch,
+  -files/pulseaudio-0.9.5-esdcompat.patch,
+  -files/pulseaudio-0.9.5-fbsd.patch, -files/pulseaudio-0.9.5-noshm.patch,
+  metadata.xml, -pulseaudio-0.9.5-r6.ebuild, -pulseaudio-0.9.8-r4.ebuild,
+  -pulseaudio-0.9.8-r5.ebuild, +pulseaudio-0.9.9.ebuild,
+  +pulseaudio-0.9.9-r1.ebuild, +pulseaudio-0.9.9-r2.ebuild:
+  Version bump. This fixes the CVE-2008-0008 security issue reported as bug
+  #207214. Version -r1 also implements the request in bug #204754 (glib USE
+  flag, thanks to Matthijs Kooijman). All three revision also fixes bug
+  #204748 (broken default.pa with hal USE flag unset).
 
   08 Jan 2008; Jeroen Roovers <jer@gentoo.org> pulseaudio-0.9.8-r6.ebuild,
   pulseaudio-0.9.8-r7.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b6999aa4d691..67f63f56f718 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,22 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pulseaudio-0.9.5-CVE-2007-1804.patch 3563 RMD160 1f8995393dca08cf183b55879ded304c13f94e80 SHA1 e209af3445f9e56b5234d2a65b9d57b3ae1ed867 SHA256 ecf96b8aa4ee3f18dc4bba71c22aafcaa650469089ed6e78704095e500e44872
-MD5 adb958f348db1d8623cb5a9ae157d469 files/pulseaudio-0.9.5-CVE-2007-1804.patch 3563
-RMD160 1f8995393dca08cf183b55879ded304c13f94e80 files/pulseaudio-0.9.5-CVE-2007-1804.patch 3563
-SHA256 ecf96b8aa4ee3f18dc4bba71c22aafcaa650469089ed6e78704095e500e44872 files/pulseaudio-0.9.5-CVE-2007-1804.patch 3563
-AUX pulseaudio-0.9.5-esdcompat.patch 452 RMD160 dcd88a9b761819f5d23a342ce7d7b60412e44f2d SHA1 d22b4428392e3e1d0e1450ac5b63311c912ea26c SHA256 3fcd75716a4627a1b9093b782963f5d7df2a27e11998d3eefb1f8c6b43abfb72
-MD5 8742630795736e87363db80e0b9437cd files/pulseaudio-0.9.5-esdcompat.patch 452
-RMD160 dcd88a9b761819f5d23a342ce7d7b60412e44f2d files/pulseaudio-0.9.5-esdcompat.patch 452
-SHA256 3fcd75716a4627a1b9093b782963f5d7df2a27e11998d3eefb1f8c6b43abfb72 files/pulseaudio-0.9.5-esdcompat.patch 452
-AUX pulseaudio-0.9.5-fbsd.patch 1312 RMD160 bf57c80ad041b3c8f848eb90dd3c94164a041540 SHA1 0b48e2b3a396f2a2dc9b2a6ddb4bb88f942acca1 SHA256 a0c27008aa8a2de3253b2b1bc44bb9a7e874cc208c83c533b792b9d98e94b17a
-MD5 d8651b2b0d4adc4a99c33438ffe2a8a5 files/pulseaudio-0.9.5-fbsd.patch 1312
-RMD160 bf57c80ad041b3c8f848eb90dd3c94164a041540 files/pulseaudio-0.9.5-fbsd.patch 1312
-SHA256 a0c27008aa8a2de3253b2b1bc44bb9a7e874cc208c83c533b792b9d98e94b17a files/pulseaudio-0.9.5-fbsd.patch 1312
-AUX pulseaudio-0.9.5-noshm.patch 1011 RMD160 0f718066f3b1c8a1f99b251f724a80d6d3035f72 SHA1 9c5aa8a498a7b142fa1a8e50cbefb6304446cfb2 SHA256 f9bfa3cd101298626d19aed857f04256a5b82566c2c7fa1fbda98cab0b47d3d6
-MD5 932a8d8ed808663d119b8220423ffeff files/pulseaudio-0.9.5-noshm.patch 1011
-RMD160 0f718066f3b1c8a1f99b251f724a80d6d3035f72 files/pulseaudio-0.9.5-noshm.patch 1011
-SHA256 f9bfa3cd101298626d19aed857f04256a5b82566c2c7fa1fbda98cab0b47d3d6 files/pulseaudio-0.9.5-noshm.patch 1011
 AUX pulseaudio-0.9.7-module-loading.patch 947 RMD160 725f13d72da5ee72e61cc8d558ca352bb3a5d001 SHA1 236819d1fe76ccb22580f07e2c3a24f95d010011 SHA256 0ecc719e38bbf423d46120ce991bcc807c431e36a68cb97471235aa8e8316075
 MD5 4405ff6be3827aef6ebbbb9f04ecc119 files/pulseaudio-0.9.7-module-loading.patch 947
 RMD160 725f13d72da5ee72e61cc8d558ca352bb3a5d001 files/pulseaudio-0.9.7-module-loading.patch 947
@@ -53,25 +37,13 @@ AUX pulseaudio.init.d-3 1727 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 SHA
 MD5 730c2b0f7829a1d66373b27875c813b3 files/pulseaudio.init.d-3 1727
 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 files/pulseaudio.init.d-3 1727
 SHA256 8f31a03b430b5a6a7525e2251842cf685e55983c1f6d7036ae8b0aa9c8f9e2fb files/pulseaudio.init.d-3 1727
-DIST pulseaudio-0.9.5.tar.gz 1145930 RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b SHA1 c69c5a1f3e0cdc0c79f2ec3860e6aa02a049405e SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
 DIST pulseaudio-0.9.7.tar.gz 1013981 RMD160 49d0d875d6929527fe97124431462e63adf52873 SHA1 c6c36f2ddb51685971abf8b47ed325a8f06759c5 SHA256 b5f3fe8fc8be435e5d1b2183894fb545220a50b5b4850bb71af6b5e14f8f6ee0
 DIST pulseaudio-0.9.8.tar.gz 1089681 RMD160 ed4c1a5f4cf53ef166fe2aad66f1cae880463a8f SHA1 1eb126d452084e8a12abce64ed6ea65da5a3596a SHA256 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858
-EBUILD pulseaudio-0.9.5-r6.ebuild 3976 RMD160 9aa4316e7be4ff494c30fd42fa6a6e8b28ea59eb SHA1 2ba2c09eb9f40691b6411fd1f54ff2e04218593c SHA256 a6455bebd3c57f9958a80fa4867d233770e38eb9e361ec66e8ecd1fb6112a8a2
-MD5 df6da24ca40cd1d227fd76562a546a22 pulseaudio-0.9.5-r6.ebuild 3976
-RMD160 9aa4316e7be4ff494c30fd42fa6a6e8b28ea59eb pulseaudio-0.9.5-r6.ebuild 3976
-SHA256 a6455bebd3c57f9958a80fa4867d233770e38eb9e361ec66e8ecd1fb6112a8a2 pulseaudio-0.9.5-r6.ebuild 3976
+DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
 EBUILD pulseaudio-0.9.7.ebuild 4752 RMD160 0217d3ccee281219df3a6817935f762b9a03f286 SHA1 2fca6bbfd4b2c209ca59e5313a1b45cec19c5fb2 SHA256 65803bb77985bc3bb82e0e0d01e82a7293fc61ad951a35a1672e25941725437c
 MD5 196c256244b3fa38ddb8b4ddba53f172 pulseaudio-0.9.7.ebuild 4752
 RMD160 0217d3ccee281219df3a6817935f762b9a03f286 pulseaudio-0.9.7.ebuild 4752
 SHA256 65803bb77985bc3bb82e0e0d01e82a7293fc61ad951a35a1672e25941725437c pulseaudio-0.9.7.ebuild 4752
-EBUILD pulseaudio-0.9.8-r4.ebuild 5761 RMD160 d764bb45e928f19f53d6d22732506029873f439d SHA1 5953341d2fdcc52712173d40fd364e4fbc269941 SHA256 a39755f7d52f4af18cb48d6c93f5c94835b66de345f6b9e29a14a9051d9ae769
-MD5 648d80bf3cb9f8d7c49e276c1edfbef7 pulseaudio-0.9.8-r4.ebuild 5761
-RMD160 d764bb45e928f19f53d6d22732506029873f439d pulseaudio-0.9.8-r4.ebuild 5761
-SHA256 a39755f7d52f4af18cb48d6c93f5c94835b66de345f6b9e29a14a9051d9ae769 pulseaudio-0.9.8-r4.ebuild 5761
-EBUILD pulseaudio-0.9.8-r5.ebuild 5729 RMD160 bc46eec42e0dfebf15e4ca3d716879a1fa853957 SHA1 ca6ac50b18ecf410fbb33b4e2d286cdad362ab98 SHA256 87182dab3e4f1ed8009d5310ccc55813f078325718179644a3ba81634a53c4f9
-MD5 c5e100c90024edfad9369048215fea1c pulseaudio-0.9.8-r5.ebuild 5729
-RMD160 bc46eec42e0dfebf15e4ca3d716879a1fa853957 pulseaudio-0.9.8-r5.ebuild 5729
-SHA256 87182dab3e4f1ed8009d5310ccc55813f078325718179644a3ba81634a53c4f9 pulseaudio-0.9.8-r5.ebuild 5729
 EBUILD pulseaudio-0.9.8-r6.ebuild 5824 RMD160 6d01127208d4cd0b9a60e776bba6ffb334baed39 SHA1 7c6493d8e35b56b131ea8ee123636ad9a3e266b4 SHA256 bbe88b3059449337c1c575167ad6288d07930250b7c64c58ced9c8dae5c00690
 MD5 a21f2d495078ac93041a949287ef10ce pulseaudio-0.9.8-r6.ebuild 5824
 RMD160 6d01127208d4cd0b9a60e776bba6ffb334baed39 pulseaudio-0.9.8-r6.ebuild 5824
@@ -80,36 +52,48 @@ EBUILD pulseaudio-0.9.8-r7.ebuild 5786 RMD160 6b19686f94e3181a21612cdafd7e68380f
 MD5 a30ad96bb557a47c2d02f44a07fac7e5 pulseaudio-0.9.8-r7.ebuild 5786
 RMD160 6b19686f94e3181a21612cdafd7e68380f7d0c42 pulseaudio-0.9.8-r7.ebuild 5786
 SHA256 f0aa64e3d8b50aac92756a624ee863939757569ef8cc9ecbe7fdea93398e31b8 pulseaudio-0.9.8-r7.ebuild 5786
-MISC ChangeLog 16290 RMD160 c2abdb42d77c30f85b69434dc731e1802f35cdf6 SHA1 2e33b90abbc053bce1402cbb31b13ebb9858db1e SHA256 9337697c33f609c0e375b1561728547d50a532942984f3f1efd2d0411da87193
-MD5 de5e886ee7370c2a0bddf75bc2a868d4 ChangeLog 16290
-RMD160 c2abdb42d77c30f85b69434dc731e1802f35cdf6 ChangeLog 16290
-SHA256 9337697c33f609c0e375b1561728547d50a532942984f3f1efd2d0411da87193 ChangeLog 16290
-MISC metadata.xml 927 RMD160 f356067c159b3c1f767acc9d4cae0a7d08594f92 SHA1 d33063c255d3623824ed1738e645030499100320 SHA256 fc48d35d1b5412086fdb1a110855d46da5227f9948e6d833555404557c10c9a6
-MD5 411dece56551d80e6fdf2cf1f42e7de5 metadata.xml 927
-RMD160 f356067c159b3c1f767acc9d4cae0a7d08594f92 metadata.xml 927
-SHA256 fc48d35d1b5412086fdb1a110855d46da5227f9948e6d833555404557c10c9a6 metadata.xml 927
-MD5 721f0000d2b670e8e086600933df9995 files/digest-pulseaudio-0.9.5-r6 253
-RMD160 afad8885c68b08dc4e537df2e3731329b0693b5b files/digest-pulseaudio-0.9.5-r6 253
-SHA256 ab6179a1918a6773c82406c18c5c491c6c286ffa6b1934f53eadec3f11e1e62d files/digest-pulseaudio-0.9.5-r6 253
+EBUILD pulseaudio-0.9.9-r1.ebuild 5847 RMD160 8f470a41bd65792e8fb5605d2c784983c9adfe9a SHA1 b0b93c9114ba9e7f4a6eee626404b1382349aaa8 SHA256 adbb09e222539e113fbd80186c538aae4c65ef74f46962360cbbfa210b5ec3e4
+MD5 5b482627e7cd5c8b3c83f7807c3238fa pulseaudio-0.9.9-r1.ebuild 5847
+RMD160 8f470a41bd65792e8fb5605d2c784983c9adfe9a pulseaudio-0.9.9-r1.ebuild 5847
+SHA256 adbb09e222539e113fbd80186c538aae4c65ef74f46962360cbbfa210b5ec3e4 pulseaudio-0.9.9-r1.ebuild 5847
+EBUILD pulseaudio-0.9.9-r2.ebuild 5809 RMD160 425cef53074809572fede56346268c1a625773ef SHA1 e3b2c88ce0dee2c5790d751c56ea992742f60fc9 SHA256 f075b434d556d95032d541a0cfac574e823386533f13ed3d4d7b7ed670b2e0d4
+MD5 1914d7bdc26b42985420fdabfb1c1fae pulseaudio-0.9.9-r2.ebuild 5809
+RMD160 425cef53074809572fede56346268c1a625773ef pulseaudio-0.9.9-r2.ebuild 5809
+SHA256 f075b434d556d95032d541a0cfac574e823386533f13ed3d4d7b7ed670b2e0d4 pulseaudio-0.9.9-r2.ebuild 5809
+EBUILD pulseaudio-0.9.9.ebuild 5816 RMD160 95fb00e9dc5627aeca3fc01a238aa9646395d94e SHA1 5ef26fd374a2a5f37bc903d938e998257cf672a9 SHA256 d6951468711a9d6024c9a6b4d21bd29aca54a759992e36d911714ed594f1b2e9
+MD5 41fee59c914e07e43a0ec4b7943f9f34 pulseaudio-0.9.9.ebuild 5816
+RMD160 95fb00e9dc5627aeca3fc01a238aa9646395d94e pulseaudio-0.9.9.ebuild 5816
+SHA256 d6951468711a9d6024c9a6b4d21bd29aca54a759992e36d911714ed594f1b2e9 pulseaudio-0.9.9.ebuild 5816
+MISC ChangeLog 17088 RMD160 3ad57ab97633ec8322cf483f99c30bceac8aeaa5 SHA1 69f0e0b2916aaa32602fe2142d819f44a1efd0fd SHA256 295d5c08a1d4a85eec55e7f0048f00c6bcb77d89368d982d689364cdce3da810
+MD5 3c6f7281d58a9d0f2cfedf585ea76299 ChangeLog 17088
+RMD160 3ad57ab97633ec8322cf483f99c30bceac8aeaa5 ChangeLog 17088
+SHA256 295d5c08a1d4a85eec55e7f0048f00c6bcb77d89368d982d689364cdce3da810 ChangeLog 17088
+MISC metadata.xml 1106 RMD160 451b24728e90377bc829a999a76fca5b4bc91078 SHA1 6b242be79913c9ffa2aafdd95149a7fa93b3c764 SHA256 995d3c7013901cd84098a1b40975c54863751e8668874f763ec70b81e23e9a9f
+MD5 c0c42e2e4ad4d60f13af9b880c76ebdc metadata.xml 1106
+RMD160 451b24728e90377bc829a999a76fca5b4bc91078 metadata.xml 1106
+SHA256 995d3c7013901cd84098a1b40975c54863751e8668874f763ec70b81e23e9a9f metadata.xml 1106
 MD5 bb5084148a466cd7ac637deea6c190b8 files/digest-pulseaudio-0.9.7 253
 RMD160 66290b7baa73f06a9959116e7cb200f47106d97a files/digest-pulseaudio-0.9.7 253
 SHA256 6231728210138f08066ebcb131dde341500e592d659c10012ac9a9008b7c3da2 files/digest-pulseaudio-0.9.7 253
-MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r4 253
-RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r4 253
-SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r4 253
-MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r5 253
-RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r5 253
-SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r5 253
 MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r6 253
 RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r6 253
 SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r6 253
 MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r7 253
 RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r7 253
 SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r7 253
+MD5 85955cd2a379b2a58cf49cd569211437 files/digest-pulseaudio-0.9.9 253
+RMD160 8b75ffc2f3c76487db1b0c9d4b86e832a0237879 files/digest-pulseaudio-0.9.9 253
+SHA256 397ce4123e9ac712aae1332fadbc37747e2504dedf4f77607ae8b9e8559a56ce files/digest-pulseaudio-0.9.9 253
+MD5 85955cd2a379b2a58cf49cd569211437 files/digest-pulseaudio-0.9.9-r1 253
+RMD160 8b75ffc2f3c76487db1b0c9d4b86e832a0237879 files/digest-pulseaudio-0.9.9-r1 253
+SHA256 397ce4123e9ac712aae1332fadbc37747e2504dedf4f77607ae8b9e8559a56ce files/digest-pulseaudio-0.9.9-r1 253
+MD5 85955cd2a379b2a58cf49cd569211437 files/digest-pulseaudio-0.9.9-r2 253
+RMD160 8b75ffc2f3c76487db1b0c9d4b86e832a0237879 files/digest-pulseaudio-0.9.9-r2 253
+SHA256 397ce4123e9ac712aae1332fadbc37747e2504dedf4f77607ae8b9e8559a56ce files/digest-pulseaudio-0.9.9-r2 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeJziYACgkQj9hvisErhMKhWgCg2tB/f9DTdqeWpdlQE1rTHIxa
-7ioAnAtXfcCkpmqEj2TqG71DCt9YXLtB
-=HEil
+iD8DBQFHl/LWAiZjviIA2XgRAhnbAJ0do6CeDT/Kzyvc2x5tS0Y2mRC+xgCdEow7
+RnHdDcCIh+v/oi6z9vmWD+A=
+=1jcS
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r6 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r6
deleted file mode 100644
index 0d68de7bdc88..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 99b5d9efd4fce35cabb4ae5d0ebb230d pulseaudio-0.9.5.tar.gz 1145930
-RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b pulseaudio-0.9.5.tar.gz 1145930
-SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 pulseaudio-0.9.5.tar.gz 1145930
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r4 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r4
deleted file mode 100644
index 9f89ccdd6357..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 184a41d5947e583d395f0a2541525fc2 pulseaudio-0.9.8.tar.gz 1089681
-RMD160 ed4c1a5f4cf53ef166fe2aad66f1cae880463a8f pulseaudio-0.9.8.tar.gz 1089681
-SHA256 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858 pulseaudio-0.9.8.tar.gz 1089681
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r5 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r5
deleted file mode 100644
index 9f89ccdd6357..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 184a41d5947e583d395f0a2541525fc2 pulseaudio-0.9.8.tar.gz 1089681
-RMD160 ed4c1a5f4cf53ef166fe2aad66f1cae880463a8f pulseaudio-0.9.8.tar.gz 1089681
-SHA256 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858 pulseaudio-0.9.8.tar.gz 1089681
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9
new file mode 100644
index 000000000000..ef6469f3f8a9
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9
@@ -0,0 +1,3 @@
+MD5 8fa6f7a9611bb194d94311764022b197 pulseaudio-0.9.9.tar.gz 1063448
+RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 pulseaudio-0.9.9.tar.gz 1063448
+SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d pulseaudio-0.9.9.tar.gz 1063448
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r1
new file mode 100644
index 000000000000..ef6469f3f8a9
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r1
@@ -0,0 +1,3 @@
+MD5 8fa6f7a9611bb194d94311764022b197 pulseaudio-0.9.9.tar.gz 1063448
+RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 pulseaudio-0.9.9.tar.gz 1063448
+SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d pulseaudio-0.9.9.tar.gz 1063448
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r2 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r2
new file mode 100644
index 000000000000..ef6469f3f8a9
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.9-r2
@@ -0,0 +1,3 @@
+MD5 8fa6f7a9611bb194d94311764022b197 pulseaudio-0.9.9.tar.gz 1063448
+RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 pulseaudio-0.9.9.tar.gz 1063448
+SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d pulseaudio-0.9.9.tar.gz 1063448
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-CVE-2007-1804.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-CVE-2007-1804.patch
deleted file mode 100644
index 2f9020b53233..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.5-CVE-2007-1804.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: pulseaudio-0.9.5/src/modules/module-volume-restore.c
-===================================================================
---- pulseaudio-0.9.5.orig/src/modules/module-volume-restore.c
-+++ pulseaudio-0.9.5/src/modules/module-volume-restore.c
-@@ -435,6 +435,7 @@ int pa__init(pa_core *c, pa_module*m) {
-     u->modified = 0;
-     
-     m->userdata = u;
-+    u->sink_input_hook_slot = u->source_output_hook_slot = NULL;
-     
-     if (load_rules(u) < 0)
-         goto fail;
-Index: pulseaudio-0.9.5/src/modules/rtp/sap.c
-===================================================================
---- pulseaudio-0.9.5.orig/src/modules/rtp/sap.c
-+++ pulseaudio-0.9.5/src/modules/rtp/sap.c
-@@ -142,9 +142,6 @@ int pa_sap_recv(pa_sap_context *c, int *
-         goto fail;
-     }
- 
--    if (!size)
--        return 0;
--
-     buf = pa_xnew(char, size+1);
-     buf[size] = 0;
-     
-Index: pulseaudio-0.9.5/src/pulsecore/protocol-native.c
-===================================================================
---- pulseaudio-0.9.5.orig/src/pulsecore/protocol-native.c
-+++ pulseaudio-0.9.5/src/pulsecore/protocol-native.c
-@@ -760,7 +760,8 @@ static void command_create_playback_stre
-     CHECK_VALIDITY(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID);
-     CHECK_VALIDITY(c->pstream, map.channels == ss.channels && volume.channels == ss.channels, tag, PA_ERR_INVALID);
-     CHECK_VALIDITY(c->pstream, maxlength > 0 && maxlength <= MAX_MEMBLOCKQ_LENGTH, tag, PA_ERR_INVALID);
--
-+    CHECK_VALIDITY(c->pstream, maxlength >= pa_frame_size(&ss), tag, PA_ERR_INVALID);
-+    
-     if (sink_index != PA_INVALID_INDEX) {
-         sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index);
-         CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY);
-Index: pulseaudio-0.9.5/src/pulsecore/pstream.c
-===================================================================
---- pulseaudio-0.9.5.orig/src/pulsecore/pstream.c
-+++ pulseaudio-0.9.5/src/pulsecore/pstream.c
-@@ -585,7 +585,7 @@ static int do_read(pa_pstream *p) {
- 
-         flags = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]);
- 
--        if (!p->import && (flags & PA_FLAG_SHMMASK) != 0) {
-+        if (!p->use_shm && (flags & PA_FLAG_SHMMASK) != 0) {
-             pa_log_warn("Recieved SHM frame on a socket where SHM is disabled.");
-             return -1;
-         }
-@@ -615,7 +615,7 @@ static int do_read(pa_pstream *p) {
- 
-         length = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]);
-         
--        if (length > FRAME_SIZE_MAX_ALLOW) {
-+        if (length > FRAME_SIZE_MAX_ALLOW || length <= 0) {
-             pa_log_warn("Recieved invalid frame size : %lu", (unsigned long) length);
-             return -1;
-         }
-Index: pulseaudio-0.9.5/src/pulsecore/sample-util.c
-===================================================================
---- pulseaudio-0.9.5.orig/src/pulsecore/sample-util.c
-+++ pulseaudio-0.9.5/src/pulsecore/sample-util.c
-@@ -35,13 +35,25 @@
- #include "sample-util.h"
- #include "endianmacros.h"
- 
-+#define PA_SILENCE_MAX (1024*1024*1)
-+
- pa_memblock *pa_silence_memblock_new(pa_mempool *pool, const pa_sample_spec *spec, size_t length) {
-+    size_t fs;
-     assert(pool);
-     assert(spec);
- 
-     if (length == 0)
-         length = pa_bytes_per_second(spec)/20; /* 50 ms */
- 
-+    if (length > PA_SILENCE_MAX)
-+        length = PA_SILENCE_MAX;
-+
-+    fs = pa_frame_size(spec);
-+    length = ((PA_SILENCE_MAX+fs-1) / fs) * fs;
-+
-+    if (length <= 0)
-+        length = fs;
-+    
-     return pa_silence_memblock(pa_memblock_new(pool, length), spec);
- }
- 
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-esdcompat.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-esdcompat.patch
deleted file mode 100644
index 82f32d9a0c2e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.5-esdcompat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: pulseaudio-0.9.2/src/daemon/esdcompat.in
-===================================================================
---- pulseaudio-0.9.2.orig/src/daemon/esdcompat.in
-+++ pulseaudio-0.9.2/src/daemon/esdcompat.in
-@@ -28,8 +28,8 @@ fail() {
- 
- ARGS=" --log-target=syslog"
- 
--for N in $(seq $#) ; do
-+while [ "$#" != "0" ]; do
- 
-     case "$1" in
-         "")
-             ;;
-
-         -v|--version)
-             echo "$VERSION_STRING"
-             exit 0
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch
deleted file mode 100644
index d1105774d65f..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.5-fbsd.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: src/utils/padsp.c
-===================================================================
---- src/utils/padsp.c	(revision 1358)
-+++ src/utils/padsp.c	(working copy)
-@@ -53,6 +53,11 @@
- #include <pulsecore/llist.h>
- #include <pulsecore/gccmacro.h>
- 
-+/* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
-+#if !defined(SIOCINQ) && defined(FIONREAD)
-+# define SIOCINQ FIONREAD
-+#endif
-+
- typedef enum {
-     FD_INFO_MIXER,
-     FD_INFO_STREAM,
-Index: src/modules/oss-util.c
-===================================================================
---- src/modules/oss-util.c	(revision 1358)
-+++ src/modules/oss-util.c	(working copy)
-@@ -93,7 +93,11 @@
-     
-     pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-                  *pcaps & DSP_CAP_BATCH ? " BATCH" : "",
-+#ifdef DSP_CAP_BIND
-                  *pcaps & DSP_CAP_BIND ? " BIND" : "",
-+#else
-+		 "",
-+#endif
-                  *pcaps & DSP_CAP_COPROC ? " COPROC" : "",
-                  *pcaps & DSP_CAP_DUPLEX ? " DUPLEX" : "",
- #ifdef DSP_CAP_FREERATE                     
-@@ -112,7 +116,11 @@
- #else
-                  "",
- #endif
-+#ifdef DSP_CAP_MULTI
-                  *pcaps & DSP_CAP_MULTI ? " MULTI" : "",
-+#else
-+		 "",
-+#endif
- #ifdef DSP_CAP_OUTPUT
-                  *pcaps & DSP_CAP_OUTPUT ? " OUTPUT" : "",
- #else
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch
deleted file mode 100644
index b8719c371058..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.5-noshm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: src/pulse/context.c
-===================================================================
---- src/pulse/context.c	(revision 1375)
-+++ src/pulse/context.c	(revision 1376)
-@@ -98,6 +98,8 @@
-     }
- }
- 
-+static void context_free(pa_context *c);
-+
- pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) {
-     pa_context *c;
-     
-@@ -148,8 +150,17 @@
- #endif
-     pa_client_conf_env(c->conf);
- 
--    c->mempool = pa_mempool_new(!c->conf->disable_shm);
-+    if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) {
- 
-+        if (!c->conf->disable_shm)
-+            c->mempool = pa_mempool_new(0);
-+
-+        if (!c->mempool) {
-+            context_free(c);
-+            return NULL;
-+        }
-+    }
-+
-     return c;
- }
- 
-@@ -178,7 +189,8 @@
-     if (c->playback_streams)
-         pa_dynarray_free(c->playback_streams, NULL, NULL);
- 
--    pa_mempool_free(c->mempool);
-+    if (c->mempool)
-+        pa_mempool_free(c->mempool);
- 
-     if (c->conf)
-         pa_client_conf_free(c->conf);
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 3fba2feb5a8b..5610e368e468 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -22,5 +22,10 @@
     Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to
     acquire high-priority and real-time scheduling for the daemon.
   </flag>
+  <flag name="glib">
+    Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+    libpulse client library, to allow using libpulse on glib-based
+    programs.
+  </flag>
 </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5-r6.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9-r1.ebuild
index b4d48dd3c23d..6175a689661e 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.5-r6.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.9-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5-r6.ebuild,v 1.10 2007/07/22 08:41:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r1.ebuild,v 1.1 2008/01/24 02:07:11 flameeyes Exp $
 
-inherit eutils libtool # autotools
+EAPI=1
+
+inherit eutils libtool autotools flag-o-matic
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
@@ -10,31 +12,46 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib"
 
 RDEPEND="X? ( x11-libs/libX11 )
 	caps? ( sys-libs/libcap )
 	>=media-libs/audiofile-0.2.6-r1
-	>=media-libs/libsamplerate-0.1.1-r1
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
 	>=media-libs/libsndfile-1.0.10
 	>=dev-libs/liboil-0.3.6
 	alsa? ( >=media-libs/alsa-lib-1.0.10 )
-	>=dev-libs/glib-2.4.0
+	glib? ( >=dev-libs/glib-2.4.0 )
 	avahi? ( >=net-dns/avahi-0.6.12 )
 	>=dev-libs/liboil-0.3.0
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	lirc? ( app-misc/lirc )
-	hal? ( >=sys-apps/hal-0.5.7 )
+	dbus? ( >=sys-apps/dbus-1.0.0 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	hal? (
+		>=sys-apps/hal-0.5.7
+		>=sys-apps/dbus-1.0.0
+	)
 	app-admin/eselect-esd
-	sys-devel/libtool" # it's a valid RDEPEND, libltdl.so is used
+	bluetooth? (
+		>=net-wireless/bluez-libs-3
+		>=sys-apps/dbus-1.0.0
+	)
+	policykit? ( sys-auth/policykit )
+	asyncns? ( net-libs/libasyncns )
+	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
 DEPEND="${RDEPEND}
+	dev-libs/libatomic_ops
 	dev-util/pkgconfig"
 
-# This is for the alsasound init.d script (see bug #155707)
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez-utils dep is for the bluetooth init.d script
 RDEPEND="${RDEPEND}
-	alsa? ( media-sound/alsa-utils )"
+	gnome-extra/gnome-audio
+	alsa? ( media-sound/alsa-utils )
+	bluetooth? ( >=net-wireless/bluez-utils-3 )"
 
 pkg_setup() {
 	if use avahi && ! built_with_use net-dns/avahi dbus ; then
@@ -46,8 +63,8 @@ pkg_setup() {
 	fi
 
 	enewgroup audio 18 # Just make sure it exists
+	enewgroup realtime
 	enewgroup pulse-access
-	enewgroup pulse-rt
 	enewgroup pulse
 	enewuser pulse -1 -1 /var/run/pulse pulse,audio
 }
@@ -56,21 +73,25 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-esdcompat.patch"
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-	epatch "${FILESDIR}/${P}-noshm.patch"
-	epatch "${FILESDIR}/${P}-CVE-2007-1804.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-svn2074.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-polkit.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-bt-nohal.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-esoundpath.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-create-directory.patch"
 
-	# eautoreconf
+	eautoreconf
 	elibtoolize
 }
 
 src_compile() {
+	# To properly fix CVE-2008-0008
+	append-flags -UNDEBUG
+
 	econf \
 		--enable-largefile \
-		--enable-glib2 \
+		$(use_enable glib) \
 		--disable-solaris \
-		--disable-asyncns \
+		$(use_enable asyncns) \
 		$(use_enable oss) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
@@ -79,11 +100,16 @@ src_compile() {
 		$(use_enable lirc) \
 		$(use_enable avahi) \
 		$(use_enable hal) \
+		$(use_enable dbus) \
+		$(use_enable gnome gconf) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable policykit polkit) \
 		$(use_with caps) \
 		$(use_with X x) \
 		--disable-ltdl-install \
 		--localstatedir=/var \
-		--with-realtime-group=pulse-rt \
+		--with-realtime-group=realtime \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
@@ -97,12 +123,10 @@ src_install() {
 	use alsa && neededservices="$neededservices alsasound"
 	use avahi && neededservices="$neededservices avahi-daemon"
 	use hal && neededservices="$neededservices hald"
+	use bluetooth && neededservices="$neededservices bluetooth"
 	[[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
 	doinitd "${T}/pulseaudio"
 
-	if ! use hal; then
-		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
-	fi
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
 
 	dohtml -r doc
@@ -119,10 +143,34 @@ pkg_postinst() {
 	elog "To be able to access that you need to be in the group pulse-access."
 	elog "For more information about system-wide support, please refer to"
 	elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-
+	if use gnome; then
+		elog
+		elog "By enabling gnome USE flag, you enabled gconf support. Pleaes note"
+		elog "that you might need to remove the gnome USE flag or disable the"
+		elog "gconf module on /etc/pulse/default.pa to be able to use PulseAudio"
+		elog "with a system-wide instance."
+	fi
+	elog
 	elog "To use the ESounD wrapper while using a system-wide daemon, you also"
 	elog "need to enable auth-anonymous for the esound-unix module, or to copy"
 	elog "/var/run/pulse/.esd_auth into each home directory."
+	elog
+	elog "If you want to make use of realtime capabilities of PulseAudio"
+	elog "you should follow the realtime guide to create and set up a realtime"
+	elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
+	elog "Make sure you also have baselayout installed with pam USE flag"
+	elog "enabled, if you're using the rlimit method."
+	if use bluetooth; then
+		elog
+		elog "The BlueTooth proximity module is not enabled in the default"
+		elog "configuration file. If you do enable it, you'll have to have"
+		elog "your BlueTooth controller enabled and inserted at bootup or"
+		elog "PulseAudio will refuse to start."
+		elog
+		elog "Please note that the BlueTooth proximity module seems itself"
+		elog "still experimental, so please report to upstream if you have"
+		elog "problems with it."
+	fi
 
 	eselect esd update --if-unset
 }
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.8-r5.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9-r2.ebuild
index 80693c8707e4..2bc51bff4ed8 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.8-r5.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.9-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r5.ebuild,v 1.1 2007/12/29 16:06:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r2.ebuild,v 1.1 2008/01/24 02:07:11 flameeyes Exp $
 
-inherit eutils libtool autotools
+EAPI=1
+
+inherit eutils libtool autotools flag-o-matic
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
@@ -10,8 +12,8 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib"
 
 RDEPEND="X? ( x11-libs/libX11 )
 	caps? ( sys-libs/libcap )
@@ -20,7 +22,7 @@ RDEPEND="X? ( x11-libs/libX11 )
 	>=media-libs/libsndfile-1.0.10
 	>=dev-libs/liboil-0.3.6
 	alsa? ( >=media-libs/alsa-lib-1.0.10 )
-	>=dev-libs/glib-2.4.0
+	glib? ( >=dev-libs/glib-2.4.0 )
 	avahi? ( >=net-dns/avahi-0.6.12 )
 	>=dev-libs/liboil-0.3.0
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -38,6 +40,7 @@ RDEPEND="X? ( x11-libs/libX11 )
 		>=sys-apps/dbus-1.0.0
 	)
 	policykit? ( sys-auth/policykit )
+	asyncns? ( net-libs/libasyncns )
 	>=sys-apps/baselayout-2.0_rc5
 	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
 DEPEND="${RDEPEND}
@@ -72,22 +75,25 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-svn2074.patch"
-	epatch "${FILESDIR}/${P}-polkit.patch"
-	epatch "${FILESDIR}/${P}-bt-nohal.patch"
-	epatch "${FILESDIR}/${P}-esoundpath.patch"
-	epatch "${FILESDIR}/${P}-create-directory.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-svn2074.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-polkit.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-bt-nohal.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-esoundpath.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-create-directory.patch"
 
 	eautoreconf
 	elibtoolize
 }
 
 src_compile() {
+	# To properly fix CVE-2008-0008
+	append-flags -UNDEBUG
+
 	econf \
 		--enable-largefile \
-		--enable-glib2 \
+		$(use_enable glib) \
 		--disable-solaris \
-		--disable-asyncns \
+		$(use_enable asyncns) \
 		$(use_enable oss) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
@@ -129,9 +135,6 @@ src_install() {
 		> "${T}/pulseaudio"
 	doinitd "${T}/pulseaudio"
 
-	if ! use hal; then
-		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
-	fi
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
 
 	dohtml -r doc
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.8-r4.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9.ebuild
index 75498a7d7e4c..6b68ca6699db 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.8-r4.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r4.ebuild,v 1.2 2007/12/29 17:56:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9.ebuild,v 1.1 2008/01/24 02:07:11 flameeyes Exp $
 
-inherit eutils libtool autotools
+inherit eutils libtool autotools flag-o-matic
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
@@ -10,8 +10,8 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns"
 
 RDEPEND="X? ( x11-libs/libX11 )
 	caps? ( sys-libs/libcap )
@@ -38,6 +38,7 @@ RDEPEND="X? ( x11-libs/libX11 )
 		>=sys-apps/dbus-1.0.0
 	)
 	policykit? ( sys-auth/policykit )
+	asyncns? ( net-libs/libasyncns )
 	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
 DEPEND="${RDEPEND}
 	dev-libs/libatomic_ops
@@ -70,22 +71,25 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-svn2074.patch"
-	epatch "${FILESDIR}/${P}-polkit.patch"
-	epatch "${FILESDIR}/${P}-bt-nohal.patch"
-	epatch "${FILESDIR}/${P}-esoundpath.patch"
-	epatch "${FILESDIR}/${P}-create-directory.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-svn2074.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-polkit.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-bt-nohal.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-esoundpath.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8-create-directory.patch"
 
 	eautoreconf
 	elibtoolize
 }
 
 src_compile() {
+	# To properly fix CVE-2008-0008
+	append-flags -UNDEBUG
+
 	econf \
 		--enable-largefile \
 		--enable-glib2 \
 		--disable-solaris \
-		--disable-asyncns \
+		$(use_enable asyncns) \
 		$(use_enable oss) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
@@ -121,9 +125,6 @@ src_install() {
 	[[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
 	doinitd "${T}/pulseaudio"
 
-	if ! use hal; then
-		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
-	fi
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
 
 	dohtml -r doc