| 1 |
wormo 09/08/23 06:49:56 |
| 2 |
|
| 3 |
Modified: lynx-2.8.7_p1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Switch useflags controlling https support back to ssl and gnutls, |
| 6 |
rather than openssl and gnutls since ssl flag is enabled in standard |
| 7 |
profiles (thanks to Ravi Pinjala for suggestion, bug #275857) |
| 8 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 www-client/lynx/lynx-2.8.7_p1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: lynx-2.8.7_p1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- lynx-2.8.7_p1.ebuild 13 Aug 2009 06:40:44 -0000 1.2 |
| 24 |
+++ lynx-2.8.7_p1.ebuild 23 Aug 2009 06:49:56 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2009 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=2 |
| 32 |
|
| 33 |
@@ -33,13 +33,13 @@ |
| 34 |
LICENSE="GPL-2" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 37 |
-IUSE="bzip2 cjk gnutls ipv6 nls openssl unicode" |
| 38 |
+IUSE="bzip2 cjk gnutls ipv6 nls ssl unicode" |
| 39 |
|
| 40 |
RDEPEND="sys-libs/ncurses[unicode?] |
| 41 |
sys-libs/zlib |
| 42 |
nls? ( virtual/libintl ) |
| 43 |
- openssl? ( >=dev-libs/openssl-0.9.8 ) |
| 44 |
- !openssl? ( |
| 45 |
+ ssl? ( |
| 46 |
+ !gnutls? ( >=dev-libs/openssl-0.9.8 ) |
| 47 |
gnutls? ( >=net-libs/gnutls-2.6.4 ) |
| 48 |
) |
| 49 |
bzip2? ( app-arch/bzip2 )" |
| 50 |
@@ -51,17 +51,9 @@ |
| 51 |
S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))" |
| 52 |
|
| 53 |
pkg_setup() { |
| 54 |
- if use openssl |
| 55 |
+ if ! use ssl |
| 56 |
then |
| 57 |
- if use gnutls |
| 58 |
- then |
| 59 |
- elog "Both openssl and gnutls use-flags specified. Openssl will be used." |
| 60 |
- fi |
| 61 |
- else |
| 62 |
- if ! use gnutls |
| 63 |
- then |
| 64 |
- elog "No SSL library selected, you will not be able to access secure websites." |
| 65 |
- fi |
| 66 |
+ elog "SSL support disabled; you will not be able to access secure websites." |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
@@ -78,6 +70,26 @@ |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
+ local myargs |
| 75 |
+ |
| 76 |
+ if use ssl |
| 77 |
+ then |
| 78 |
+ # --with-gnutls and --with-ssl are alternatives, |
| 79 |
+ # the latter enabling openssl support so it should be |
| 80 |
+ # _not_ be used if gnutls ssl implementation is desired |
| 81 |
+ if use gnutls |
| 82 |
+ then |
| 83 |
+ myargs="$myargs --with-gnutls" # ssl implementation = gnutls |
| 84 |
+ else |
| 85 |
+ myargs="$myargs --with-ssl" # ssl implementation = openssl |
| 86 |
+ fi |
| 87 |
+ fi |
| 88 |
+ |
| 89 |
+ if use unicode |
| 90 |
+ then |
| 91 |
+ myargs="$myargs --with-screen=ncursesw" |
| 92 |
+ fi |
| 93 |
+ |
| 94 |
econf \ |
| 95 |
--enable-cgi-links \ |
| 96 |
--enable-persistent-cookies \ |
| 97 |
@@ -93,10 +105,8 @@ |
| 98 |
$(use_enable ipv6) \ |
| 99 |
$(use_enable cjk) \ |
| 100 |
$(use_enable unicode japanese-utf8) \ |
| 101 |
- $(use_with openssl ssl) \ |
| 102 |
- $(use_with gnutls) \ |
| 103 |
$(use_with bzip2 bzlib) \ |
| 104 |
- $(use unicode && printf '%s' '--with-screen=ncursesw') |
| 105 |
+ $myargs |
| 106 |
} |
| 107 |
|
| 108 |
src_install() { |
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.91 www-client/lynx/ChangeLog |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/ChangeLog?rev=1.91&view=markup |
| 115 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/ChangeLog?rev=1.91&content-type=text/plain |
| 116 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/lynx/ChangeLog?r1=1.90&r2=1.91 |
| 117 |
|
| 118 |
Index: ChangeLog |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v |
| 121 |
retrieving revision 1.90 |
| 122 |
retrieving revision 1.91 |
| 123 |
diff -u -r1.90 -r1.91 |
| 124 |
--- ChangeLog 13 Aug 2009 06:40:44 -0000 1.90 |
| 125 |
+++ ChangeLog 23 Aug 2009 06:49:56 -0000 1.91 |
| 126 |
@@ -1,6 +1,12 @@ |
| 127 |
# ChangeLog for www-client/lynx |
| 128 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 129 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.90 2009/08/13 06:40:44 wormo Exp $ |
| 130 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.91 2009/08/23 06:49:56 wormo Exp $ |
| 131 |
+ |
| 132 |
+ 23 Aug 2009; Stephanie Lockwood-Childs <wormo@g.o> |
| 133 |
+ lynx-2.8.7_p1.ebuild: |
| 134 |
+ Switch useflags controlling https support back to ssl and gnutls, |
| 135 |
+ rather than openssl and gnutls since ssl flag is enabled in standard |
| 136 |
+ profiles (thanks to Ravi Pinjala for suggestion, bug #275857) |
| 137 |
|
| 138 |
13 Aug 2009; Stephanie Lockwood-Childs <wormo@g.o> |
| 139 |
+files/lynx-2.8.7-configure-openssl.patch, -lynx-2.8.7_rc6.ebuild, |
Archives