Remove IUSE=gnutls as USE=ssl only has one provider, as pointed out by mgorny

Package-Manager: portage-2.1.10.41/cvs/Linux i686

3 files changed, 14 insertions, 16 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index e5fed604b078..a0bca0bedd92 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.192 2012/01/14 19:55:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.193 2012/01/14 21:34:49 fauli Exp $
+
+  14 Jan 2012; Christian Faulhammer <fauli@gentoo.org> claws-mail-3.8.0.ebuild:
+  Remove IUSE=gnutls as USE=ssl only has one provider, as pointed out by mgorny
 
   14 Jan 2012; Michał Górny <mgorny@gentoo.org> claws-mail-3.8.0.ebuild:
   Use autotools-utils -- suport user patches with autoreconf.
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 94c177dc5b19..e864c6163703 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX claws-mail-3.7.9-fix-nossl.patch 567 RMD160 84ad338601fbe4b0bce698175418c49dadfb8cbb SHA1 915b4e4b2359691837a8c2aedc33de97311f5f5b SHA256 f9ccd9b29b0e2e670d5040369be636b811dad711b8ca3bc91ff4f1d048f89438
 AUX claws-mail-3.7.9_notify_crash.patch 483 RMD160 9acf659c5b19899d9333625702ce19ddc60a21a2 SHA1 6d71de691cab1b39c7548c012acb2729dab5183f SHA256 bae47d4990a9bf00066b367f33384ecddc290b8fb6cf622c3bbbb065647ddc56
@@ -8,15 +8,13 @@ DIST claws-mail-3.7.9.tar.bz2 7086757 RMD160 9310a1aa430f9d26947ea8cd25f3a8ef63e
 DIST claws-mail-3.8.0.tar.bz2 7190415 RMD160 583e2966efda7a2fd6211eac43001b57c3d0efce SHA1 de6010392074633194e2aa5898e66d73c35bda5a SHA256 ec945e3b0f3df6f1f13fcf149ad3ee5306c0e6575bb375cf558e9028a0eb6231
 EBUILD claws-mail-3.7.10.ebuild 4035 RMD160 2626b183c08dad9ac8ce7fe4a92ca47a09ad6eb5 SHA1 e7415bfb37ffec3a9a1b8de45dadb213f149b753 SHA256 7c76726d7d75bca42212f5a6197861076edd9965b6762cec55d56b31798d5dcb
 EBUILD claws-mail-3.7.9-r1.ebuild 4145 RMD160 cb590e1fb92dddb45fe9dae51a75abbf5505b843 SHA1 587a6ae5cb41806b687e6e8667357efa8d71b522 SHA256 bca3e75b05ef7e33a4f29fc03dd1b3fc694b69f72cf0cfa876e6a3d41f2acb73
-EBUILD claws-mail-3.8.0.ebuild 3948 RMD160 1eed580aadb079fe1e1165a246213c6b40bbfb85 SHA1 ea2a3adb8804d7e82e66a57a12696150dbbdcc77 SHA256 8ca6ca72dcb18217320ca45741c25058bc26544b490d3ca14378e8f9032b3efd
-MISC ChangeLog 41175 RMD160 454a4702fecaaa2879c10663539fdbe34059325e SHA1 2f41113e3b0d0da203e9a290ea8d900375a21908 SHA256 b2280f7766f15c0b57ab2890a1b87cef179a6c94ea99fa1c1fbd0908a7d37a2f
+EBUILD claws-mail-3.8.0.ebuild 3765 RMD160 2244adba3d5381fe3f295dee5f7eb76713b21e4c SHA1 3fc156f869a2c73a3fee91346a1f08c2f6f7a6bf SHA256 2c2dd0b0ad668c3eb08ace5741ce0bb2a2cdcc37787e3abb956d0cc4e1b2ddbe
+MISC ChangeLog 41335 RMD160 015870eb68be685531b38de450d6d726a46cae67 SHA1 193063576264267463786016dbbfffc3f8d5e773 SHA256 9aa1b6bf4ad447627d3092846a24d37fb4e0565397be85737ddd6573e71563fc
 MISC metadata.xml 875 RMD160 2e7246f025433a4116aa96c7ce779bedfbc3fc52 SHA1 f5fdcbbae2591bd599c1769566fb8b3031787b4e SHA256 6702b8eb1b7b299682083cfee3b986aa6855534bd5ecf0b98eb09a1e55d0243a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk8R3gQACgkQfXuS5UK5QB0HNQP/Z3dPL24uiRVisvP31Mn2cy6v
-rpbHs73blCYjy4N1Xuv6L8e6GFCHSB+SeTSMmhPv+//06TEqXx2umZoIEbpOuy6o
-APK+LCgOU5CWNYVcAuHwAKUqoyvbWM4peMPvUt3QWr9oj5wEZE4k2ENkknS/O/W9
-BoRvarfgG63c/YxrnYw=
-=TMLT
+iEYEARECAAYFAk8R9TQACgkQNQqtfCuFneOmAgCfVl8CK0VNBpZ1QVoghZVbJjUE
+F0sAoIOLY+X5eOSzGC7LHz827hoiqf5Z
+=L7Z/
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.8.0.ebuild b/mail-client/claws-mail/claws-mail-3.8.0.ebuild
index 08dc277d75c5..774077ba9d24 100644
--- a/mail-client/claws-mail/claws-mail-3.8.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.0.ebuild,v 1.2 2012/01/14 19:55:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.8.0.ebuild,v 1.3 2012/01/14 21:34:49 fauli Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bogofilter crypt dbus dillo doc +gnutls +imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
+IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.20:2
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -26,7 +26,6 @@ COMMONDEPEND=">=x11-libs/gtk+-2.20:2
 	spell? ( >=app-text/enchant-1.0.0 )
 	imap? ( >=net-libs/libetpan-0.57 )
 	nntp? ( >=net-libs/libetpan-0.57 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
 	startup-notification? ( x11-libs/startup-notification )
 	bogofilter? ( mail-filter/bogofilter )
 	session? ( x11-libs/libSM
@@ -72,9 +71,7 @@ src_configure() {
 		myeconfargs+=( --disable-libetpan )
 	fi
 
-	# The usage of openssl was discarded once and USE=ssl is mapped to
-	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
-	if use ssl || use gnutls; then
+	if use ssl; then
 		myeconfargs+=( --enable-gnutls )
 	else
 		myeconfargs+=( --disable-gnutls )