Add patch for KDE bug #136566.

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 171 insertions, 8 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index f5aa3941a3c8..862c20ad3d0c 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.87 2006/10/27 13:55:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.88 2006/10/31 19:35:04 flameeyes Exp $
+
+*kopete-3.5.5-r2 (31 Oct 2006)
+
+  31 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.5-icqfix.patch, +kopete-3.5.5-r2.ebuild:
+  Add patch for KDE bug #136566.
 
   27 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.5.5-r1.ebuild:
   Allow installing kopete with 3.5.0 kdelibs.
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 2007bf411b2c..07c04fbf412d 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -29,6 +29,10 @@ AUX kopete-3.5.3-icqfix.patch 1018 RMD160 a8f98e36c6abe06068fea05df7019a8e43b96b
 MD5 028773fca0d39e36c363fa1b6e8ffcfb files/kopete-3.5.3-icqfix.patch 1018
 RMD160 a8f98e36c6abe06068fea05df7019a8e43b96b81 files/kopete-3.5.3-icqfix.patch 1018
 SHA256 b267d693d266c17af48916bb51f12c74764c97d5367ee9e2bf90009e459278ed files/kopete-3.5.3-icqfix.patch 1018
+AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 SHA1 f3ef29b821ba5f0b62438a7b78a982625e42bd94 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987
+MD5 33f9ea10ff35fd56a9f3c4cd2b983583 files/kopete-3.5.5-icqfix.patch 749
+RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 files/kopete-3.5.5-icqfix.patch 749
+SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 files/kopete-3.5.5-icqfix.patch 749
 AUX kopete-3.5.x-oscarcontacts.patch 3522 RMD160 517648e2a4711995bf4aac388a5b5ff88d6d81b9 SHA1 7e64722238b63dc56ba614690c3aeee228d17099 SHA256 25bad95c67ebdfa22e297057406bdb50fdb1e24ddd9cc31e9008f175f326816e
 MD5 ddd5bd40a322656a0e236b8aa185a27b files/kopete-3.5.x-oscarcontacts.patch 3522
 RMD160 517648e2a4711995bf4aac388a5b5ff88d6d81b9 files/kopete-3.5.x-oscarcontacts.patch 3522
@@ -54,10 +58,14 @@ EBUILD kopete-3.5.5-r1.ebuild 4050 RMD160 3266437391ed10bcb6543e0cd2dad95b3aaed4
 MD5 38372fb6abbfe0f91a5f06c59a1219e1 kopete-3.5.5-r1.ebuild 4050
 RMD160 3266437391ed10bcb6543e0cd2dad95b3aaed43b kopete-3.5.5-r1.ebuild 4050
 SHA256 1db2087e5932e9e4b675f64d65f78b0a639a6e86600f1848caa0f0477b001509 kopete-3.5.5-r1.ebuild 4050
-MISC ChangeLog 12411 RMD160 2d330f5732f444fbb6355d26fdd13d323516c1e4 SHA1 2f9a4db77d116b90afdea590afa5a7485def73b2 SHA256 5eae876e0e7cab8e38239efedf267645e0864d46691d026dd2dec2167047ea44
-MD5 c155ff506e031eef948d024fe5044124 ChangeLog 12411
-RMD160 2d330f5732f444fbb6355d26fdd13d323516c1e4 ChangeLog 12411
-SHA256 5eae876e0e7cab8e38239efedf267645e0864d46691d026dd2dec2167047ea44 ChangeLog 12411
+EBUILD kopete-3.5.5-r2.ebuild 4091 RMD160 6380544f3c9b05af4f2360d81c23041119b23059 SHA1 180e91e1b35ea5696daf4140d976080c46e78f7e SHA256 651844948bbba1de334a3c950bc3ed38c848e1ab6ba0d2781118a7921c884372
+MD5 173230b4156b890e46f8534c7d309244 kopete-3.5.5-r2.ebuild 4091
+RMD160 6380544f3c9b05af4f2360d81c23041119b23059 kopete-3.5.5-r2.ebuild 4091
+SHA256 651844948bbba1de334a3c950bc3ed38c848e1ab6ba0d2781118a7921c884372 kopete-3.5.5-r2.ebuild 4091
+MISC ChangeLog 12591 RMD160 f895c3bd219b271a443afd71b3bf966b890b3589 SHA1 138220e96538582600e2db682ec8a0966b4af031 SHA256 7d0c4de8398f0d489dc243ed250311b6b582b59eeacb01814e4c2d3b1cf253f0
+MD5 16b696e92b9ffa1b58801206d4b3ec19 ChangeLog 12591
+RMD160 f895c3bd219b271a443afd71b3bf966b890b3589 ChangeLog 12591
+SHA256 7d0c4de8398f0d489dc243ed250311b6b582b59eeacb01814e4c2d3b1cf253f0 ChangeLog 12591
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -74,10 +82,13 @@ SHA256 beb14f778ba810ba5a07abc26c6526aeb824417ee5c3c6cae984ec52813a735b files/di
 MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kopete-3.5.5-r1 533
 RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kopete-3.5.5-r1 533
 SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kopete-3.5.5-r1 533
+MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kopete-3.5.5-r2 533
+RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kopete-3.5.5-r2 533
+SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kopete-3.5.5-r2 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQg/TAiZjviIA2XgRAuS9AKCme57p4PZEU3xwdLu4uxbikqYtXQCg6cXX
-HdF5O/UAW8aoV6+fwg/Jq7E=
-=Z4Ok
+iD8DBQFFR6I3AiZjviIA2XgRAi/EAKCZ+q5KOiDxRBSLxdpyrRUb8LvJvwCfa3CF
+wIR56vy/w+LHwfZ5br56Tkg=
+=xHHJ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/digest-kopete-3.5.5-r2 b/kde-base/kopete/files/digest-kopete-3.5.5-r2
new file mode 100644
index 000000000000..e013575200c5
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.5.5-r2
@@ -0,0 +1,6 @@
+MD5 07d313f91154d3c2f4620b921277fdc8 kdenetwork-3.5-patchset-01.tar.bz2 2986
+RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf kdenetwork-3.5-patchset-01.tar.bz2 2986
+SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b kdenetwork-3.5-patchset-01.tar.bz2 2986
+MD5 a6e642c070cbd50d4a817f6588bf8e46 kdenetwork-3.5.5.tar.bz2 9235564
+RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 kdenetwork-3.5.5.tar.bz2 9235564
+SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f kdenetwork-3.5.5.tar.bz2 9235564
diff --git a/kde-base/kopete/files/kopete-3.5.5-icqfix.patch b/kde-base/kopete/files/kopete-3.5.5-icqfix.patch
new file mode 100644
index 000000000000..4aa3f2759c14
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.5-icqfix.patch
@@ -0,0 +1,12 @@
+Index: kdenetwork-3.5.5/kopete/protocols/oscar/liboscar/client.cpp
+===================================================================
+--- kdenetwork-3.5.5.orig/kopete/protocols/oscar/liboscar/client.cpp
++++ kdenetwork-3.5.5/kopete/protocols/oscar/liboscar/client.cpp
+@@ -340,6 +340,7 @@ void Client::lt_loginFinished()
+ 		//we've finished logging in. start the services setup
+ 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl;
+ 		initializeStaticTasks();
++		d->ownStatusTask->go();
+ 		ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() );
+ 		connect( ssTask, SIGNAL( finished() ), this, SLOT( serviceSetupFinished() ) );
+ 		ssTask->go( true ); //fire and forget
diff --git a/kde-base/kopete/kopete-3.5.5-r2.ebuild b/kde-base/kopete/kopete-3.5.5-r2.ebuild
new file mode 100644
index 000000000000..afbfbadf634b
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.5-r2.ebuild
@@ -0,0 +1,128 @@
+# 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-r2.ebuild,v 1.1 2006/10/31 19:35:04 flameeyes Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="3.5.0 $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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
+BOTH_DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	app-crypt/qca
+	sametime? ( =net-libs/meanwhile-0.4* )
+	xmms? ( media-sound/xmms )
+	jingle? (
+		>=media-libs/speex-1.1.6
+		dev-libs/expat
+		~net-libs/ortp-0.7.1 )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		) <virtual/x11-7 )
+	kernel_linux? ( virtual/opengl )
+	sms? ( app-mobilephone/gsmlib )"
+
+RDEPEND="${BOTH_DEPEND}
+	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
+			kernel_linux? ( x11-libs/libXv )
+			xscreensaver? ( x11-proto/scrnsaverproto )
+		) <virtual/x11-7 )"
+
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	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"
+
+	epatch "${FILESDIR}/${P}-icqfix.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.
+	# The nowlistening plugin has xmms support.
+	local myconf="$(use_enable jingle)
+		$(use_enable sametime sametime-plugin)
+		$(use_with xmms) --without-external-libgadu
+		$(use_with xscreensaver) $(use_enable sms smsgsm)
+		$(use_enable debug testbed)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	rm -f "${D}${KDEDIR}"/bin/{stun,relay}server
+}