Make sure elinks is not linked against gnutls when merged with -ssl (bug #170918).

Package-Manager: portage-2.1.2.2

4 files changed, 35 insertions, 20 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/Manifest b/www-client/elinks/Manifest
index fbc18ccd1d03..efd39bf39985 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -50,18 +50,18 @@ EBUILD elinks-0.10.6.ebuild 4066 RMD160 51513cb0a1487a0f6814dee593717ddee1bc6064
 MD5 368532721ab48cd27912cef0ba16eb2a elinks-0.10.6.ebuild 4066
 RMD160 51513cb0a1487a0f6814dee593717ddee1bc6064 elinks-0.10.6.ebuild 4066
 SHA256 d86f22ae240d6d0b3b80853bfb4bee4be0027ebf491c833680658776c8346c50 elinks-0.10.6.ebuild 4066
-EBUILD elinks-0.11.1.ebuild 4518 RMD160 90c7f4c67f9a146bfd5ad8abd64fe20c2ee03e33 SHA1 df80acd7c14fd321e809561473d331401b133f79 SHA256 a87f81da4acd53c53417ff40f32976e4f3a23525573263ed1d5affddde83b3c5
-MD5 585acadc00b1d18065dd786e5dbaa915 elinks-0.11.1.ebuild 4518
-RMD160 90c7f4c67f9a146bfd5ad8abd64fe20c2ee03e33 elinks-0.11.1.ebuild 4518
-SHA256 a87f81da4acd53c53417ff40f32976e4f3a23525573263ed1d5affddde83b3c5 elinks-0.11.1.ebuild 4518
-EBUILD elinks-0.11.2.ebuild 4756 RMD160 8f72344937f1e4dc7a7ec5067119170df4c6fcae SHA1 f14900ccde571eb640db3a898d1f07bcc46c36c2 SHA256 50bb75e1422c653978a6ebb7ff49cf1c3cc1da43de46ea0a1b546f6d3a8d6528
-MD5 059340533f97aec2e830b89f7d63aaea elinks-0.11.2.ebuild 4756
-RMD160 8f72344937f1e4dc7a7ec5067119170df4c6fcae elinks-0.11.2.ebuild 4756
-SHA256 50bb75e1422c653978a6ebb7ff49cf1c3cc1da43de46ea0a1b546f6d3a8d6528 elinks-0.11.2.ebuild 4756
-MISC ChangeLog 17631 RMD160 827287dfa38f64c7d7f122a50ec8473982e6aa61 SHA1 e375b7d204dc9f6f6b97f72e2e561d0a7d901611 SHA256 fe68d1f137b10b26c3c0bc8e1e810a9658ed0b92446429cb5742de69700130cf
-MD5 b7690f82739931f64ecb475209de0f5b ChangeLog 17631
-RMD160 827287dfa38f64c7d7f122a50ec8473982e6aa61 ChangeLog 17631
-SHA256 fe68d1f137b10b26c3c0bc8e1e810a9658ed0b92446429cb5742de69700130cf ChangeLog 17631
+EBUILD elinks-0.11.1.ebuild 4612 RMD160 58c1652b75ec9b2f27d5f53f14db6c0576429b02 SHA1 c2f19bcc9b8808dadf11225126710c6f57a5ed4d SHA256 df85b590f94d49d1e6ffd92b666a87c4c411f4dc1dbefce37ed18a9b2fc16e3b
+MD5 6af9b0e28c10f01dad8cc63a64a9cd26 elinks-0.11.1.ebuild 4612
+RMD160 58c1652b75ec9b2f27d5f53f14db6c0576429b02 elinks-0.11.1.ebuild 4612
+SHA256 df85b590f94d49d1e6ffd92b666a87c4c411f4dc1dbefce37ed18a9b2fc16e3b elinks-0.11.1.ebuild 4612
+EBUILD elinks-0.11.2.ebuild 4850 RMD160 6f14821328946e769189f8496e4d65f13af27a01 SHA1 88f47901933089d86efcc68041e0c05f2eb118b0 SHA256 b3cd0870a16640e2132c939e95511b6f93b34362c056cede1ef4298256b11358
+MD5 e94302a8ba2ceefbb35c34014596b02f elinks-0.11.2.ebuild 4850
+RMD160 6f14821328946e769189f8496e4d65f13af27a01 elinks-0.11.2.ebuild 4850
+SHA256 b3cd0870a16640e2132c939e95511b6f93b34362c056cede1ef4298256b11358 elinks-0.11.2.ebuild 4850
+MISC ChangeLog 17819 RMD160 a4831fd75d0d2c9168252083f4eeb4ea8bbc0ca6 SHA1 aa640fc13cce121b5c50a573aa5a89cc8d58ec0a SHA256 a510af0414366172108c7532c13700d95ce381def1a9f8b35a2ba1c1c6e89178
+MD5 59682ae665c87da7908b3fb3ace8604d ChangeLog 17819
+RMD160 a4831fd75d0d2c9168252083f4eeb4ea8bbc0ca6 ChangeLog 17819
+SHA256 a510af0414366172108c7532c13700d95ce381def1a9f8b35a2ba1c1c6e89178 ChangeLog 17819
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -84,7 +84,7 @@ SHA256 64a75a4378c0194214ae924b00385c215e1463cd0bfd71dd04d56ce00a5f7483 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF8tDzchej4aZK9/cRAqaiAJwJvrjmgx7YoMedNuGT3n+4vWbkxQCeJkyk
-Xyjvh8UBfgklZW+gtnR7SMc=
-=rzIP
+iD8DBQFF+TX+chej4aZK9/cRAvheAJwMFpO3MiBugnkdUb//VAlBVHj4FQCeJwzF
+xcQUb3I5KV5WYq2Pu+g37g8=
+=Fl8s
 -----END PGP SIGNATURE-----
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) \