Add patch to fix KDE BUG #129366. Thanks to Roman Jarosz for reporting.

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

5 files changed, 18 insertions, 242 deletions

diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index 80762acca47f..bdee7c6085a2 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -9,6 +9,10 @@ AUX kopete-0.12-icqfix.patch 706 RMD160 305c9cc77716f1c3eff7fe3ac0e99ade6893034c
 MD5 c6e2c0a68b4ea1ceaf09345fa7fecf75 files/kopete-0.12-icqfix.patch 706
 RMD160 305c9cc77716f1c3eff7fe3ac0e99ade6893034c files/kopete-0.12-icqfix.patch 706
 SHA256 030b0af9b6ec82bf0303532ea40e32e3983e7edd6296d089874034981e6f3485 files/kopete-0.12-icqfix.patch 706
+AUX kopete-0.12-icqfix2.patch 491 RMD160 d5423460984b0948360f464e027443d811b01e4c SHA1 58d5b730b53cb320f87254685b17dec8a7102370 SHA256 d5fe0ba6ffcfb21d7b4b198fbb0b11c1cf6bbce566a36ad8a7af8cc0b2df8c02
+MD5 5db0cc9482fc87b923ee5c6729976e8b files/kopete-0.12-icqfix2.patch 491
+RMD160 d5423460984b0948360f464e027443d811b01e4c files/kopete-0.12-icqfix2.patch 491
+SHA256 d5fe0ba6ffcfb21d7b4b198fbb0b11c1cf6bbce566a36ad8a7af8cc0b2df8c02 files/kopete-0.12-icqfix2.patch 491
 AUX kopete-0.12-jabber-muc-chat.patch 3328 RMD160 95478b96cbb457c9dbb4ab4f0947facdb3332a04 SHA1 a07667668de03b61199a1a9b1f68e2c239cf742e SHA256 c011a3f27f198ddecf8577dcb8342b7203af4a9daad6c02fb8b99b6ad3e6852c
 MD5 3e2376346d0da278554352f06a777e0b files/kopete-0.12-jabber-muc-chat.patch 3328
 RMD160 95478b96cbb457c9dbb4ab4f0947facdb3332a04 files/kopete-0.12-jabber-muc-chat.patch 3328
@@ -18,32 +22,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.tar.bz2 5303165 RMD160 f69576edb740dc80b74e69455b3302e7345d71b6 SHA1 723c7ed0e38afe7f7579caf2f39fadcb5180b77e SHA256 1fc32f9729dcf29ae5cad344858ec7d4b3bbb0f94f13edbbbe72462e89cdfa58
-EBUILD kopete-0.12.0-r1.ebuild 2556 RMD160 cef933192b38d0080112706ad9e46b7efea820fe SHA1 5e9ffba394fe5f83c7475d02fe350cf95e752473 SHA256 2530524bf5cdef421a6788d2675af758388c689b1c274949f45c99d5eebf150b
-MD5 3ad8b893e28d70015569a0c5a16c3084 kopete-0.12.0-r1.ebuild 2556
-RMD160 cef933192b38d0080112706ad9e46b7efea820fe kopete-0.12.0-r1.ebuild 2556
-SHA256 2530524bf5cdef421a6788d2675af758388c689b1c274949f45c99d5eebf150b kopete-0.12.0-r1.ebuild 2556
-EBUILD kopete-0.12.0-r2.ebuild 4094 RMD160 eb4ef2e3e636ffda2b7edfa080384e2d311669d2 SHA1 e760a8414607dffeb0ee7c6f9643032ad65f419a SHA256 f842eeef28df5eb6fd26937415d86ae9c2b570eab73d824bea63838778be490b
-MD5 86ee5caa889f0bb7d25fd910982a460e kopete-0.12.0-r2.ebuild 4094
-RMD160 eb4ef2e3e636ffda2b7edfa080384e2d311669d2 kopete-0.12.0-r2.ebuild 4094
-SHA256 f842eeef28df5eb6fd26937415d86ae9c2b570eab73d824bea63838778be490b kopete-0.12.0-r2.ebuild 4094
-MISC ChangeLog 3877 RMD160 572571b243b2b9c38a5507ad5db09a798e95bc77 SHA1 3ec4624a70f3b4ddd7a31f050f97df0af1b61d1f SHA256 51415b2d901fc2f0df2d860ce39b297fa2c5ea21745427529452fb0131e61d7c
-MD5 df83b893f89c61bec6992c6acb79aca4 ChangeLog 3877
-RMD160 572571b243b2b9c38a5507ad5db09a798e95bc77 ChangeLog 3877
-SHA256 51415b2d901fc2f0df2d860ce39b297fa2c5ea21745427529452fb0131e61d7c ChangeLog 3877
+EBUILD kopete-0.12.0-r3.ebuild 4141 RMD160 c104d4e00bdcdeced58783d73607bd70deb2b3dd SHA1 4c852f19ecc7cc4e48fd51a33cc157b9e4cdd2c3 SHA256 affd7c77d2fa2b1930d5a23804b5f3d7cb32b837ad0a87a08048478485c92644
+MD5 e960972475fca0201a5126bda2dfd0c3 kopete-0.12.0-r3.ebuild 4141
+RMD160 c104d4e00bdcdeced58783d73607bd70deb2b3dd kopete-0.12.0-r3.ebuild 4141
+SHA256 affd7c77d2fa2b1930d5a23804b5f3d7cb32b837ad0a87a08048478485c92644 kopete-0.12.0-r3.ebuild 4141
+MISC ChangeLog 4154 RMD160 471b51b0c65e2f9ce9de502e28e3d78b74e066ba SHA1 d2b9d978a13fa00c0250800704854812ccc085b7 SHA256 eb4c40d0b5d289b69dbaa20cca0cb51d7bc0ffc4e72dce1e9f823b83f3b01b90
+MD5 70074efaa56e2639357debe5755bfac4 ChangeLog 4154
+RMD160 471b51b0c65e2f9ce9de502e28e3d78b74e066ba ChangeLog 4154
+SHA256 eb4c40d0b5d289b69dbaa20cca0cb51d7bc0ffc4e72dce1e9f823b83f3b01b90 ChangeLog 4154
 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 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0-r1 241
-RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0-r1 241
-SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0-r1 241
-MD5 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0-r2 241
-RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0-r2 241
-SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0-r2 241
+MD5 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0-r3 241
+RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0-r3 241
+SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0-r3 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEtWRoAiZjviIA2XgRAgc9AKDI4Qp1SLtosB+QgKWKGFXA3PL62QCglQTc
-mXrVhVdDSUf6XLlr/dhZnUM=
-=dtGL
+iD8DBQFEtn73AiZjviIA2XgRAklJAKDcnYi3O2hTLfT8BI2DPjNLKc4+xACfXNbj
+xX88qsgh7AsJ5ct0jYx/5n8=
+=ywiF
 -----END PGP SIGNATURE-----
diff --git a/net-im/kopete/files/digest-kopete-0.12.0-r1 b/net-im/kopete/files/digest-kopete-0.12.0-r1
deleted file mode 100644
index 488e78a604c5..000000000000
--- a/net-im/kopete/files/digest-kopete-0.12.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 392c5af64177ae29b3eebc10b91ad782 kopete-0.12.tar.bz2 5303165
-RMD160 f69576edb740dc80b74e69455b3302e7345d71b6 kopete-0.12.tar.bz2 5303165
-SHA256 1fc32f9729dcf29ae5cad344858ec7d4b3bbb0f94f13edbbbe72462e89cdfa58 kopete-0.12.tar.bz2 5303165
diff --git a/net-im/kopete/files/digest-kopete-0.12.0-r2 b/net-im/kopete/files/digest-kopete-0.12.0-r2
deleted file mode 100644
index 488e78a604c5..000000000000
--- a/net-im/kopete/files/digest-kopete-0.12.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 392c5af64177ae29b3eebc10b91ad782 kopete-0.12.tar.bz2 5303165
-RMD160 f69576edb740dc80b74e69455b3302e7345d71b6 kopete-0.12.tar.bz2 5303165
-SHA256 1fc32f9729dcf29ae5cad344858ec7d4b3bbb0f94f13edbbbe72462e89cdfa58 kopete-0.12.tar.bz2 5303165
diff --git a/net-im/kopete/kopete-0.12.0-r1.ebuild b/net-im/kopete/kopete-0.12.0-r1.ebuild
deleted file mode 100644
index 166234e2dac8..000000000000
--- a/net-im/kopete/kopete-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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.0-r1.ebuild,v 1.4 2006/07/09 04:11:57 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 kdehiddenvisibility slp kernel_linux"
-
-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 )"
-
-RDEPEND="${BOTH_DEPEND}
-	ssl? ( app-crypt/qca-tls )
-	!kde-base/kopete
-	!kde-base/kdenetwork
-	!net-libs/libjingle"
-
-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
-}
-
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch"
-	epatch "${FILESDIR}/${PN}-0.12-away.diff"
-	epatch "${FILESDIR}/${PN}-0.12-jabber-muc-chat.patch"
-	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)"
-
-	kde_src_compile
-}
diff --git a/net-im/kopete/kopete-0.12.0-r2.ebuild b/net-im/kopete/kopete-0.12.0-r2.ebuild
deleted file mode 100644
index 2d202a8a7f78..000000000000
--- a/net-im/kopete/kopete-0.12.0-r2.ebuild
+++ /dev/null
@@ -1,126 +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.0-r2.ebuild,v 1.3 2006/07/12 21:06:35 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
-	!net-libs/libjingle
-	latex? ( app-text/tetex )
-	crypt? ( app-crypt/gnupg )
-	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"
-	epatch "${FILESDIR}/${PN}-0.12-away.diff"
-	epatch "${FILESDIR}/${PN}-0.12-jabber-muc-chat.patch"
-	epatch "${FILESDIR}/${PN}-0.12-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
-}