use ekiga instead of gnomemeeting

(Portage version: 2.1.1_pre3-r1)

3 files changed, 48 insertions, 4 deletions

diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 4d89bdefabb3..3ba8f407433e 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.72 2006/07/17 10:34:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.73 2006/07/18 14:43:20 genstef Exp $
+
+  18 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/gnomemeeting-ekiga.patch, kopete-0.12.1.ebuild:
+  use ekiga instead of gnomemeeting
 
   17 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-0.12.1.ebuild:
   Depend on virtual/tetex as reported in bug #140712.
diff --git a/net-im/kopete/files/gnomemeeting-ekiga.patch b/net-im/kopete/files/gnomemeeting-ekiga.patch
new file mode 100644
index 000000000000..7ff568b15709
--- /dev/null
+++ b/net-im/kopete/files/gnomemeeting-ekiga.patch
@@ -0,0 +1,36 @@
+diff -ur kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetinginvitation.cpp netmeeting/netmeetinginvitation.cpp
+--- kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetinginvitation.cpp	2006-07-18 16:30:54.000000000 +0200
++++ kopete-0.12.1/kopete/plugins/netmeeting/netmeetinginvitation.cpp	2006-07-18 16:04:51.000000000 +0200
+@@ -162,7 +162,7 @@
+ 	
+ 	KConfig *config=KGlobal::config();
+ 	config->setGroup("Netmeeting Plugin");
+-	QString app=config->readEntry("NetmeetingApplication","gnomemeeting -c callto://%1").arg(ip_address);
++	QString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
+ 	
+ 	kdDebug() << k_funcinfo << app <<  endl ;
+ 	
+diff -ur kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetingpreferences.cpp netmeeting/netmeetingpreferences.cpp
+--- kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetingpreferences.cpp	2006-07-18 16:30:54.000000000 +0200
++++ kopete-0.12.1/kopete/plugins/netmeeting/netmeetingpreferences.cpp	2006-07-18 16:04:51.000000000 +0200
+@@ -58,7 +58,7 @@
+ {
+ 	KConfig *config=KGlobal::config();
+ 	config->setGroup("Netmeeting Plugin");
+-	preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","gnomemeeting -c callto://%1"));
++	preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1"));
+ 	emit KCModule::changed(false);
+ }
+ 
+diff -ur kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetingprefs_ui.ui netmeeting/netmeetingprefs_ui.ui
+--- kopete-0.12.1/kopete/plugins/netmeeting.orig/netmeetingprefs_ui.ui	2006-07-18 16:30:54.000000000 +0200
++++ kopete-0.12.1/kopete/plugins/netmeeting/netmeetingprefs_ui.ui	2006-07-18 16:04:51.000000000 +0200
+@@ -63,7 +63,7 @@
+                 <widget class="KComboBox">
+                     <item>
+                         <property name="text">
+-                            <string>gnomemeeting -c callto://%1</string>
++                            <string>ekiga -c callto://%1</string>
+                         </property>
+                     </item>
+                     <item>
diff --git a/net-im/kopete/kopete-0.12.1.ebuild b/net-im/kopete/kopete-0.12.1.ebuild
index c57413a88c1b..2afefd9a9371 100644
--- a/net-im/kopete/kopete-0.12.1.ebuild
+++ b/net-im/kopete/kopete-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.1.ebuild,v 1.2 2006/07/17 10:34:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.1.ebuild,v 1.3 2006/07/18 14:43:20 genstef Exp $
 
 inherit kde eutils
 
@@ -48,8 +48,10 @@ RDEPEND="${BOTH_DEPEND}
 	!kde-base/kdenetwork
 	!net-libs/libjingle
 	latex? ( virtual/tetex )
-	crypt? ( app-crypt/gnupg )
-	netmeeting? ( net-im/gnomemeeting )"
+	crypt? ( app-crypt/gnupg )"
+#	gnomemeeting is deprecated and ekiga is not yet ~ppc64
+#	only needed for calling
+#	netmeeting? ( net-im/gnomemeeting )"
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
@@ -83,6 +85,8 @@ kopete_disable() {
 src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch"
+	# use ekiga instead of gnomemeeting by default
+	epatch "${FILESDIR}/gnomemeeting-ekiga.patch"
 
 	use latex || kopete_disable plugin latex
 	use crypt || kopete_disable plugin cryptography