Add patch to fix KDE BUG #130630 (unable to connect to ICQ since today), add warning on all the old ebuilds.

(Portage version: 2.1.1_pre2-r6)

9 files changed, 185 insertions, 6 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 515a2306988e..79767b9b2173 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,15 @@
 # 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.209 2006/07/09 19:48:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.210 2006/07/11 18:46:13 flameeyes Exp $
+
+*kdenetwork-3.5.3-r2 (11 Jul 2006)
+
+  11 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.3-icqfix.patch, kdenetwork-3.3.2-r2.ebuild,
+  kdenetwork-3.4.3.ebuild, kdenetwork-3.5.2.ebuild, kdenetwork-3.5.3.ebuild,
+  kdenetwork-3.5.3-r1.ebuild, +kdenetwork-3.5.3-r2.ebuild:
+  Add patch to fix KDE BUG #130630 (unable to connect to ICQ since today), add
+  warning on all the old ebuilds.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdenetwork-3.5.2.ebuild, kdenetwork-3.5.3.ebuild,
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.3-r2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.3-r2
new file mode 100644
index 000000000000..0d9cb09f0130
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.3-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 119af91a048c34d9a917a1898f215554 kdenetwork-3.5.3.tar.bz2 7524718
+RMD160 0c57f39652946c577ad0d6ec7f4fc593fe38a0bc kdenetwork-3.5.3.tar.bz2 7524718
+SHA256 f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c kdenetwork-3.5.3.tar.bz2 7524718
diff --git a/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch b/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch
new file mode 100644
index 000000000000..6370565cf64a
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.3-icqfix.patch
@@ -0,0 +1,24 @@
+Index: kopete/protocols/oscar/liboscar/oscartypes.h
+===================================================================
+--- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561015)
++++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561016)
+@@ -232,13 +232,13 @@
+ 
+ 	/* ICQ Version Characteristics */
+ 	const unsigned char ICQ_TCP_VERSION 	= 0x0008;
+-	const char ICQ_CLIENTSTRING[] 		= "ICQ Inc. - Product of ICQ (TM).2003a.5.45.1.3777.85";
++	const char ICQ_CLIENTSTRING[] 		= "ICQBasic";
+ 	const WORD ICQ_CLIENTID 		= 0x010A;
+-	const WORD ICQ_MAJOR 			= 0x0005;
+-	const WORD ICQ_MINOR 			= 0x002D;
+-	const WORD ICQ_POINT 			= 0x0001;
+-	const WORD ICQ_BUILD 			= 0x0EC1;
+-	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x00, 0x55 };
++	const WORD ICQ_MAJOR 			= 0x0014;
++	const WORD ICQ_MINOR 			= 0x0034;
++	const WORD ICQ_POINT 			= 0x0000;
++	const WORD ICQ_BUILD 			= 0x0A0F;
++	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
+ 	const char ICQ_COUNTRY[] 		= "us";
+ 	const char ICQ_LANG[] 			= "en";
+ 
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild
index 7011f6bf90f3..c43130134e69 100644
--- a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.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/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.10 2006/02/21 18:51:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.11 2006/07/11 18:46:13 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -56,3 +56,13 @@ src_install() {
 	newins ${FILESDIR}/lisa.conf lisa
 	newins ${FILESDIR}/reslisa.conf reslisa
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 the version of Kopete here built cannot connect to ICQ service"
+	elog "anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2, >=net-im/kopete-0.12.0-r2"
+	elog "or >=kde-base/kdenetwork-3.5.2-r2 that are patched to support the new authentication."
+	elog "For more information, please look at the following bugs:"
+	elog "	  http://bugs.kde.org/show_bug.cgi?id=130630"
+	elog "	  http://bugs.gentoo.org/show_bug.cgi?id=140009"
+}
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild
index 37c60114eb11..ab63073bd760 100644
--- a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.4.3.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/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.10 2006/04/04 01:05:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.11 2006/07/11 18:46:13 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -67,3 +67,13 @@ src_install() {
 	newins ${FILESDIR}/lisa.conf lisa
 	newins ${FILESDIR}/reslisa.conf reslisa
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 the version of Kopete here built cannot connect to ICQ service"
+	elog "anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2, >=net-im/kopete-0.12.0-r2"
+	elog "or >=kde-base/kdenetwork-3.5.2-r2 that are patched to support the new authentication."
+	elog "For more information, please look at the following bugs:"
+	elog "	  http://bugs.kde.org/show_bug.cgi?id=130630"
+	elog "	  http://bugs.gentoo.org/show_bug.cgi?id=140009"
+}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild
index a6f878bbdb65..4468eb5c807f 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.2.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/kdenetwork/kdenetwork-3.5.2.ebuild,v 1.12 2006/07/09 19:48:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.2.ebuild,v 1.13 2006/07/11 18:46:13 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -86,3 +86,13 @@ src_install() {
 	newins ${FILESDIR}/lisa.conf lisa
 	newins ${FILESDIR}/reslisa.conf reslisa
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 the version of Kopete here built cannot connect to ICQ service"
+	elog "anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2, >=net-im/kopete-0.12.0-r2"
+	elog "or >=kde-base/kdenetwork-3.5.2-r2 that are patched to support the new authentication."
+	elog "For more information, please look at the following bugs:"
+	elog "	  http://bugs.kde.org/show_bug.cgi?id=130630"
+	elog "	  http://bugs.gentoo.org/show_bug.cgi?id=140009"
+}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild
index 922712a2e62d..af6a50e778d1 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.3-r1.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/kdenetwork/kdenetwork-3.5.3-r1.ebuild,v 1.3 2006/07/09 19:48:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3-r1.ebuild,v 1.4 2006/07/11 18:46:13 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -86,3 +86,13 @@ src_install() {
 	newins ${WORKDIR}/patches/lisa.conf lisa
 	newins ${WORKDIR}/patches/reslisa.conf reslisa
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 the version of Kopete here built cannot connect to ICQ service"
+	elog "anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2, >=net-im/kopete-0.12.0-r2"
+	elog "or >=kde-base/kdenetwork-3.5.2-r2 that are patched to support the new authentication."
+	elog "For more information, please look at the following bugs:"
+	elog "	  http://bugs.kde.org/show_bug.cgi?id=130630"
+	elog "	  http://bugs.gentoo.org/show_bug.cgi?id=140009"
+}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.3-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.3-r2.ebuild
new file mode 100644
index 000000000000..ae30ca7d02c6
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.5.3-r2.ebuild
@@ -0,0 +1,90 @@
+# 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.3-r2.ebuild,v 1.1 2006/07/11 18:46:13 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/xextproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			x11-proto/scrnsaverproto
+		) <virtual/x11-7 )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kopete-3.5.3-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
+}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild
index e5457a69668a..182589931f06 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.3.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/kdenetwork/kdenetwork-3.5.3.ebuild,v 1.3 2006/07/09 19:48:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.3.ebuild,v 1.4 2006/07/11 18:46:13 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -86,3 +86,13 @@ src_install() {
 	newins ${FILESDIR}/lisa.conf lisa
 	newins ${FILESDIR}/reslisa.conf reslisa
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 the version of Kopete here built cannot connect to ICQ service"
+	elog "anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2, >=net-im/kopete-0.12.0-r2"
+	elog "or >=kde-base/kdenetwork-3.5.2-r2 that are patched to support the new authentication."
+	elog "For more information, please look at the following bugs:"
+	elog "	  http://bugs.kde.org/show_bug.cgi?id=130630"
+	elog "	  http://bugs.gentoo.org/show_bug.cgi?id=140009"
+}