use ekiga instead of gnomemeeting

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 60 insertions, 22 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/Manifest b/net-im/kopete/Manifest
index ffb12958fd36..1f27905407fb 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -1,19 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
+MD5 9e1eafd475bca7ccb4c199e2fbdca02a files/gnomemeeting-ekiga.patch 2073
+RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 files/gnomemeeting-ekiga.patch 2073
+SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c files/gnomemeeting-ekiga.patch 2073
 AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d
 MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch 778
 RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
 SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
 DIST kopete-0.12.1.tar.bz2 5309636 RMD160 0bb66fb0a8a0d12b0d19845d5a39993520cb368d SHA1 874ff9cbf2a684b0fe2933da58b735a1a12718cc SHA256 a18174bf48257361c6a337073e2fa1c7dc0b0eba274d558ac9fd5bc84275927e
-EBUILD kopete-0.12.1.ebuild 3946 RMD160 4692bd0a7d4b9db1d3127fd3d0bf81c5a2ddd21a SHA1 a3ed2825df3811b024accf53cdd8f9dd9d630a23 SHA256 186d665329befadcba722c3937e38e01a8c444ad49e5e5e5e3c2edd554831ffa
-MD5 afa147ba5c9477adadbb873354fbdfcd kopete-0.12.1.ebuild 3946
-RMD160 4692bd0a7d4b9db1d3127fd3d0bf81c5a2ddd21a kopete-0.12.1.ebuild 3946
-SHA256 186d665329befadcba722c3937e38e01a8c444ad49e5e5e5e3c2edd554831ffa kopete-0.12.1.ebuild 3946
-MISC ChangeLog 4653 RMD160 34beeb32300a2abbf79d395d3db99354bc61ee85 SHA1 20e298d8a7275b9d008035de95f1455d888ae622 SHA256 2f90f0902455d52f7430cd8dec7cf47969b9531f95df12cff7a3dd098beffc51
-MD5 549d229566e0d1879b71a65bd5acf11c ChangeLog 4653
-RMD160 34beeb32300a2abbf79d395d3db99354bc61ee85 ChangeLog 4653
-SHA256 2f90f0902455d52f7430cd8dec7cf47969b9531f95df12cff7a3dd098beffc51 ChangeLog 4653
+EBUILD kopete-0.12.1.ebuild 4124 RMD160 ddc51affc895b330494aa4b94b8a8e6cc836688c SHA1 623645635500bdd8824b803263559b17464dd1ae SHA256 e56f5c8fa4babd03b392fb54aca9c25698ca75645a210f1689334b1f3113e902
+MD5 51436ede1af24f151a0e407b88f39283 kopete-0.12.1.ebuild 4124
+RMD160 ddc51affc895b330494aa4b94b8a8e6cc836688c kopete-0.12.1.ebuild 4124
+SHA256 e56f5c8fa4babd03b392fb54aca9c25698ca75645a210f1689334b1f3113e902 kopete-0.12.1.ebuild 4124
+MISC ChangeLog 4798 RMD160 1df840d62d45db350e796d462a26fcc817db6e80 SHA1 ac22fe68a515d865bb38752304fec196b251bb4b SHA256 286ac01c734c35f8572efc828b6142a4a2d9686ec119a96abdefaddc489091f7
+MD5 39e349e7a54fb3da53dcd6900b15b397 ChangeLog 4798
+RMD160 1df840d62d45db350e796d462a26fcc817db6e80 ChangeLog 4798
+SHA256 286ac01c734c35f8572efc828b6142a4a2d9686ec119a96abdefaddc489091f7 ChangeLog 4798
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -21,10 +22,3 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
 MD5 5ec703b9184a1c0d72d57d051eb6a8af files/digest-kopete-0.12.1 247
 RMD160 e36d314e7b529f07f7da9eb4500cae429bc12159 files/digest-kopete-0.12.1 247
 SHA256 7ec59e43384c9b57a703cc0041f69ac6d5ac2381340f20335fc62d674b68e4ad files/digest-kopete-0.12.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEu2euAiZjviIA2XgRArdzAJ4yhRASzsRl0sC18xVaYzYCZ2D+IACbBCj4
-0xl3l5kz1dRsNGFYmo4A1E8=
-=1gFS
------END PGP SIGNATURE-----
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