net-im/ekiga: fix stun bug, fix preferences bug, add ~amd64. Bumping to -r2.

svn path=/trunk/; revision=840

4 files changed, 33 insertions, 6 deletions

diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog
index 5d262dc..11e651e 100644
--- a/net-im/ekiga/ChangeLog
+++ b/net-im/ekiga/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> -ekiga-3.2.0-r1.ebuild,
+	+ekiga-3.2.0-r2.ebuild, +ekiga-3.2.0-stun.patch,
+	+ekiga-3.2.0-preferences.patch:
+  Fix stun bug. Fix preferences bug. Add ~amd64 keyword.
+
   18 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> ekiga-3.2.0-r1.ebuild,
 	ekiga-3.2.0-configure.patch:
   Fixing kde-4 support
diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
index 14d2043..e235adb 100644
--- a/net-im/ekiga/Manifest
+++ b/net-im/ekiga/Manifest
@@ -2,10 +2,11 @@ AUX ekiga-3.0.2-ptracing.patch 5708 RMD160 1031c2a8fa5b2ade6ceb513a56e9b5ae95a60
 AUX ekiga-3.2.0-configure.patch 11122 RMD160 9f879bf47f989f71a3c6d0e34a68ccc07e3c8d27 SHA1 7247a0fa274844b3e7a169dca62782d3b1c07b89 SHA256 76872ab7779dc34d922613aefa8eaa52cc8a9f37b35daa06a77091ab4ba92c98
 AUX ekiga-3.2.0-preferences.patch 1066 RMD160 9815e6d34c96a9fef53e8de1b5ea298751046835 SHA1 d907efac2658f99eee6d2d2c7d8aad048f7a8ba6 SHA256 536af6033d2e8d65e92c2e2255c0b0baabc5b1692a98f767cf79e96b8a10fc37
 AUX ekiga-3.2.0-ptracing.patch 5073 RMD160 bad220709a9238347f2ed219a4ffe0ee9f5e1d0a SHA1 3050a2c4c2dc04b2ade582652df9fe8ea0c6e5e3 SHA256 78070f8e94c457d872979da177f612b1609e533ecbe943e2f13e863c67d8ffe8
+AUX ekiga-3.2.0-stun.patch 564 RMD160 2032f1cd65cc4e3ac11b16e932ac1a0a57d693a0 SHA1 8312a37736b13ded772523e7766d6827ff658620 SHA256 c0b34a292b59da8b0227d6fcc2b725adb0283f342d31d0d00f84243fdaaa11ad
 AUX ekiga-3.2.0-xcap.patch 2640 RMD160 c112e0a93c5dd121f83368ccf3dcf6f78bdd7eb6 SHA1 761ca9e87085e9cae194e47267ee4ed4b48cfd5b SHA256 e5284d49e703e43256f2a136159598c2f088d4e12698e158ae1b27ef357a26f2
 DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e
 DIST ekiga-3.2.0.tar.bz2 7679645 RMD160 f31e94dbe03038e39fb5b50bd71372992c13ae8b SHA1 6a8d6f203cd982cbfb37822b2a96f176176cd763 SHA256 998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd
-EBUILD ekiga-3.2.0-r1.ebuild 6305 RMD160 0c3c0d1209a8a182a7349c739e188fb9b61a4935 SHA1 21feda6051c0839582b0dbe0925ab2bfae966055 SHA256 7c99633b5e2114e7b9252461fbeeae2295538e5ba70789852526fd3a91230b73
-MISC ChangeLog 984 RMD160 ea1c8d10dfe3d844046971b80190e6adb1887639 SHA1 55c39b5413f44f3256e7bf3678eb693e75e36abc SHA256 8068c6b9b27d89ab382cf67a80185b64729cbb46c2da1cea4648f3ffa94e5b1f
+EBUILD ekiga-3.2.0-r2.ebuild 6406 RMD160 15bddbd920186abb82a3c9a73cc4fc17bd6e6cb3 SHA1 58fe220f827d717b8628a9afe23f84c28250eb80 SHA256 918a7c729b4805547c1551251c4ceca6d7e20b1277f0dcfea3e1d1a7230d5da6
+MISC ChangeLog 1200 RMD160 678a2e3e9ddf233002b3e284cf962c2cabc5f7ee SHA1 6e9a992282d5bb2d344526f804a409f5b411246e SHA256 f530d7d5575e8240b6e369b7146ae17d81b55aaa96da062bfb7fda073e8e4898
 MISC metadata.xml 528 RMD160 e925e497011180300d392e98206ff24e4b06911b SHA1 cf734d7d2b7c55c01e5ce3779e4bd3c89ffcad35 SHA256 b9895d5d6170742d1d26a135bab40a97c3aa1f4941c96d6018a3daead65bf12a
diff --git a/net-im/ekiga/ekiga-3.2.0-r1.ebuild b/net-im/ekiga/ekiga-3.2.0-r2.ebuild
index 8eb77f1..8b7ec97 100644
--- a/net-im/ekiga/ekiga-3.2.0-r1.ebuild
+++ b/net-im/ekiga/ekiga-3.2.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ekiga.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="avahi dbus debug doc eds gconf gnome gstreamer +h323 kde kontact ldap libnotify mmx nls +shm +sip static v4l xcap xv"
 
 RDEPEND=">=dev-libs/glib-2.8.0:2
@@ -64,8 +64,6 @@ GCONF_DEBUG="no"
 # there is a bug in libnotify-0.4.4 fixed in 0.4.5 wich is thrown in debug
 # default src_test is working (with make check)
 
-# TODO: what is blocking ekiga.net register ?
-
 pkg_setup() {
 	if use kontact && ! use kde; then
 		eerror "You need to enable kde if you want to enable kontact"
@@ -130,9 +128,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-ptracing.patch
 
 	# fix segfault when accessing to preferences window in debug mode
-	# backporting patch from upstream repository
+	# backporting patch from upstream repository, see upstream bug 577629
 	epatch "${FILESDIR}"/${P}-preferences.patch
 
+	# fix stun bug which makes ekiga.net unavailable
+	# see upstream bug 578883
+	epatch "${FILESDIR}"/${P}-stun.patch
+
 	# compilation breaks with xcap enabled
 	# backporting patch from upstream repository
 	if use xcap; then
diff --git a/net-im/ekiga/files/ekiga-3.2.0-stun.patch b/net-im/ekiga/files/ekiga-3.2.0-stun.patch
new file mode 100644
index 0000000..b569155
--- /dev/null
+++ b/net-im/ekiga/files/ekiga-3.2.0-stun.patch
@@ -0,0 +1,19 @@
+--- lib/engine/components/opal/opal-call-manager.cpp.old	2009-04-17 23:32:21.000000000 -0400
++++ lib/engine/components/opal/opal-call-manager.cpp	2009-04-17 23:32:49.000000000 -0400
+@@ -116,7 +116,7 @@
+   forward_on_no_answer = false;
+   forward_on_busy = false;
+   unconditional_forward = false;
+-  stun_enabled = false;
++  stun_enabled = true;
+ 
+   // Create video devices
+   PVideoDevice::OpenArgs video = GetVideoOutputDevice();
+@@ -496,6 +496,7 @@
+ void CallManager::set_stun_server (const std::string & server)
+ {
+   stun_server = server;
++	 start();
+ }
+ 
+