diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-01-26 10:36:52 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-01-26 10:36:52 +0000 |
| commit | c93488affe554dd0e9efbca2bfd095d726ec8e21 (patch) | |
| tree | ddf2a4311c5fe28b09d7ebfeb7a3289d83642511 /net-analyzer/echoping | |
| parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
| download | gentoo-2-c93488affe554dd0e9efbca2bfd095d726ec8e21.tar.gz gentoo-2-c93488affe554dd0e9efbca2bfd095d726ec8e21.tar.bz2 gentoo-2-c93488affe554dd0e9efbca2bfd095d726ec8e21.zip | |
Do not die if ssl and gnutls are enabled, better chose gnutls, thank Paul Tobias <tobias.pal AT gmail.com> for patch, bug #141782.
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-analyzer/echoping')
| -rw-r--r-- | net-analyzer/echoping/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/echoping/echoping-6.0.2.ebuild | 26 |
2 files changed, 20 insertions, 14 deletions
diff --git a/net-analyzer/echoping/ChangeLog b/net-analyzer/echoping/ChangeLog index 5fa1d446fe66..8f994c88bca7 100644 --- a/net-analyzer/echoping/ChangeLog +++ b/net-analyzer/echoping/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/echoping -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.13 2007/09/06 16:30:31 jokey Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.14 2008/01/26 10:36:52 pva Exp $ + + 26 Jan 2008; <pva@gentoo.org> echoping-6.0.2.ebuild: + Do not die if ssl and gnutls are enabled, better chose gnutls, thank Paul + Tobias <tobias.pal AT gmail.com> for patch, bug #141782. 06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -files/maxtoread-5.2.0.patch, -echoping-5.2.0.ebuild, diff --git a/net-analyzer/echoping/echoping-6.0.2.ebuild b/net-analyzer/echoping/echoping-6.0.2.ebuild index 77c127cd9f14..2b3c34d7420a 100644 --- a/net-analyzer/echoping/echoping-6.0.2.ebuild +++ b/net-analyzer/echoping/echoping-6.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v 1.2 2007/09/06 16:25:35 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v 1.3 2008/01/26 10:36:52 pva Exp $ inherit eutils @@ -19,27 +19,29 @@ DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 ) postgres? ( dev-db/postgresql ) ldap? ( net-nds/openldap )" -pkg_setup() { - # bug 141782 - conflicting USE flags - ssl and gnutls - if use ssl && use gnutls ; then - eerror "You cannot emerge net-analyzer/echoping with both" - eerror "ssl and gnutls USE flags set. Please choose one." - die "echoping cannot use both ssl and gnutls at once" +src_compile() { + local my_ssl_conf + if use gnutls; then + if use ssl; then + ewarn "You've enabled both ssl and gnutls USE flags but ${PN} could" + ewarn "not be built with both, see bug #141782. Using gnutls only." + fi + my_ssl_conf="${myconf} $(use_with gnutls)" + elif use ssl; then + my_ssl_conf="${myconf} $(use_with ssl)" fi -} -src_compile() { econf \ --config-cache \ --disable-ttcp \ - $(use_with gnutls) \ + ${my_ssl_conf} \ $(use_enable http) \ $(use_enable icp) \ $(use_with idn libidn) \ $(use_enable smtp) \ $(use_enable tos) \ $(use_enable priority) \ - $(use_with ssl) || die "econf failed" + || die "econf failed" emake || die "emake failed" } |