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)

8 files changed, 148 insertions, 5 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 6f0b0d44c46a..eae7c083ff66 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2006/07/09 04:40:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.69 2006/07/11 18:29:02 flameeyes Exp $
+
+*kopete-3.5.3-r2 (11 Jul 2006)
+
+  11 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.3-icqfix.patch, kopete-3.4.3.ebuild,
+  kopete-3.5.2.ebuild, kopete-3.5.3.ebuild, kopete-3.5.3-r1.ebuild,
+  +kopete-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> kopete-3.5.2.ebuild,
   kopete-3.5.3.ebuild, kopete-3.5.3-r1.ebuild:
diff --git a/kde-base/kopete/files/digest-kopete-3.5.3-r2 b/kde-base/kopete/files/digest-kopete-3.5.3-r2
new file mode 100644
index 000000000000..0d9cb09f0130
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-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/kopete/files/kopete-3.5.3-icqfix.patch b/kde-base/kopete/files/kopete-3.5.3-icqfix.patch
new file mode 100644
index 000000000000..6370565cf64a
--- /dev/null
+++ b/kde-base/kopete/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/kopete/kopete-3.4.3.ebuild b/kde-base/kopete/kopete-3.4.3.ebuild
index e027a121b2d4..a65efa7dcbfc 100644
--- a/kde-base/kopete/kopete-3.4.3.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.4.3.ebuild,v 1.11 2006/06/22 12:48:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.3.ebuild,v 1.12 2006/07/11 18:29:02 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -35,3 +35,12 @@ src_compile() {
 	myconf="$myconf $(use_with xmms)"
 	kde-meta_src_compile
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 this version of Kopete cannot connect to ICQ service anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2 or"
+	elog ">=net-im/kopete-0.12.0-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/kopete/kopete-3.5.2.ebuild b/kde-base/kopete/kopete-3.5.2.ebuild
index ae48a95857ed..c6f7d4fcb8bb 100644
--- a/kde-base/kopete/kopete-3.5.2.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.5.2.ebuild,v 1.11 2006/07/09 04:40:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.2.ebuild,v 1.12 2006/07/11 18:29:02 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -61,3 +61,12 @@ src_compile() {
 
 	kde-meta_src_compile
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 this version of Kopete cannot connect to ICQ service anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2 or"
+	elog ">=net-im/kopete-0.12.0-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/kopete/kopete-3.5.3-r1.ebuild b/kde-base/kopete/kopete-3.5.3-r1.ebuild
index 284e66299720..397396ab9a8c 100644
--- a/kde-base/kopete/kopete-3.5.3-r1.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.5.3-r1.ebuild,v 1.3 2006/07/09 04:40:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3-r1.ebuild,v 1.4 2006/07/11 18:29:02 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -64,3 +64,12 @@ src_compile() {
 
 	kde-meta_src_compile
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 this version of Kopete cannot connect to ICQ service anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2 or"
+	elog ">=net-im/kopete-0.12.0-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/kopete/kopete-3.5.3-r2.ebuild b/kde-base/kopete/kopete-3.5.3-r2.ebuild
new file mode 100644
index 000000000000..7415f401ceba
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.3-r2.ebuild
@@ -0,0 +1,68 @@
+# 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.3-r2.ebuild,v 1.1 2006/07/11 18:29:02 flameeyes Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $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="sametime ssl xmms kernel_linux"
+
+# 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 )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		) <virtual/x11-7 )
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+	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 )"
+
+PATCHES="${FILESDIR}/${P}-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() {
+	# 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 sametime sametime-plugin)
+		$(use_with xmms) --without-external-libgadu"
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/kopete/kopete-3.5.3.ebuild b/kde-base/kopete/kopete-3.5.3.ebuild
index 3d9c0b82204d..10628f1fedad 100644
--- a/kde-base/kopete/kopete-3.5.3.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.5.3.ebuild,v 1.3 2006/07/09 04:40:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3.ebuild,v 1.4 2006/07/11 18:29:02 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -61,3 +61,12 @@ src_compile() {
 
 	kde-meta_src_compile
 }
+
+pkg_postinst() {
+	elog "Since 11 July 2006 this version of Kopete cannot connect to ICQ service anymore."
+	elog "You're currently invited to use either >=kde-base/kopete-3.5.3-r2 or"
+	elog ">=net-im/kopete-0.12.0-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"
+}