Add patch to fix yet-again more ICQ protocol changes, see KDE BUG #130630.

Package-Manager: portage-2.1.1_pre4-r1

3 files changed, 18 insertions, 151 deletions

diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index a8954c3a98fd..0b7f04b5cccb 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -5,6 +5,10 @@ AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a93
 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.1-oscarcontacts.patch 3838 RMD160 6b4b1a7b7ce37c09422b7a94117d570d0325f9da SHA1 b88beebf5c67563591be61b35c949804427c404b SHA256 3f39bc3c8cebebe0a40f64aea9cfebe0c451cd3a317b26fdc0d2b155330dac38
 MD5 a03cfcc743fe1b1072a14b788b097059 files/kopete-0.12.1-oscarcontacts.patch 3838
 RMD160 6b4b1a7b7ce37c09422b7a94117d570d0325f9da files/kopete-0.12.1-oscarcontacts.patch 3838
@@ -14,25 +18,25 @@ MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch
 RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
 SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
 DIST kopete-0.12.1.tar.bz2 5309636 RMD160 0bb66fb0a8a0d12b0d19845d5a39993520cb368d SHA1 874ff9cbf2a684b0fe2933da58b735a1a12718cc SHA256 a18174bf48257361c6a337073e2fa1c7dc0b0eba274d558ac9fd5bc84275927e
-EBUILD kopete-0.12.1-r2.ebuild 4248 RMD160 87a4daa7fefad60063b6f376792ed5209d7cd2aa SHA1 d5ed2ab1d19f57d9a4bd1bc8481b006aa327277a SHA256 7d835ce108496ac31ca341152558cd49553b7a2333bf698553fb6a9f56fd1520
-MD5 52f0912d237f5930664a03140e3dd9f9 kopete-0.12.1-r2.ebuild 4248
-RMD160 87a4daa7fefad60063b6f376792ed5209d7cd2aa kopete-0.12.1-r2.ebuild 4248
-SHA256 7d835ce108496ac31ca341152558cd49553b7a2333bf698553fb6a9f56fd1520 kopete-0.12.1-r2.ebuild 4248
-MISC ChangeLog 5271 RMD160 5bec861115ccfd61a08b5e43e0047fe7a6903c9a SHA1 e300a591f574ccc4b3dc3a6ab1a9cd3fd21e93f1 SHA256 0e6314ab643e98691d3e79a26541c6ea6ff123fde5a518e77e4fbfbac734f39d
-MD5 8dc20ff6093de0b98730280f84230a74 ChangeLog 5271
-RMD160 5bec861115ccfd61a08b5e43e0047fe7a6903c9a ChangeLog 5271
-SHA256 0e6314ab643e98691d3e79a26541c6ea6ff123fde5a518e77e4fbfbac734f39d ChangeLog 5271
+EBUILD kopete-0.12.1-r3.ebuild 4308 RMD160 1c7fa8bfaa62a86479c1abac2c43c1c6b32960a5 SHA1 50474e5a00c77f15eb5853379385ef7ccfa64dd5 SHA256 4f3b1f4a8d1dc3a10c71d3ebffc076a572e7cce7b4d80363d8426cd85b572076
+MD5 238f5425de26bdf517132091e3ff5d40 kopete-0.12.1-r3.ebuild 4308
+RMD160 1c7fa8bfaa62a86479c1abac2c43c1c6b32960a5 kopete-0.12.1-r3.ebuild 4308
+SHA256 4f3b1f4a8d1dc3a10c71d3ebffc076a572e7cce7b4d80363d8426cd85b572076 kopete-0.12.1-r3.ebuild 4308
+MISC ChangeLog 5527 RMD160 1cd19a58c32bf0dfe8c1c5ae16bb2d3104f19c2d SHA1 8b36cdd4b11b446ca384dcbba0d7c2479f0d4767 SHA256 cc9c99ab7dd8254c9eef05e5db142d19426637d0bd68853b4c530523e4ae2b65
+MD5 0ec0a4d8b4010d7a0c2e437b66308b7c ChangeLog 5527
+RMD160 1cd19a58c32bf0dfe8c1c5ae16bb2d3104f19c2d ChangeLog 5527
+SHA256 cc9c99ab7dd8254c9eef05e5db142d19426637d0bd68853b4c530523e4ae2b65 ChangeLog 5527
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
 SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata.xml 254
