Made kopete depend on qca-1.0* and qca-tls-1.0*. Fixes bug 180599.

Package-Manager: portage-2.1.4

3 files changed, 17 insertions, 24 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 3e4a13e6344d..f18384911e1a 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # 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.126 2007/10/20 23:34:11 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.127 2008/01/13 17:49:47 philantrop Exp $
+
+  13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> kopete-3.5.8.ebuild:
+  Made kopete depend on qca-1.0* and qca-tls-1.0*. Fixes bug 180599.
 
   20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> kopete-3.5.8.ebuild:
   Restricted the tests which are broken by upstream and won't be fixed.
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index fb6704bed41f..da6f079e30cb 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
 MD5 9e1eafd475bca7ccb4c199e2fbdca02a files/gnomemeeting-ekiga.patch 2073
 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 files/gnomemeeting-ekiga.patch 2073
@@ -66,14 +63,14 @@ EBUILD kopete-3.5.7.ebuild 4024 RMD160 0a01278cf5b187660530d63e405572d94113a878
 MD5 fcac3078e055034667342792ba509966 kopete-3.5.7.ebuild 4024
 RMD160 0a01278cf5b187660530d63e405572d94113a878 kopete-3.5.7.ebuild 4024
 SHA256 40db88fa7e6aa35b42aa581fc16c451e26319cf4864f019ee6d6fe3d861e6515 kopete-3.5.7.ebuild 4024
-EBUILD kopete-3.5.8.ebuild 4105 RMD160 ee105d868a9c526c9a984ee367dcf0b9169a969c SHA1 7f4da238662c76036158bf250cf4cccb1e30e83d SHA256 5f196ac4053c3d9b6c6ca5e0f4016a6fb975e4e86be451e055bbdec095bbb551
-MD5 919f032e335d1f55010f071e850d76b7 kopete-3.5.8.ebuild 4105
-RMD160 ee105d868a9c526c9a984ee367dcf0b9169a969c kopete-3.5.8.ebuild 4105
-SHA256 5f196ac4053c3d9b6c6ca5e0f4016a6fb975e4e86be451e055bbdec095bbb551 kopete-3.5.8.ebuild 4105
-MISC ChangeLog 18536 RMD160 a89678d539490db2f940f2d5e432e6c0cb7ce7dd SHA1 1112009c8bffd7a712764519cf5ce89a8bc97833 SHA256 f5295d0e506d2d60c8a384f43e3740b2b1a44742e919c1526bea0ed116a0621e
-MD5 58befc2af19baad0d176487ae00e1445 ChangeLog 18536
-RMD160 a89678d539490db2f940f2d5e432e6c0cb7ce7dd ChangeLog 18536
-SHA256 f5295d0e506d2d60c8a384f43e3740b2b1a44742e919c1526bea0ed116a0621e ChangeLog 18536
+EBUILD kopete-3.5.8.ebuild 4117 RMD160 7f502c88fd4383a4c918ba616246845811da2308 SHA1 745dc1bea6094247bf2b5cf220adb8fc01026096 SHA256 b14cfd277ba2a0bb5f69cf8325e3d7a347f45c2295c2da117eac4501b6108cac
+MD5 104c0e4b765709cd1684004836f63fff kopete-3.5.8.ebuild 4117
+RMD160 7f502c88fd4383a4c918ba616246845811da2308 kopete-3.5.8.ebuild 4117
+SHA256 b14cfd277ba2a0bb5f69cf8325e3d7a347f45c2295c2da117eac4501b6108cac kopete-3.5.8.ebuild 4117
+MISC ChangeLog 18682 RMD160 e7f616137b5bff4455fb97278e0535c800ce69ad SHA1 d37cc4c3b17ca3fa0eb83aab11024c5e9b4a2f87 SHA256 13c17f6885d40d648e989ad6721d3703a747cecdfafc2b88d5d6a29c9bb63c23
+MD5 11f2e6e0ebbd4ee1a3b3331c3b8949b8 ChangeLog 18682
+RMD160 e7f616137b5bff4455fb97278e0535c800ce69ad ChangeLog 18682
+SHA256 13c17f6885d40d648e989ad6721d3703a747cecdfafc2b88d5d6a29c9bb63c23 ChangeLog 18682
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -99,10 +96,3 @@ SHA256 a8b6c61efc9d4e1936c662475233e93b2b58951ede88b2e620c2598b519455c0 files/di
 MD5 101672d0c94a3346c373399a9c34ccf6 files/digest-kopete-3.5.8 533
 RMD160 06e61c9c87d1bb9205813e0c0149f4e3e1f257d3 files/digest-kopete-3.5.8 533
 SHA256 fcaf8228013597b2455f5001e3439d5eafcc113fae10a52576151804caa17f43 files/digest-kopete-3.5.8 533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGpCICkvF58q80IkRAg+EAJ9oCrVtECBQe/6fk9g+CRYPe4aTfwCdF/EL
-EnHsQ8JpdKO45EgR2Qj3mzI=
-=1EIq
------END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-3.5.8.ebuild b/kde-base/kopete/kopete-3.5.8.ebuild
index c75a8d014111..ffd71ca8016a 100644
--- a/kde-base/kopete/kopete-3.5.8.ebuild
+++ b/kde-base/kopete/kopete-3.5.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.8.ebuild,v 1.2 2007/10/20 23:34:11 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.8.ebuild,v 1.3 2008/01/13 17:49:47 philantrop Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -28,7 +28,7 @@ BOTH_DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
 	net-dns/libidn
 	>=dev-libs/glib-2
-	app-crypt/qca
+	=app-crypt/qca-1.0*
 	sametime? ( =net-libs/meanwhile-1.0* )
 	jingle? (
 		>=media-libs/speex-1.1.6
@@ -42,7 +42,7 @@ BOTH_DEPEND="dev-libs/libxslt
 	sms? ( app-mobilephone/gsmlib )"
 
 RDEPEND="${BOTH_DEPEND}
-	ssl? ( app-crypt/qca-tls )
+	ssl? ( =app-crypt/qca-tls-1.0* )
 	latex? ( virtual/tetex
 		media-gfx/imagemagick )
 	crypt? ( app-crypt/gnupg )"