Add pulseaudio as an alternative to esound since esd is being last-rited. Not sure if this works properly. Either someone will test this, or we'll stabilize 3.x, or we'll remove ekiga.

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

3 files changed, 26 insertions, 20 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index ea9a09116681..2ddaf127c840 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/ekiga
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.26 2011/03/27 13:20:56 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.27 2012/01/04 01:24:51 nirbheek Exp $
+
+  04 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org> ekiga-2.0.12.ebuild:
+  Add pulseaudio as an alternative to esound since esd is being last-rited. Not
+  sure if this works properly. Either someone will test this, or we'll
+  stabilize 3.x, or we'll remove ekiga.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> ekiga-2.0.12.ebuild:
   Fix slot-dep on gtk+
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index 493c1e1eb89c..46e0116c1416 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -9,24 +9,24 @@ AUX ekiga-eggtrayicon-update.diff 13969 RMD160 159f1164516362b90ef8e63988ba5fa77
 AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f19b5d7add4db5fa1f4e301d92101188c48006f SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d
 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9
 DIST ekiga-3.2.7.tar.bz2 9093433 RMD160 0e87b60f144df65f3070c21fe7b8126e42941196 SHA1 c2ed571a5f5f058b6d80c091dd69dfe557c17df2 SHA256 f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f
-EBUILD ekiga-2.0.12.ebuild 2373 RMD160 8a49157c6c00f44cb5f8657499948d6b3892fded SHA1 2c2bf614ebd9c0fbc280ab316561508abd6ccec4 SHA256 60100b2643acbff3fa4d018f24557bef969b1b00626a835b1b2cdeab0f78832d
+EBUILD ekiga-2.0.12.ebuild 2407 RMD160 33e58b6d327260ecbb5947e231ec10d25d13e876 SHA1 2d0ec6828da22366a6e1626895c48519ff3e365e SHA256 9957066cb9e18f23759f55cdb66cee170e255ef6e9b5aa441bbeaea562d2b009
 EBUILD ekiga-3.2.7.ebuild 5058 RMD160 fc61da0ec53b39c9380a5defb1df8d71b25a8846 SHA1 b0683bda244f4b5516608c1f8b76e5deac5890c5 SHA256 592a9ab15b2ad1367e1c461bb9281632db8364f3fdf918595781d6950feda384
-MISC ChangeLog 11947 RMD160 8a4628a5c71cbdf84309bdfb16e3ec63e442fb17 SHA1 5da14e432784a512b487f4702a58a11d28ce89e0 SHA256 a0587898def763101f51970feb1888ce1bdfb2e060a2fbc3b604ec39847e0d06
+MISC ChangeLog 12214 RMD160 4fbd6294cd2a61812938b2733c40b4ea0b05e1ab SHA1 9929d89e53d74c6530c816c9a252b8c1dd121cac SHA256 122bbf2cf26c7d7bf9e896d834d3302971ca02f67cbd71f946b96b9deeeeb121
 MISC metadata.xml 572 RMD160 ed1c0b6f7b51be67aa96c2c5c042fbef023c6a72 SHA1 33e80a99b5ad43d02439c5454f594adb961307d8 SHA256 6c1b059a423b06dae8acda431a06e0a80568b3fce52d6c9d42cceddc2325a8b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjzm/AAoJEO/kOhxWD91kRN0P/2+1FykK5Uwp3Q65GqbhYTSM
