Also force curl dependency for yahoo protocol support, bug #292540.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 27 insertions, 18 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 00637acb0b44..ee59971c56e4 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/centerim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.39 2009/11/14 10:19:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.40 2009/11/14 10:28:14 swegener Exp $
+
+  14 Nov 2009; Sven Wegener <swegener@gentoo.org> centerim-4.22.7-r1.ebuild,
+  centerim-4.22.8.ebuild:
+  Also force curl dependency for yahoo protocol support, bug #292540.
 
   14 Nov 2009; Sven Wegener <swegener@gentoo.org> centerim-4.22.8.ebuild:
   Fix net-misc/curl dependency to also match on the gnutls and nss USE
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index 4e1938c25470..bb6423102ae3 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX centerim-4.22.7-libgadu-CVE-2008-4776.patch 555 RMD160 7e9c908827544aef065f0091b0eb94d44d89f4a6 SHA1 28ab98f6561f8f8773f90c664d15a3a55b02dc6e SHA256 d13bd5f672e24036cd9ce1884da96fe11f27a439cfd9ca27ec2d6ce7ba3d41fc
 DIST centerim-4.22.7.tar.bz2 1794779 RMD160 83c579db34fe6e7c5d539cf78102a2de6b89f47a SHA1 c0b3433ed260fca23f8e10999c1cf91895489b35 SHA256 59356d55d7fb293809d8d26fdef6bcb07bf3dd1452e11e3798ac3550cba5efcd
 DIST centerim-4.22.8.tar.gz 2259911 RMD160 10a3f50e87f792d09f8f570034eeeae7a800a2ff SHA1 3fce70fe1b9fe14a30b57ffb03d2640d95d61f95 SHA256 c585ffc6ee73e0fb47723654fcffe021caf6153e22e78b49c90b497218ac5dcd
-EBUILD centerim-4.22.7-r1.ebuild 2762 RMD160 c4b27e4d60bbfa23982a589b851ff77876ac646e SHA1 2673eccf3d8b58b463cb11e77aaf7aaa5818a50b SHA256 756a4fbcb873b07c40781166da9048aad39e159ddbcf058f41d7a632c87d6444
-EBUILD centerim-4.22.8.ebuild 2503 RMD160 d0455946c3be2b699a6c20432ae01daa77c0e20b SHA1 b3baa5bef33471cc5491128f9cd443d73868bdef SHA256 7819e7284d90853f3e268a4027a4789da97948dde0d418132e4aca4fb274c80f
-MISC ChangeLog 6538 RMD160 6d4c9516ed03b9096c62df94c46cbfb5ed17cbd7 SHA1 cc7c229b9a848b2c70aee5d043cc94ad0cf99aef SHA256 a5ee6046d3d7ed70241a4e798738db65b610e2c78b0f1f09cb1ae7d6bf0d3233
+EBUILD centerim-4.22.7-r1.ebuild 2558 RMD160 926e27e3676a079e995616554a5f5663f99a5d52 SHA1 96a5336bc5ea0980e0b30733d31d035ed303716a SHA256 b4eeaac2a6e768665a0dd2656081ee58744003322ff7f24caa2baac57f671437
+EBUILD centerim-4.22.8.ebuild 2638 RMD160 66bc1c3efc22e098324bfa6fc73c6217716ca500 SHA1 af7c67811dde2d2cbbe183f37b6021b43d298aa1 SHA256 d5574f5354cefc5548e6657719c12810d3fca42643aba5bb3cf9c9e8a81e64bb
+MISC ChangeLog 6712 RMD160 ea2891965d57ef6283192f1171c5991cb9b90a69 SHA1 115a42d3689354bc9777a38686ff0d02a30c6e4c SHA256 d14415568eff239a98f9694fe017f466f23f1ffc069e283d2455dfdf3e58203a
 MISC metadata.xml 541 RMD160 27854f0c9356b45252baec904025bb06782f084e SHA1 591145cbbb6c177e36e498af16342dee1841157b SHA256 e7c1b47a4545dcb4d9502e3fd77da7f6d83d559e43da84e3428c5d298ee773f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr+hC8ACgkQI1lqEGTUzyRRuQCgxM4gmn3UUcDqC2v5glDfgd3N
-/v4AnjitCSNFI2sdkO1EwSwgR61Y0KcW
-=ssSd
+iEYEARECAAYFAkr+hkYACgkQI1lqEGTUzySurgCfT5LCMEeKeSU8mxJfhQa0/uH/
+sBgAoJwu4aDwi0Vg4nuAfAhh083QFDqP
+=//IN
 -----END PGP SIGNATURE-----
diff --git a/net-im/centerim/centerim-4.22.7-r1.ebuild b/net-im/centerim/centerim-4.22.7-r1.ebuild
index 1018ba633b58..14b22a5c0869 100644
--- a/net-im/centerim/centerim-4.22.7-r1.ebuild
+++ b/net-im/centerim/centerim-4.22.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.6 2009/11/07 23:07:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.7 2009/11/14 10:28:15 swegener Exp $
 
 EAPI="2"
 
@@ -30,15 +30,13 @@ DEPEND=">=sys-libs/ncurses-5.2
 		crypt? ( >=app-crypt/gpgme-1.0.2 )
 	)
 	msn? (
-		|| ( <net-misc/curl-7.19.7[ssl] >=net-misc/curl-7.19.7[openssl] )
-		dev-libs/openssl
+		|| (
+			<net-misc/curl-7.19.7[ssl]
+			>=net-misc/curl-7.19.7[openssl]
+			>=net-misc/curl-7.19.7[gnutls]
+			>=net-misc/curl-7.19.7[nss]
+		)
 	)"
-# dual curl dependancies added by dragonheart 20091108
-# as I transition between USE flags
-# I also note that curl hides its crypt so maybe this should be:
-# || ( net-misc/curl[ssl]
-#		net-misc/curl[openssl] net-misc/curl[nss]
-# 		net-misc/curl[gnutls] )
 
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
diff --git a/net-im/centerim/centerim-4.22.8.ebuild b/net-im/centerim/centerim-4.22.8.ebuild
index 5ff6e939005e..d676b223f61b 100644
--- a/net-im/centerim/centerim-4.22.8.ebuild
+++ b/net-im/centerim/centerim-4.22.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.4 2009/11/14 10:19:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.5 2009/11/14 10:28:15 swegener Exp $
 
 EAPI="2"
 
@@ -34,7 +34,14 @@ DEPEND=">=sys-libs/ncurses-5.2
 			>=net-misc/curl-7.19.7[gnutls]
 			>=net-misc/curl-7.19.7[nss]
 		)
-		dev-libs/openssl
+	)
+	yahoo? (
+		|| (
+			<net-misc/curl-7.19.7[ssl]
+			>=net-misc/curl-7.19.7[openssl]
+			>=net-misc/curl-7.19.7[gnutls]
+			>=net-misc/curl-7.19.7[nss]
+		)
 	)"
 
 RDEPEND="${DEPEND}