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)
(Portage version: 2.1.6.13/cvs/Linux x86_64)

2 files changed, 34 insertions, 18 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/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() {