-cZv3W4miSePYhMFrX0YRC15yr9R9+Z1xTbX3eq6ajBVLqNArmCRKwZER39IBjWQZ
-0mJJ/rmncbqch8qBzMxS6hcAKaZSQVhc4BariPaKE3/RfNdijsa0lYa4wdyijZYL
-FjMBoQiA4lDt42PXv5gVl10APpcyO133ilOUNBdQZwYE5xrG5D91GKQfWbmf81t5
-yq21NAuXF7ylvS0Kr26uutq5QZ6hBrR7RI58+XOA9cayyBzwWnl1mFmRU0wVb+r/
-DNCLnmt3p33z+P1hCoxgv6fPpZwcrQlBCG+bTIgzrhF1SH2H7zUjsfTuNqTIel1Q
-wAD4Axofpvc8x0fnxfp8etaW6f5+u5DrRDApzRfb+7iDkSYXlB26y0E2cy03z0rq
-RbCt/Xma0sRk6J5k+DBct7Mhpci+C+QIgzowj9vJBMuD9QiKGtD2OsCv2H17xeoR
-sG6nHhulhM8CBELXAwJMGYbgl5AU9zd4svBMCSJKTX+V2K/kM/Es6Jl4EO3wBvRb
-W1GRIeX6kWH1Wl/SAiw36x+JTc27ulY3GdiI6+0iBm6fVrmOMqBFgm7hDdc0hjDV
-eKtX/8n/ob6q3zxFKQXvV6RR06zJV9PPuBh7nqhiEt9OJOJceATSdwZNQ0DT6nzB
-dx1CbRpnjqjOi7SblwA/
-=o3Do
+iQIcBAEBAgAGBQJPA6pqAAoJEO/kOhxWD91kqu0P/02IBRio9+7S2FmDErobq70Y
+DZqSXmZNkm+UvmRWuxweu7IewZqkZVR/FB6FSCqkng8ZCQEZBtYmACC6+oZ8Q2/5
+vKT1AKji2s/OfTZJCOuaR1Dy9U29tfWGhCDj4m66eHrfruxWVc26MDgFK0j7xKit
+YjvaeOd2wmqtiv9a+2PxCW6BeQF78LBGNXYqcHtIKBZEXfsdScKZEi0uCxqQgyDv
+alNRXki/tIc/SXcEvyBj0HLtXXIVg4Rv/Gz1gj0aVYzqLyq+N1+qT4qAHQM1YA7L
+AG3cDdolZpeXhiN5DG+Q66w53tjNh97FnYtJRx39BcnlIbCLdf4/H8jLqeOjyFB+
+0ctpWCVED+1fWmCAOTtMWvowgZPq2IaGx80ez+Kxir6hEOoX9m3D/zS4nMKnenuM
+a5+fX2Z5icMF6maR+9r87RDC3irgxUIknjhgIWCQkV4dCf09tcYBJcY9ZUDWCEfW
+3Ffey0QydUlsSAeSLYCYOBp5mkjcHZOTg9tzXrn0cqrwNDl7DUYq0l9wOYspXZHs
++HJ7ykdMq9RSvm1UyIzDMit2F9CIPSvTSFOVAobZHkTnDBepJazHflrkaEqQDWRN
+IDnLgTu/jCA8BNH/KcgxDM/vlvGz05uLR19ewIABlsNMLeSOv0jskDUFsV53ptsG
+yikYto5bz+ccsaNDM2Wd
+=a5DS
 -----END PGP SIGNATURE-----
diff --git a/net-voip/ekiga/ekiga-2.0.12.ebuild b/net-voip/ekiga/ekiga-2.0.12.ebuild
index 446355f4e226..8dec8de9c391 100644
--- a/net-voip/ekiga/ekiga-2.0.12.ebuild
+++ b/net-voip/ekiga/ekiga-2.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-2.0.12.ebuild,v 1.3 2011/03/27 13:20:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-2.0.12.ebuild,v 1.4 2012/01/04 01:24:51 nirbheek Exp $
 
 EAPI="2"
 inherit gnome2 eutils flag-o-matic
@@ -27,7 +27,8 @@ RDEPEND="~dev-libs/pwlib-1.10.$[${PV##*.}-2][ldap]
 		>=gnome-base/gconf-2.2.0
 		>=gnome-base/orbit-2.5.0
 		gnome-extra/evolution-data-server
-		>=media-sound/esound-0.2.28 )"
+		|| ( media-sound/pulseaudio
+			 >=media-sound/esound-0.2.28 ) )"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl