Port the changes done for net-im/kopete to this ebuild as starting from 3.5.5, 0.12 series is merged.

Package-Manager: portage-2.1.2_pre2-r8

5 files changed, 142 insertions, 19 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index be5bb71e8372..a3a14a14a718 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.79 2006/10/04 20:27:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.80 2006/10/11 14:54:36 flameeyes Exp $
+
+  11 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-0.12_alpha1-xscreensaver.patch,
+  +files/gnomemeeting-ekiga.patch, kopete-3.5.5.ebuild:
+  Port the changes done for net-im/kopete to this ebuild as starting from
+  3.5.5, 0.12 series is merged.
 
   04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.5.5.ebuild:
   Remove unneeded patches.
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 9709d10e8072..0ebc8abae940 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -13,10 +13,18 @@ AUX disable-meanwhile.diff 351 RMD160 e97ecb2f463f98a14857352647800d6402629146 S
 MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
 RMD160 e97ecb2f463f98a14857352647800d6402629146 files/disable-meanwhile.diff 351
 SHA256 4331c4edfe1e81ad1372dee39940e2fb12bf35b12dc298ebe5b8fb435ad35434 files/disable-meanwhile.diff 351
+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.1-icqfix3.patch 584 RMD160 12b8de0555fe71321139d2d2ffca2e94c70f765f SHA1 3d7b5ec003c9c9ba8abf48f04ba695b63ea92e12 SHA256 b3f942f94403135f30990574a74f36755c8ffb496a6496fa823ae1b028f8ca82
 MD5 01b42c4e8b58d78005e6f3870b5fda16 files/kopete-0.12.1-icqfix3.patch 584
 RMD160 12b8de0555fe71321139d2d2ffca2e94c70f765f files/kopete-0.12.1-icqfix3.patch 584
 SHA256 b3f942f94403135f30990574a74f36755c8ffb496a6496fa823ae1b028f8ca82 files/kopete-0.12.1-icqfix3.patch 584
+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
 AUX kopete-3.5.3-icqfix.patch 1018 RMD160 a8f98e36c6abe06068fea05df7019a8e43b96b81 SHA1 1399c0a08ff2cc3dfa303dfa5a12a5986a9d225e SHA256 b267d693d266c17af48916bb51f12c74764c97d5367ee9e2bf90009e459278ed
 MD5 028773fca0d39e36c363fa1b6e8ffcfb files/kopete-3.5.3-icqfix.patch 1018
 RMD160 a8f98e36c6abe06068fea05df7019a8e43b96b81 files/kopete-3.5.3-icqfix.patch 1018
@@ -42,14 +50,14 @@ EBUILD kopete-3.5.4.ebuild 2015 RMD160 af586fec5f8365571446ff30ea89de8c475b2f71
 MD5 b6ba949fc2aa7385b66767ea672557b0 kopete-3.5.4.ebuild 2015
 RMD160 af586fec5f8365571446ff30ea89de8c475b2f71 kopete-3.5.4.ebuild 2015
 SHA256 53788187c67c74f96a418e4483fb2f3615157df61be2e5f41987cc8ce676d696 kopete-3.5.4.ebuild 2015
-EBUILD kopete-3.5.5.ebuild 1920 RMD160 c9676cfcce8d403867642d8937acba119077a4b1 SHA1 37df672d68217f816af783d149ad1805d245977e SHA256 b4b810d323f75b7ce4d7c61856815e88ef6c602f04d66917b4c7464519dd3049
-MD5 4bf57707dd0662fd9854aa2eabc1382e kopete-3.5.5.ebuild 1920
-RMD160 c9676cfcce8d403867642d8937acba119077a4b1 kopete-3.5.5.ebuild 1920
-SHA256 b4b810d323f75b7ce4d7c61856815e88ef6c602f04d66917b4c7464519dd3049 kopete-3.5.5.ebuild 1920
-MISC ChangeLog 11264 RMD160 7c73110b1cccdc2236d2f4aad07006268dfeb38b SHA1 0c470bd2172e2eb7772263941dab3311c4f073b9 SHA256 98c1fc38914af61784d5727511f7d8cf6ec44a606099de42f34e171e4063fe0b
-MD5 a81b1f93337bd93a399d1ebba1c8913e ChangeLog 11264
-RMD160 7c73110b1cccdc2236d2f4aad07006268dfeb38b ChangeLog 11264
-SHA256 98c1fc38914af61784d5727511f7d8cf6ec44a606099de42f34e171e4063fe0b ChangeLog 11264
+EBUILD kopete-3.5.5.ebuild 3782 RMD160 ed87aab8efe2d745bf196c936a28ba3657aef6bc SHA1 be6c92b46b7e7babd522bbe77cd757f2bcb5aee2 SHA256 56e3d8f0b539f09fdcd3221ab274c67ddfed2efbb9fe13a3112ce8787b94f545
+MD5 a46ceb72c3bef3eb902fa43e49413ba1 kopete-3.5.5.ebuild 3782
+RMD160 ed87aab8efe2d745bf196c936a28ba3657aef6bc kopete-3.5.5.ebuild 3782
+SHA256 56e3d8f0b539f09fdcd3221ab274c67ddfed2efbb9fe13a3112ce8787b94f545 kopete-3.5.5.ebuild 3782
+MISC ChangeLog 11528 RMD160 24ae267141c72b29cfd523bada9d0f6dde0c3b92 SHA1 9a6007c9cf18c9a6281c0ce8f6ec22f5471dd7f5 SHA256 e9fc884a48c2abe47e1a1949927e601d433932aa9585d59763a4ed155d0eb7da
+MD5 f417083c74d40c127c093eab46982731 ChangeLog 11528
+RMD160 24ae267141c72b29cfd523bada9d0f6dde0c3b92 ChangeLog 11528
+SHA256 e9fc884a48c2abe47e1a1949927e601d433932aa9585d59763a4ed155d0eb7da ChangeLog 11528
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -69,7 +77,7 @@ SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJBlVAiZjviIA2XgRAsTsAKC2zaqQGPFijIvQ4kEpB1jrf6WD2QCg1hOW
-guoELKb0MLc7AmjK5KPDXqU=
-=tFWn
+iD8DBQFFLQW1AiZjviIA2XgRAtdUAKDKQWOj58UdJZcyranhHj0RKFG9lACeLXpL
+rQuJMxBcs1ci2QX0wN6FeGo=
+=m54X
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/gnomemeeting-ekiga.patch b/kde-base/kopete/files/gnomemeeting-ekiga.patch
new file mode 100644
index 000000000000..7ff568b15709
--- /dev/null
+++ b/kde-base/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/kde-base/kopete/files/kopete-0.12_alpha1-xscreensaver.patch b/kde-base/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
new file mode 100644
index 000000000000..2052d30cb450
--- /dev/null
+++ b/kde-base/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
@@ -0,0 +1,25 @@
+Index: kopete-0.12-alpha1/kopete/libkopete/configure.in.in
+===================================================================
+--- kopete-0.12-alpha1.orig/kopete/libkopete/configure.in.in
++++ kopete-0.12-alpha1/kopete/libkopete/configure.in.in
+@@ -4,7 +4,11 @@ LDFLAGS="$X_LDFLAGS"
+ 
+ LIB_XSS=
+ 
+-KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
++AC_ARG_WITH([xscreensaver],
++  AC_HELP_STRING([--without-xscreensaver], [Disable XScreenSaver support (default: check)]) )
++
++if test "x$with_xscreensaver" != "xno"; then
++  KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
+     [
+     AC_CHECK_LIB(Xext,XScreenSaverQueryInfo,
+ 	[
+@@ -27,6 +31,7 @@ KDE_CHECK_HEADER(X11/extensions/scrnsave
+      [
+      #include <X11/Xlib.h>
+      ] )
++fi
+ 
+ AC_SUBST(LIB_XSS)
+ LDFLAGS="$xss_save_ldflags"
diff --git a/kde-base/kopete/kopete-3.5.5.ebuild b/kde-base/kopete/kopete-3.5.5.ebuild
index 24ea004829b1..f827adba773f 100644
--- a/kde-base/kopete/kopete-3.5.5.ebuild
+++ b/kde-base/kopete/kopete-3.5.5.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/kde-base/kopete/kopete-3.5.5.ebuild,v 1.2 2006/10/04 20:27:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.5.ebuild,v 1.3 2006/10/11 14:54:36 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -14,7 +14,10 @@ DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="sametime ssl xmms kernel_linux"
+IUSE="jingle sametime ssl xmms xscreensaver slp kernel_linux latex crypt
+	  winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
+	  connectionstatus contactnotes translator webpresence texteffect highlight
+	  alias autoreplace history nowlistening addbookmarks"
 
 # The kernel_linux? ( ) conditional dependencies are for webcams, not supported
 # on other kernels AFAIK
@@ -29,20 +32,28 @@ BOTH_DEPEND="dev-libs/libxslt
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXrender
-		x11-libs/libXScrnSaver
+		xscreensaver? ( x11-libs/libXScrnSaver )
 		) <virtual/x11-7 )
-	kernel_linux? ( virtual/opengl )"
+	kernel_linux? ( virtual/opengl )
+	sms? ( app-mobilephone/gsmlib )"
 
 RDEPEND="${BOTH_DEPEND}
-	ssl? ( app-crypt/qca-tls )"
+	ssl? ( app-crypt/qca-tls )
+	!kde-base/kopete
+	!kde-base/kdenetwork
+	latex? ( virtual/tetex
+		media-gfx/imagemagick )
+	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 )
 	|| ( (
 			x11-proto/videoproto
-			x11-proto/xproto
 			kernel_linux? ( x11-libs/libXv )
-			x11-proto/scrnsaverproto
+			xscreensaver? ( x11-proto/scrnsaverproto )
 		) <virtual/x11-7 )"
 
 pkg_setup() {
@@ -54,6 +65,43 @@ pkg_setup() {
 	fi
 }
 
+kopete_disable() {
+	einfo "Disabling $2 $1"
+	sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am"
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	epatch "${FILESDIR}/kopete-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
+	use netmeeting || kopete_disable plugin netmeeting
+	use statistics || kopete_disable plugin statistics
+	use autoreplace || kopete_disable plugin autoreplace
+	use connectionstatus || kopete_disable plugin connectionstatus
+	use contactnotes || kopete_disable plugin contactnotes
+	use translator || kopete_disable plugin translator
+	use webpresence || kopete_disable plugin webpresence
+	use texteffect || kopete_disable plugin texteffect
+	use highlight || kopete_disable plugin highlight
+	use alias || kopete_disable plugin alias
+	use addbookmarks || kopete_disable plugin addbookmarks
+	use history || kopete_disable plugin history
+	use nowlistening || kopete_disable plugin nowlistening
+
+	use winpopup || kopete_disable protocol winpopup
+	use gadu || kopete_disable protocol '\$(GADU)'
+	use irc || kopete_disable protocol irc
+	use groupwise || kopete_disable protocol groupwise
+	use yahoo || kopete_disable protocol yahoo
+
+	rm -f "${S}/configure"
+}
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.