Add patch for KDE bug #136566.

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 132 insertions, 8 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 9669969e372c..c94dab774f42 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.220 2006/10/05 22:33:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.221 2006/10/31 19:42:43 flameeyes Exp $
+
+*kdenetwork-3.5.5-r1 (31 Oct 2006)
+
+  31 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.5-icqfix.patch, +kdenetwork-3.5.5-r1.ebuild:
+  Add patch for KDE bug #136566.
 
   05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdenetwork-3.5.5.ebuild:
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 952f26b31339..9e6755e0016c 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -17,6 +17,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
@@ -66,14 +70,18 @@ EBUILD kdenetwork-3.5.4.ebuild 2504 RMD160 89d93c930a549ba6120a4a76f606e97efa357
 MD5 d34e9ca6a3e6e3172c4eb3ceeee55228 kdenetwork-3.5.4.ebuild 2504
 RMD160 89d93c930a549ba6120a4a76f606e97efa35790e kdenetwork-3.5.4.ebuild 2504
 SHA256 32b00d16ec430fb05e62f6d5947a15d45823696c32e6175f0c40e0da9f07302a kdenetwork-3.5.4.ebuild 2504
+EBUILD kdenetwork-3.5.5-r1.ebuild 2459 RMD160 fd99ac5371ea38b514d0e6a3ea8d791f553aebb3 SHA1 6a6395701b72229eee262a96df455e873a298904 SHA256 f1fbe985e9869df113fdc60ee63ea3f70ae151faaaf36c0a709015362bf6d8a9
+MD5 60e654adefe223eeeea1bbdb009a7ec5 kdenetwork-3.5.5-r1.ebuild 2459
+RMD160 fd99ac5371ea38b514d0e6a3ea8d791f553aebb3 kdenetwork-3.5.5-r1.ebuild 2459
+SHA256 f1fbe985e9869df113fdc60ee63ea3f70ae151faaaf36c0a709015362bf6d8a9 kdenetwork-3.5.5-r1.ebuild 2459
 EBUILD kdenetwork-3.5.5.ebuild 2407 RMD160 9724b6fc7c686faa34a77aee0b46ab0c10c37538 SHA1 5822f265eb195d6880d7c09d30b0657f6f51ac40 SHA256 4cf5e6b399108f5883d2063e2fdc27b4b37abc9bd6ce958b1348ccd5d066d763
 MD5 227cb5545e88eee82767954ca5e8d54a kdenetwork-3.5.5.ebuild 2407
 RMD160 9724b6fc7c686faa34a77aee0b46ab0c10c37538 kdenetwork-3.5.5.ebuild 2407
 SHA256 4cf5e6b399108f5883d2063e2fdc27b4b37abc9bd6ce958b1348ccd5d066d763 kdenetwork-3.5.5.ebuild 2407
-MISC ChangeLog 29525 RMD160 c665984d4bcd5cc70e5bcee36f206f9aa88eec86 SHA1 cb4a9486a964a767ddc6849312bd19f22f2058ea SHA256 32ae9e4795f66f4951bc836184f72266c7591e36884f625d05e712b447b39bc8
-MD5 fac3b7d1497b293774059b9846045145 ChangeLog 29525
-RMD160 c665984d4bcd5cc70e5bcee36f206f9aa88eec86 ChangeLog 29525
-SHA256 32ae9e4795f66f4951bc836184f72266c7591e36884f625d05e712b447b39bc8 ChangeLog 29525
+MISC ChangeLog 29713 RMD160 95fc88e920d8c58805012645c59a613b9594962d SHA1 d9334b09f1cd5fa44197b46ffdc5219d896a58bd SHA256 d419fde4e85a25dfd36941a32a7109f6c359fabd51fd1dc5099ff2f60dc3cf03
+MD5 85df260044e8c147c063fabe78827695 ChangeLog 29713
+RMD160 95fc88e920d8c58805012645c59a613b9594962d ChangeLog 29713
+SHA256 d419fde4e85a25dfd36941a32a7109f6c359fabd51fd1dc5099ff2f60dc3cf03 ChangeLog 29713
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -90,10 +98,13 @@ SHA256 beb14f778ba810ba5a07abc26c6526aeb824417ee5c3c6cae984ec52813a735b files/di
 MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kdenetwork-3.5.5 533
 RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kdenetwork-3.5.5 533
 SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kdenetwork-3.5.5 533
+MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kdenetwork-3.5.5-r1 533
+RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kdenetwork-3.5.5-r1 533
+SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kdenetwork-3.5.5-r1 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJYhTAiZjviIA2XgRAtnzAJ0Sa76oOoxhlVKkyfq0rRWsGLn8zgCfX+sb
-L3SxQq04LEQhgp6g3zkVy4E=
-=rw9/
+iD8DBQFFR6P7AiZjviIA2XgRAq3VAJ49nvY6W+fpR7ilZ4/JdOz4PL5tSQCglWXU
+Zh+ebqKoosEVEkzLEan1/D4=
+=je+9
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r1
new file mode 100644
index 000000000000..e013575200c5
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r1
@@ -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/kdenetwork/files/kopete-3.5.5-icqfix.patch b/kde-base/kdenetwork/files/kopete-3.5.5-icqfix.patch
new file mode 100644
index 000000000000..4aa3f2759c14
--- /dev/null
+++ b/kde-base/kdenetwork/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/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..4a889c50e928
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.1 2006/10/31 19:42:43 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="rdesktop sametime slp ssl wifi xmms"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+BOTH_DEPEND="~kde-base/kdebase-${PV}
+	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 )
+	slp? ( net-libs/openslp )
+	wifi? ( net-wireless/wireless-tools )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		) <virtual/x11-7 )
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
+	dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL
+		app-crypt/qca-tls )"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			x11-proto/scrnsaverproto
+		) <virtual/x11-7 )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch"
+
+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
+}
+
+src_compile() {
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	local myconf="--with-libidn
+				  $(use_enable sametime sametime-plugin)
+				  $(use_enable slp) $(use_with wifi)
+				  $(use_with xmms) --without-external-libgadu"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod u+s "${D}/${KDEDIR}/bin/reslisa"
+
+	# empty config file needed for lisa to work with default settings
+	dodir /etc
+	touch "${D}/etc/lisarc"
+
+	# lisa, reslisa initscripts
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa"
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa"
+	exeinto /etc/init.d
+	doexe "${T}/lisa" "${T}/reslisa"
+
+	insinto /etc/conf.d
+	newins "${WORKDIR}/patches/lisa.conf" lisa
+	newins "${WORKDIR}/patches/reslisa.conf" reslisa
+}