make USE=ssl or USE=gnutls exclusive so they don't block each other; make a local description of USE=ssl

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 i686

4 files changed, 22 insertions, 13 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index f12183c99a11..3118fc34d84d 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.107 2009/01/04 13:34:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.108 2009/01/13 08:41:29 fauli Exp $
+
+  13 Jan 2009; Christian Faulhammer <fauli@gentoo.org> metadata.xml,
+  claws-mail-3.7.0.ebuild:
+  make USE=ssl or USE=gnutls exclusive so they don't block each other; make
+  a local description of USE=ssl
 
   04 Jan 2009; Christian Faulhammer <fauli@gentoo.org>
   claws-mail-3.7.0.ebuild:
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index caa7884a8818..e694c336dba6 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -5,13 +5,13 @@ AUX plugins-rebuild.sh 1367 RMD160 af49058972a932a5e8dddbe30e24ead56f14ce97 SHA1
 DIST claws-mail-3.6.1.tar.bz2 5387916 RMD160 a36a92bbe9fe203f770bfea80ebe06362e59c666 SHA1 5894b6e533a151ce8e4be6445e117cd40a0f63b9 SHA256 67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907
 DIST claws-mail-3.7.0.tar.bz2 5346500 RMD160 ac02b5d9eb9faab2e3bb02c48a45a2bd44b8d591 SHA1 f0627f50c6a60467a7c9ebc9b543d1c4c234f5e8 SHA256 24541d14872d8bc960740fbf0c3f6a5f08ce529cedc57c553affe00b8b5b419e
 EBUILD claws-mail-3.6.1.ebuild 5426 RMD160 e2dff833a658cf502696927b9cf45c47b6d833b0 SHA1 9571d409d875debdb526d7fbb7f7d0e61da16e41 SHA256 b395cccdb1204e9fbf439392244a820df6baf62aed5af7b854268169cb7c057a
-EBUILD claws-mail-3.7.0.ebuild 5243 RMD160 4c4b78fc32577810b465ea3667f35ad5492ca5de SHA1 c14756044341bb21a43194035349e83a651e8158 SHA256 2be6b61862ef1190035095c0731cf0edcd8d404c08b9d813cb38bd40b3b46cf4
-MISC ChangeLog 20481 RMD160 d8a171734acb96fc3a77613a22b6c8dadec8d9c1 SHA1 f14fceaae72af68de731dbb7da8ab2f6184d7d63 SHA256 6da0dc52a062e57fb9b5e4a62edc25400e542243f742c831b8d9933692338ce9
-MISC metadata.xml 759 RMD160 3a78e7fbc273121e5a4f4f405eb8d9923ace5c27 SHA1 1aeba0d19dd997c20743eb7789add36ce56ca2be SHA256 facd3c56df8f9b5b6095e154f5cb8009ac82c4404f196d664d014da865e00c31
+EBUILD claws-mail-3.7.0.ebuild 5447 RMD160 8c573e38d23168c1d4ba052475104576d8cd24f1 SHA1 2243afc3804442b3b6a39a89a26821f0b5a56cc2 SHA256 f314f8042daaf79d34a25a307fdb34ebb485f059e957c57536fc315bc9eff46e
+MISC ChangeLog 20687 RMD160 5913edb6ff50c73e9c2052be5f7f41409696adfa SHA1 40cacec3ed8d0a3b3093fecffc293780c4a5ea52 SHA256 e9b07a47ed119723a141abbe84cfe57b83f2a0789487748f0ad121d8bd3cd03f
+MISC metadata.xml 875 RMD160 2e7246f025433a4116aa96c7ce779bedfbc3fc52 SHA1 f5fdcbbae2591bd599c1769566fb8b3031787b4e SHA256 6702b8eb1b7b299682083cfee3b986aa6855534bd5ecf0b98eb09a1e55d0243a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklguvwACgkQNQqtfCuFneMgeACfSC64BcgBBLuSc1tBcfN2WY/K
-e6gAniEN979dn4oCzhwukD8YeLTnMV3s
-=kRR4
+iEYEARECAAYFAklsU9IACgkQNQqtfCuFnePnPwCcDExoee3Q7S10IuneZDCMlebD
+Y9gAn35MmCl/zokEHNExVUDqSkqkp0l/
+=KZtF
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.7.0.ebuild b/mail-client/claws-mail/claws-mail-3.7.0.ebuild
index 9ba051e5a121..6cc048af8707 100644
--- a/mail-client/claws-mail/claws-mail-3.7.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.7.0.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/mail-client/claws-mail/claws-mail-3.7.0.ebuild,v 1.2 2009/01/04 13:34:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.7.0.ebuild,v 1.3 2009/01/13 08:41:29 fauli Exp $
 
 inherit eutils multilib
 
@@ -45,11 +45,15 @@ RDEPEND="${COMMONDEPEND}
 PLUGIN_NAMES="acpi-notifier archive att-remover attachwarner cachesaver fetchinfo gtkhtml mailmbox newmail notification perl rssyl spam_report tnef_parse vcalendar"
 
 src_compile() {
-	local myconf="--disable-libetpan"
+	local myconf="--disable-libetpan --disable-gnutls"
 
 	# libetpan is needed if user wants nntp or imap functionality
-	use imap && myconf="--enable-libetpan"
-	use nntp && myconf="--enable-libetpan"
+	use imap && myconf="${myconf} --enable-libetpan"
+	use nntp && myconf="${myconf} --enable-libetpan"
+	# The usage of openssl was discarded once and USE=ssl is mapped to
+	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
+	use ssl && myconf="${myconf} --enable-gnutls"
+	use gnutls && myconf="${myconf} --enable-gnutls"
 
 	econf \
 		$(use_enable gnome gnomeprint) \
@@ -58,8 +62,6 @@ src_compile() {
 		$(use_enable dbus) \
 		$(use_enable pda jpilot) \
 		$(use_enable spell enchant) \
-		$(use_enable gnutls) \
-		$(use_enable ssl gnutls) \
 		$(use_enable xface compface) \
 		$(use_enable doc manual) \
 		$(use_enable startup-notification) \
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 7a72d75e5bb5..ae579931df08 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -16,6 +16,8 @@
 		<flag name='dillo'>Enables support for inline HTTP email viewing with a
 			plugin (which depends on the <pkg>www-client/dillo</pkg> 
 			browser)</flag>
+		<flag name='ssl'>Use gnutls for Secure Socket Layer
+		transactions (deprecated, USE=gnutls should be used)</flag>
 		<flag name='smime'>Build plugin for S/MIME support</flag>
 		<flag name='spamassassin'>Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>