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

Package-Manager: portage-2.1.2.6

4 files changed, 55 insertions, 17 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index cbbdae2e2322..3a2e7bbed195 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.259 2007/05/05 05:16:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.260 2007/05/07 16:07:55 philantrop Exp $
+
+  07 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kopete-3.5.6-cryptobug.patch, kdenetwork-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. Invalidates bug
+  176926. Added upstream patch for cryptography, fixes bug 177319.
 
   05 May 2007; Jeroen Roovers <jer@gentoo.org> kdenetwork-3.5.6-r1.ebuild:
   Marked ~hppa (bug #176926).
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 5349a1578cf0..458ee9e9beb5 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 MD5 c4a46d3f1920fbef1afaf9d47f1edc6b files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
@@ -6,6 +9,10 @@ AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc9
 MD5 33f9ea10ff35fd56a9f3c4cd2b983583 files/kopete-3.5.5-icqfix.patch 749
 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 files/kopete-3.5.5-icqfix.patch 749
 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 files/kopete-3.5.5-icqfix.patch 749
+AUX kopete-3.5.6-cryptobug.patch 1000 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 SHA1 2e1a229bc4d9b03f48c143e9179b51c7e3393ac0 SHA256 9b6d6a810d19965cc3c2f1fa974edc1e8d7aa73faf0166e95e632d36132e34ff
+MD5 8e2130425d317657b48a60a5475f2182 files/kopete-3.5.6-cryptobug.patch 1000
+RMD160 dd935e379fe667f032a0256284aa5d40518e0610 files/kopete-3.5.6-cryptobug.patch 1000
+SHA256 9b6d6a810d19965cc3c2f1fa974edc1e8d7aa73faf0166e95e632d36132e34ff files/kopete-3.5.6-cryptobug.patch 1000
 DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
@@ -17,18 +24,18 @@ EBUILD kdenetwork-3.5.5-r2.ebuild 2484 RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9d
 MD5 b757b4ff64b152c6fd30885a9c9a9d72 kdenetwork-3.5.5-r2.ebuild 2484
 RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9db8352b kdenetwork-3.5.5-r2.ebuild 2484
 SHA256 e1e7791d11313ef1777cc16f54d10a2c549de59ea2c7d3d5be552753f04141d5 kdenetwork-3.5.5-r2.ebuild 2484
-EBUILD kdenetwork-3.5.6-r1.ebuild 2551 RMD160 4f9fbc5bf9aec30bac1ba443de92cc3051fa2990 SHA1 f6ab65fda1062e74ab5ae309f0bff815a90de8e1 SHA256 b02670e4b4b7cc49b591039d1b623dc7e7a84a046afeb7a63c520c6154835690
-MD5 ec6ab0d6fa12c485f48e806b102e4a16 kdenetwork-3.5.6-r1.ebuild 2551
-RMD160 4f9fbc5bf9aec30bac1ba443de92cc3051fa2990 kdenetwork-3.5.6-r1.ebuild 2551
-SHA256 b02670e4b4b7cc49b591039d1b623dc7e7a84a046afeb7a63c520c6154835690 kdenetwork-3.5.6-r1.ebuild 2551
+EBUILD kdenetwork-3.5.6-r1.ebuild 2670 RMD160 b39ba40c4a8348175754782fc05b3678b7c50762 SHA1 912610a54c7b007347afd246a496da4f63c0ab1c SHA256 b8077a2a6ea5335e90373f13edb1e5d9a2558b1e3a87ef881496534f710c34c0
+MD5 c5d143794ee4be5ba072e8f54a07c78f kdenetwork-3.5.6-r1.ebuild 2670
+RMD160 b39ba40c4a8348175754782fc05b3678b7c50762 kdenetwork-3.5.6-r1.ebuild 2670
+SHA256 b8077a2a6ea5335e90373f13edb1e5d9a2558b1e3a87ef881496534f710c34c0 kdenetwork-3.5.6-r1.ebuild 2670
 EBUILD kdenetwork-3.5.6.ebuild 2403 RMD160 66f4707fc196c4b579e76f12c655c08554820a85 SHA1 b9facd56a7afe07a113ff904aaccdc4bbc0c5034 SHA256 4af58438c4935c35af954a8b4e1f76da745773ab1b74d12666077df6dc5ebe81
 MD5 66e02efe2f1f903568deb40df4779c73 kdenetwork-3.5.6.ebuild 2403
 RMD160 66f4707fc196c4b579e76f12c655c08554820a85 kdenetwork-3.5.6.ebuild 2403
 SHA256 4af58438c4935c35af954a8b4e1f76da745773ab1b74d12666077df6dc5ebe81 kdenetwork-3.5.6.ebuild 2403
-MISC ChangeLog 35448 RMD160 310c07e9ca8d5164a7b3838bf3526d267ee5a34c SHA1 475ce4e0a1682ad458ba5447712d1691e292e8e0 SHA256 119004e03f25b512461cbbeb88563e1bbea65e08a990831575a0a622bfad7d3e
-MD5 14f9df3f470ae3c29ea5594788c05149 ChangeLog 35448
-RMD160 310c07e9ca8d5164a7b3838bf3526d267ee5a34c ChangeLog 35448
-SHA256 119004e03f25b512461cbbeb88563e1bbea65e08a990831575a0a622bfad7d3e ChangeLog 35448
+MISC ChangeLog 35794 RMD160 1f44ffb2b2d8451c29aa7e56323dfa108b858a59 SHA1 ba20312a2819fffe94396c36ff9fb668376db346 SHA256 3b1f0f2749756f4146058e2936b7059745224af785409d1f002dc1600e3c98f8
+MD5 20090df58748ad0c2081437f099c90a2 ChangeLog 35794
+RMD160 1f44ffb2b2d8451c29aa7e56323dfa108b858a59 ChangeLog 35794
+SHA256 3b1f0f2749756f4146058e2936b7059745224af785409d1f002dc1600e3c98f8 ChangeLog 35794
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -45,3 +52,10 @@ SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/di
 MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kdenetwork-3.5.6-r1 533
 RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kdenetwork-3.5.6-r1 533
 SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kdenetwork-3.5.6-r1 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGP07mCkvF58q80IkRAoESAKCjWLW4BbUVOZul91FNYG7/FaLZwACbB7Ty
+otg083ZAMRrHkLoj9KAnrZY=
+=59XC
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/kopete-3.5.6-cryptobug.patch b/kde-base/kdenetwork/files/kopete-3.5.6-cryptobug.patch
new file mode 100644
index 000000000000..331e567ce44e
--- /dev/null
+++ b/kde-base/kdenetwork/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/kdenetwork/kdenetwork-3.5.6-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild
index 5b05cc8f70f3..cf9e21ac103e 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild,v 1.3 2007/05/05 05:16:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild,v 1.4 2007/05/07 16:07:55 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
 DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt jingle kdehiddenvisibility rdesktop sametime slp ssl wifi"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="jingle kdehiddenvisibility rdesktop sametime slp ssl wifi"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
@@ -36,8 +36,7 @@ RDEPEND="${BOTH_DEPEND}
 	dev-lang/perl
 	ssl? ( dev-perl/IO-Socket-SSL
 		app-crypt/qca-tls )
-	net-dialup/ppp
-	crypt? ( app-crypt/gnupg )"
+	net-dialup/ppp"
 
 DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( virtual/os-headers )
@@ -46,10 +45,9 @@ DEPEND="${BOTH_DEPEND}
 	kernel_linux? ( x11-libs/libXv )
 	x11-proto/scrnsaverproto"
 
-PDEPEND="crypt? ( net-im/kopete-otr )"
-
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
-	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+	${FILESDIR}/kopete-3.5.6-cryptobug.patch"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
@@ -88,3 +86,9 @@ src_install() {
 	newconfd "${WORKDIR}/patches/lisa.conf" lisa
 	newconfd "${WORKDIR}/patches/reslisa.conf" reslisa
 }
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	elog "If you would like to use Off-The-Record encryption with Kopete, emerge net-im/kopete-otr."
+}