-MD5 5ec703b9184a1c0d72d57d051eb6a8af files/digest-kopete-0.12.1-r2 247
-RMD160 e36d314e7b529f07f7da9eb4500cae429bc12159 files/digest-kopete-0.12.1-r2 247
-SHA256 7ec59e43384c9b57a703cc0041f69ac6d5ac2381340f20335fc62d674b68e4ad files/digest-kopete-0.12.1-r2 247
+MD5 5ec703b9184a1c0d72d57d051eb6a8af files/digest-kopete-0.12.1-r3 247
+RMD160 e36d314e7b529f07f7da9eb4500cae429bc12159 files/digest-kopete-0.12.1-r3 247
+SHA256 7ec59e43384c9b57a703cc0041f69ac6d5ac2381340f20335fc62d674b68e4ad files/digest-kopete-0.12.1-r3 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEzMQCAiZjviIA2XgRAisUAKClxjZ51AsiIpH1wviFuMJ9aZpPpQCeIr7E
-YmLv/TACaF2EM8Y5+wSn5CA=
-=I3PF
+iD8DBQFEzlGhAiZjviIA2XgRAgG4AJ4+ODOL9lj25kdzlGJcR3PiX5IAfwCgg55X
+7eshplLaqRG51YK5QgjdAJ0=
+=Q1bc
 -----END PGP SIGNATURE-----
diff --git a/net-im/kopete/files/digest-kopete-0.12.1-r2 b/net-im/kopete/files/digest-kopete-0.12.1-r2
deleted file mode 100644
index 2f6f75f34afa..000000000000
--- a/net-im/kopete/files/digest-kopete-0.12.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b646f2f45fc0fbcd56ada5078fb540fb kopete-0.12.1.tar.bz2 5309636
-RMD160 0bb66fb0a8a0d12b0d19845d5a39993520cb368d kopete-0.12.1.tar.bz2 5309636
-SHA256 a18174bf48257361c6a337073e2fa1c7dc0b0eba274d558ac9fd5bc84275927e kopete-0.12.1.tar.bz2 5309636
diff --git a/net-im/kopete/kopete-0.12.1-r2.ebuild b/net-im/kopete/kopete-0.12.1-r2.ebuild
deleted file mode 100644
index 2607551feede..000000000000
--- a/net-im/kopete/kopete-0.12.1-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.1-r2.ebuild,v 1.1 2006/07/30 14:36:43 flameeyes Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-MY_P="${MY_P/.0/}"
-
-DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org/"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-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"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-# 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
-	slp? ( net-libs/openslp )
-	jingle? (
-		>=media-libs/speex-1.1.6
-		dev-libs/expat
-		~net-libs/ortp-0.7.1 )
-	sametime? ( =net-libs/meanwhile-0.4* )
-	xmms? ( media-sound/xmms )
-	|| ( (
-		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 )
-	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/xextproto
-			x11-proto/xproto
-			kernel_linux? ( x11-libs/libXv )
-			xscreensaver? ( x11-proto/scrnsaverproto )
-		) <virtual/x11-7 )"
-
-need-kde 3.4
-
-#dev-libs/ilbc-rfc3951: could not see any benifit in it
-#sed -i 's:ilbc_found="no":ilbc_found="yes":' ${S}/kopete/protocols/jabber/jingle/configure.in.in
-
-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_src_unpack
-	epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch"
-	# use ekiga instead of gnomemeeting by default
-	epatch "${FILESDIR}/gnomemeeting-ekiga.patch"
-	# Bug #141675
-	epatch "${FILESDIR}/${P}-oscarcontacts.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}"/usr/bin/{stun,relay}server
-}