diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2007-03-15 12:03:13 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2007-03-15 12:03:13 +0000 |
| commit | 32004c4425dde0917fc0bfaf34a13b5569296f30 (patch) | |
| tree | 17d6f6aa0dafdc5f8f2aa592125a70d990ee185e /www-client/elinks | |
| parent | inherit eutils (diff) | |
| download | gentoo-2-32004c4425dde0917fc0bfaf34a13b5569296f30.tar.gz gentoo-2-32004c4425dde0917fc0bfaf34a13b5569296f30.tar.bz2 gentoo-2-32004c4425dde0917fc0bfaf34a13b5569296f30.zip | |
Make sure elinks is not linked against gnutls when merged with -ssl (bug #170918).
(Portage version: 2.1.2.2)
Diffstat (limited to 'www-client/elinks')
| -rw-r--r-- | www-client/elinks/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/elinks/elinks-0.11.1.ebuild | 9 | ||||
| -rw-r--r-- | www-client/elinks/elinks-0.11.2.ebuild | 9 |
3 files changed, 20 insertions, 5 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog index 04c73bca2a3e..f129c93847fd 100644 --- a/www-client/elinks/ChangeLog +++ b/www-client/elinks/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/elinks # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.74 2007/03/10 15:38:12 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.75 2007/03/15 12:03:13 spock Exp $ + + 15 Mar 2007; Michał Januszewski <spock@gentoo.org> elinks-0.11.1.ebuild, + elinks-0.11.2.ebuild: + Make sure elinks is not linked against gnutls when merged with -ssl (bug + #170918). 10 Mar 2007; Michał Januszewski <spock@gentoo.org> +files/elinks-0.11.2-lua-5.1.patch, +files/elinks-0.11.2-lua-5.patch, diff --git a/www-client/elinks/elinks-0.11.1.ebuild b/www-client/elinks/elinks-0.11.1.ebuild index 3a7b38003808..3cc939074b55 100644 --- a/www-client/elinks/elinks-0.11.1.ebuild +++ b/www-client/elinks/elinks-0.11.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.14 2007/01/13 15:04:38 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.15 2007/03/15 12:03:13 spock Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.4" @@ -70,6 +70,12 @@ src_compile() { myconf="--enable-fastmem" fi + if use ssl ; then + myconf="${myconf} --with-openssl" + else + myconf="${myconf} --without-openssl --without-gnutls" + fi + econf \ --sysconfdir=/etc/elinks \ --enable-leds \ @@ -79,7 +85,6 @@ src_compile() { $(use_with gpm) \ $(use_with zlib) \ $(use_with bzip2 bzlib) \ - $(use_with ssl openssl) \ $(use_with X x) \ $(use_with lua) \ $(use_with guile) \ diff --git a/www-client/elinks/elinks-0.11.2.ebuild b/www-client/elinks/elinks-0.11.2.ebuild index 7722677dd745..a11037c5376b 100644 --- a/www-client/elinks/elinks-0.11.2.ebuild +++ b/www-client/elinks/elinks-0.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.12 2007/03/10 15:38:12 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.13 2007/03/15 12:03:13 spock Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.4" @@ -85,6 +85,12 @@ src_compile() { myconf="--enable-fastmem" fi + if use ssl ; then + myconf="${myconf} --with-openssl" + else + myconf="${myconf} --without-openssl --without-gnutls" + fi + econf \ --sysconfdir=/etc/elinks \ --enable-leds \ @@ -94,7 +100,6 @@ src_compile() { $(use_with gpm) \ $(use_with zlib) \ $(use_with bzip2 bzlib) \ - $(use_with ssl openssl) \ $(use_with X x) \ $(use_with lua) \ $(use_with guile) \ |