fix USE flag dependancies on curl since it moved from ssl to openssl

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

4 files changed, 24 insertions, 8 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 0708748f2544..1dd79d0d398b 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.37 2009/08/10 20:07:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.38 2009/11/07 22:55:23 dragonheart Exp $
+
+  07 Nov 2009; Daniel Black <dragonheart@gentoo.org>
+  centerim-4.22.7-r1.ebuild, centerim-4.22.8.ebuild:
+  fix USE flag dependancies on curl since it moved from ssl to openssl
 
 *centerim-4.22.8 (10 Aug 2009)
 
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index 821bd9cf5394..b2c38fa5fb15 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,7 +1,7 @@
 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 2457 RMD160 6e2725798a273dedaa20a9e8b9132a55038719d5 SHA1 355f55dd45741a8015381adc0d9ee336d6ee1f1f SHA256 48226948f41610d60189dc7283ad8bb9d2036b5c09d4abc1c81f7954de53a979
-EBUILD centerim-4.22.8.ebuild 2383 RMD160 69a3806da8faaf264389a7afabbabbf1738e34bc SHA1 28ea726448e79775427684d9b875962c462182be SHA256 dada13fcffbef028be449d3fb4b2f73ac765c72e2c3786ae903326e407996a67
-MISC ChangeLog 6143 RMD160 9caacb859b6857051b770d4c94235dc32e51a2b8 SHA1 9fe73153cdca7915a8a9145ce996c6f367f23f8d SHA256 d10e0846ec52cfaa90cc6f47c343dcb1a92b893baa41510b0e8567cf3a802485
+EBUILD centerim-4.22.7-r1.ebuild 2745 RMD160 68f14f36769028d87e3e1185dd66fcf7bdad3068 SHA1 4235b464e8309b9f71038312c30c8620a1fc8321 SHA256 97c40ea54f2eaa7ccdf26aa61ebcb5cb7fe3384f441feebb99c7c73ece6e06a2
+EBUILD centerim-4.22.8.ebuild 2671 RMD160 9fd8de6c97222bd76c1fe46441201e3c305cfa46 SHA1 84cd8769014f4a42175a553a1e147f827eb8d101 SHA256 10e249f141be1c83a9bf35afdc763d94e9bc8d9578f0129cef9a8445a96c525b
+MISC ChangeLog 6324 RMD160 817fbd1364c5ffa97ce8afbc04963c7e9c7e709b SHA1 8c3b1a130cbc47e9368149d761d0fbc6569577c9 SHA256 7571f85e29ad11684f089a7306af46fde526cdcba2782fad8bf41cca3ea40ae8
 MISC metadata.xml 541 RMD160 27854f0c9356b45252baec904025bb06782f084e SHA1 591145cbbb6c177e36e498af16342dee1841157b SHA256 e7c1b47a4545dcb4d9502e3fd77da7f6d83d559e43da84e3428c5d298ee773f6
diff --git a/net-im/centerim/centerim-4.22.7-r1.ebuild b/net-im/centerim/centerim-4.22.7-r1.ebuild
index 729547b2bbeb..a65ce96859f1 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.4 2009/05/02 21:03:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.5 2009/11/07 22:55:23 dragonheart Exp $
 
 EAPI="2"
 
@@ -30,9 +30,15 @@ DEPEND=">=sys-libs/ncurses-5.2
 		crypt? ( >=app-crypt/gpgme-1.0.2 )
 	)
 	msn? (
-		net-misc/curl[ssl]
+		|| ( net-misc/curl[ssl] net-misc/curl[openssl] )
 		dev-libs/openssl
 	)"
+# 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 259f077dbb14..31b9386c7a55 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.1 2009/08/10 20:07:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.2 2009/11/07 22:55:23 dragonheart Exp $
 
 EAPI="2"
 
@@ -28,9 +28,15 @@ DEPEND=">=sys-libs/ncurses-5.2
 		crypt? ( >=app-crypt/gpgme-1.0.2 )
 	)
 	msn? (
-		net-misc/curl[ssl]
+		|| ( net-misc/curl[ssl] net-misc/curl[openssl] )
 		dev-libs/openssl
 	)"
+# 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 )"