Switch useflags controlling https support back to ssl and gnutls,

  rather than openssl and gnutls since ssl flag is enabled in standard
  profiles (thanks to Ravi Pinjala for suggestion, bug #275857)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 36 insertions, 20 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 8837f35be7b2..4ecd07076a3e 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.90 2009/08/13 06:40:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.91 2009/08/23 06:49:56 wormo Exp $
+
+  23 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  lynx-2.8.7_p1.ebuild:
+  Switch useflags controlling https support back to ssl and gnutls,
+  rather than openssl and gnutls since ssl flag is enabled in standard
+  profiles (thanks to Ravi Pinjala for suggestion, bug #275857)
 
   13 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
   +files/lynx-2.8.7-configure-openssl.patch, -lynx-2.8.7_rc6.ebuild,
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 4f17003e5b5c..09131a47a6f2 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -4,6 +4,6 @@ DIST lynx2.8.6rel.4.tar.bz2 2291156 RMD160 47e48e4136df298bf5168bc8d2d49e1ac92a6
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 EBUILD lynx-2.8.6-r2.ebuild 2151 RMD160 19de76e04bede84a94aabc841430e13d7cee1c3b SHA1 2d4f595bf6e493406b824e52038d9e7baacdec15 SHA256 ceebc1f28c4d2a1057a2deca3819aae89db0aeb1bc7f61bd121eacf82b58d844
 EBUILD lynx-2.8.6-r4.ebuild 2241 RMD160 a7d0b18ecb42e5e9f8fd2b5f114e66d9a88c7ed8 SHA1 a3e1adfef7976492cd3aeceee6d46e2388d2e84d SHA256 b5e260b022a41c8932a736db3fcf82b6df44504dfd40455c907ee146eb070a88
-EBUILD lynx-2.8.7_p1.ebuild 2959 RMD160 fe2fa0ae44c1999c2a954ea8ea07451950eeae12 SHA1 56a9e0282316191b647adb90c6ae1ec3fb111a10 SHA256 70f4ab923649f07eedb0b16d49ca0c78594b3ad43c0534aace76ba64503a41c1
-MISC ChangeLog 17550 RMD160 1b1e60762656b79dee4301923431f77ebff6eead SHA1 be79e753a40f31c5e492b761292f4b6b0423d5b2 SHA256 9a9200ed4ca420e8579d90e6645e3dc600d1badb53a437f91c507d909b8213a8
+EBUILD lynx-2.8.7_p1.ebuild 3144 RMD160 d6c8460e65e85a0df44573b0f0f815aae4102cfb SHA1 fbde6f5e77516de9e9f6f2f2325ab8a1927a9a1b SHA256 5ef24c63be59396782b7abbb4e6374999fa39f52dee4203c509a406ddd0faff8
+MISC ChangeLog 17838 RMD160 0ef7a525df79b59cdf711cfc037262c86127a900 SHA1 6288208607fb8b0ccb99a39fbc73e58bb3fe64cf SHA256 461189d62d37c766d2c35fc1924d93b248330f9330683be8f8ab7b5f9a5b20e0
 MISC metadata.xml 374 RMD160 46a17de18db8e11219b1bde3c79a74acf3a0a1c5 SHA1 d894914c367f1016a89452db243c2d32b405e1be SHA256 a3915729fd0d23d62528624f976591e116229dbd2487768d4d23b976716d585f
diff --git a/www-client/lynx/lynx-2.8.7_p1.ebuild b/www-client/lynx/lynx-2.8.7_p1.ebuild
index cb75610fbb50..ad0d93087fee 100644
--- a/www-client/lynx/lynx-2.8.7_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.7_p1.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/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.2 2009/08/13 06:40:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.3 2009/08/23 06:49:56 wormo Exp $
 
 EAPI=2
 
@@ -33,13 +33,13 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 cjk gnutls ipv6 nls openssl unicode"
+IUSE="bzip2 cjk gnutls ipv6 nls ssl unicode"
 
 RDEPEND="sys-libs/ncurses[unicode?]
 	sys-libs/zlib
 	nls? ( virtual/libintl )
-	openssl? ( >=dev-libs/openssl-0.9.8 )
-	!openssl? (
+	ssl? ( 
+		!gnutls? ( >=dev-libs/openssl-0.9.8 )
 		gnutls? ( >=net-libs/gnutls-2.6.4 )
 	)
 	bzip2? ( app-arch/bzip2 )"
@@ -51,17 +51,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))"
 
 pkg_setup() {
-	if use openssl
+	if ! use ssl
 	then
-		if use gnutls
-		then
-			elog "Both openssl and gnutls use-flags specified. Openssl will be used."
-		fi
-	else
-		if ! use gnutls
-		then
-			elog "No SSL library selected, you will not be able to access secure websites."
-		fi
+		elog "SSL support disabled; you will not be able to access secure websites."
 	fi
 }
 
@@ -78,6 +70,26 @@ src_prepare() {
 }
 
 src_configure() {
+	local myargs
+
+	if use ssl 
+	then
+		# --with-gnutls and --with-ssl are alternatives,
+		# the latter enabling openssl support so it should be
+		# _not_ be used if gnutls ssl implementation is desired
+		if use gnutls
+		then
+			myargs="$myargs --with-gnutls" # ssl implementation = gnutls
+		else
+			myargs="$myargs --with-ssl"    # ssl implementation = openssl
+		fi
+	fi
+
+	if use unicode
+	then
+		myargs="$myargs --with-screen=ncursesw"
+	fi
+
 	econf \
 		--enable-cgi-links \
 		--enable-persistent-cookies \
@@ -93,10 +105,8 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable cjk) \
 		$(use_enable unicode japanese-utf8) \
-		$(use_with openssl ssl) \
-		$(use_with gnutls) \
 		$(use_with bzip2 bzlib) \
-		$(use unicode && printf '%s' '--with-screen=ncursesw')
+		$myargs
 }
 
 src_install() {