Dropped the PDEPEND on net-im/kopete-otr because of keywording issues and added a post-install message instead. Re-added ~alpha and ~x86-fbsd. Invalidates bug 176731. Added upstream patch for cryptography, fixes bug 177319.

(Portage version: 2.1.2.6)

3 files changed, 33 insertions, 5 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index cd94c138b9e5..e163dfe89cc0 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.109 2007/05/02 20:34:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.110 2007/05/06 22:16:27 philantrop Exp $
+
+  06 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kopete-3.5.6-cryptobug.patch, kopete-3.5.6-r1.ebuild:
+  Dropped the PDEPEND on net-im/kopete-otr because of keywording issues and
+  added a post-install message instead. Re-added ~alpha and ~x86-fbsd .
+  Invalidates bug 176731. Added upstream patch for cryptography, fixes bug
+  177319.
 
   02 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   kopete-3.5.6-r1.ebuild:
diff --git a/kde-base/kopete/files/kopete-3.5.6-cryptobug.patch b/kde-base/kopete/files/kopete-3.5.6-cryptobug.patch
new file mode 100644
index 000000000000..331e567ce44e
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.6-cryptobug.patch
@@ -0,0 +1,14 @@
+diff -Nru kdenetwork-3.5.6.orig/kopete/plugins/cryptography/cryptographyplugin.cpp kdenetwork-3.5.6/kopete/plugins/cryptography/cryptographyplugin.cpp
+--- kdenetwork-3.5.6.orig/kopete/plugins/cryptography/cryptographyplugin.cpp	2007-05-06 14:40:56.000000000 +0200
++++ kdenetwork-3.5.6/kopete/plugins/cryptography/cryptographyplugin.cpp	2007-05-06 14:42:06.000000000 +0200
+@@ -58,9 +58,7 @@
+ 	if( !pluginStatic_ )
+ 		pluginStatic_=this;
+ 
+-	m_inboundHandler = 0;
+-/*	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound,
+-		Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );*/
++	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound, Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );
+ 	connect( Kopete::ChatSessionManager::self(),
+ 		SIGNAL( aboutToSend( Kopete::Message & ) ),
+ 		SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
diff --git a/kde-base/kopete/kopete-3.5.6-r1.ebuild b/kde-base/kopete/kopete-3.5.6-r1.ebuild
index 28fdcf384157..b6516499ebb4 100644
--- a/kde-base/kopete/kopete-3.5.6-r1.ebuild
+++ b/kde-base/kopete/kopete-3.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.6-r1.ebuild,v 1.4 2007/05/02 20:34:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.6-r1.ebuild,v 1.5 2007/05/06 22:16:27 philantrop Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -13,7 +13,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="jingle sametime ssl xscreensaver slp kernel_linux latex crypt
 		winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
 		connectionstatus contactnotes translator webpresence texteffect highlight
@@ -49,8 +49,6 @@ RDEPEND="${BOTH_DEPEND}
 #	only needed for calling
 #	netmeeting? ( net-im/gnomemeeting )"
 
-PDEPEND="crypt? ( net-im/kopete-otr )"
-
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
 	x11-proto/videoproto
@@ -82,6 +80,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
 
+	# http://bugs.kde.org/show_bug.cgi?id=134907
+	epatch "${FILESDIR}/${P}-cryptobug.patch"
+
 	use latex || kopete_disable plugin latex
 	use crypt || kopete_disable plugin cryptography
 	use netmeeting || kopete_disable plugin netmeeting
@@ -124,3 +125,9 @@ src_install() {
 
 	rm -f "${D}${KDEDIR}"/bin/{stun,relay}server
 }
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	elog "If you would like to use Off-The-Record encryption, emerge net-im/kopete-otr."
+}