summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2006-07-27 02:47:09 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2006-07-27 02:47:09 +0000
commit0df72b043b7b2c5fe8ba9fbeaf1bf434b5081af0 (patch)
tree3f79036f52a07677583a686213109f6863058c0f /net-analyzer/echoping
parentinitial commit - ebuild from Tupone Alfredo via bug #84171 (diff)
downloadgentoo-2-0df72b043b7b2c5fe8ba9fbeaf1bf434b5081af0.tar.gz
gentoo-2-0df72b043b7b2c5fe8ba9fbeaf1bf434b5081af0.tar.bz2
gentoo-2-0df72b043b7b2c5fe8ba9fbeaf1bf434b5081af0.zip
Force ebuild to fail if both ssl and gnutls USE flags are set. Fixes bug 141782. Thanks to Johannes Weiner <hnazfoo at gmail dot com>.
(Portage version: 2.1-r1)
Diffstat (limited to 'net-analyzer/echoping')
-rw-r--r--net-analyzer/echoping/ChangeLog6
-rw-r--r--net-analyzer/echoping/echoping-5.2.0.ebuild16
-rw-r--r--net-analyzer/echoping/files/digest-echoping-5.2.02
3 files changed, 22 insertions, 2 deletions
diff --git a/net-analyzer/echoping/ChangeLog b/net-analyzer/echoping/ChangeLog
index 7c255384dc76..25b7ec6c40f8 100644
--- a/net-analyzer/echoping/ChangeLog
+++ b/net-analyzer/echoping/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/echoping
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.6 2006/07/27 02:32:09 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.7 2006/07/27 02:47:09 vanquirius Exp $
+
+ 27 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> echoping-5.2.0.ebuild:
+ Force ebuild to fail if both ssl and gnutls USE flags are set. Fixes bug
+ 141782. Thanks to Johannes Weiner <hnazfoo at gmail dot com>.
27 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> metadata.xml:
Remove angusyoung from metadata.xml, see bug 58356.
diff --git a/net-analyzer/echoping/echoping-5.2.0.ebuild b/net-analyzer/echoping/echoping-5.2.0.ebuild
index 98bc07ff999e..3c8eb9f41afb 100644
--- a/net-analyzer/echoping/echoping-5.2.0.ebuild
+++ b/net-analyzer/echoping/echoping-5.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-5.2.0.ebuild,v 1.5 2006/02/25 23:50:20 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-5.2.0.ebuild,v 1.6 2006/07/27 02:47:09 vanquirius Exp $
inherit eutils
@@ -18,6 +18,20 @@ DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 )
ssl? ( >=dev-libs/openssl-0.9.7d )
idn? ( net-dns/libidn )"
+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."
+ eerror
+ eerror "For example, you can add the line"
+ eerror
+ eerror "net-analyzer/echoping -gnutls"
+ eerror "to your /etc/portage/package.use"
+ die "echoping cannot use both ssl and gnutls at once"
+ fi
+}
+
src_unpack() {
unpack ${A}
cd "${S}"
diff --git a/net-analyzer/echoping/files/digest-echoping-5.2.0 b/net-analyzer/echoping/files/digest-echoping-5.2.0
index 45f38a6f17e4..2128b985f60a 100644
--- a/net-analyzer/echoping/files/digest-echoping-5.2.0
+++ b/net-analyzer/echoping/files/digest-echoping-5.2.0
@@ -1 +1,3 @@
MD5 aef46a1d09a1083e99eb5e18e9184af2 echoping-5.2.0.tar.gz 120911
+RMD160 dcf65162034ec295a7b7d993d166d8ef70a1be79 echoping-5.2.0.tar.gz 120911
+SHA256 b7c94289f860716e8feb8a53448d4d3a7c19728400755dbc584e731904ac6bbf echoping-5.2.0.tar.gz 120911