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>.

Package-Manager: portage-2.1-r1

4 files changed, 34 insertions, 14 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/Manifest b/net-analyzer/echoping/Manifest
index 7d083b2abe8f..ea0a772a3de7 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -2,19 +2,19 @@ AUX maxtoread-5.2.0.patch 298 RMD160 093c8206d0cfb9c094cd486dac78a23ba88cac05 SH
 MD5 031f7ebff5b4da097049a014ad9b4890 files/maxtoread-5.2.0.patch 298
 RMD160 093c8206d0cfb9c094cd486dac78a23ba88cac05 files/maxtoread-5.2.0.patch 298
 SHA256 1c521aad69008bb7b700b6535d755490678966d282d2de684dcd2225a2d278d0 files/maxtoread-5.2.0.patch 298
-DIST echoping-5.2.0.tar.gz 120911
-EBUILD echoping-5.2.0.ebuild 1315 RMD160 b4c967d5308f95e11c363f6172dbfd1aee43d4ce SHA1 36af3521033c9595fb21b1980535efe33ebee4cb SHA256 124c70eac07892b2082dfa6e4936b9f7a3ece5290443594acc63d4a404f357c8
-MD5 2a71a0a392b1efc6a2fb88d3268acfb3 echoping-5.2.0.ebuild 1315
-RMD160 b4c967d5308f95e11c363f6172dbfd1aee43d4ce echoping-5.2.0.ebuild 1315
-SHA256 124c70eac07892b2082dfa6e4936b9f7a3ece5290443594acc63d4a404f357c8 echoping-5.2.0.ebuild 1315
-MISC ChangeLog 1108 RMD160 2c05624941bdb98d54c08f4373470a82b82d2fb3 SHA1 9937f6a3cb911f3729b56edf9681c62a8b3dbdce SHA256 60e8805252cf618ca54727e6eb93b6849dbc2f2bdf927b3e7203a680249508e6
-MD5 131e55d40a447d470bf8e2f40a49f324 ChangeLog 1108
-RMD160 2c05624941bdb98d54c08f4373470a82b82d2fb3 ChangeLog 1108
-SHA256 60e8805252cf618ca54727e6eb93b6849dbc2f2bdf927b3e7203a680249508e6 ChangeLog 1108
+DIST echoping-5.2.0.tar.gz 120911 RMD160 dcf65162034ec295a7b7d993d166d8ef70a1be79 SHA1 21b0a92aa1760aca4c2249f0199d94f5c46e0360 SHA256 b7c94289f860716e8feb8a53448d4d3a7c19728400755dbc584e731904ac6bbf
+EBUILD echoping-5.2.0.ebuild 1749 RMD160 2a5991f090dbfbfa33cb743409165bc03805f871 SHA1 cdc933162b26f252989c4f8aa220d15005ef99f0 SHA256 e7a34a00f05b6fbb5a6115f06c938ab9d53281862a60231c2e3efd57b47226f3
+MD5 d7ae7869e3d2bbf62ed905ad3f191b50 echoping-5.2.0.ebuild 1749
+RMD160 2a5991f090dbfbfa33cb743409165bc03805f871 echoping-5.2.0.ebuild 1749
+SHA256 e7a34a00f05b6fbb5a6115f06c938ab9d53281862a60231c2e3efd57b47226f3 echoping-5.2.0.ebuild 1749
+MISC ChangeLog 1323 RMD160 afba1fa539d3a1538e2fb23c48c280be52058fa2 SHA1 4252bad04c57de82a8dd23157466d468c9f9ce1f SHA256 f839b7d8733bfc0d30ab33e946cd8e26ace83b617400a3ce1601868f9a545e77
+MD5 f029575ab1066b0da1428543c6312fbc ChangeLog 1323
+RMD160 afba1fa539d3a1538e2fb23c48c280be52058fa2 ChangeLog 1323
+SHA256 f839b7d8733bfc0d30ab33e946cd8e26ace83b617400a3ce1601868f9a545e77 ChangeLog 1323
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
-MD5 4783578f5986c067408a04d82e5ed589 files/digest-echoping-5.2.0 66
-RMD160 0eb14ce40d06019bc08be0221dec77af22621b4e files/digest-echoping-5.2.0 66
-SHA256 672655ec45da6dda71698728bec4544309d4d406318a2a30efba2b6e35050784 files/digest-echoping-5.2.0 66
+MD5 1a1bec2ae6ac3a478d5166bb74be365c files/digest-echoping-5.2.0 244
+RMD160 19b419e1e90b4553e97bacd2b98ea3d4e92d01f5 files/digest-echoping-5.2.0 244
+SHA256 27497b09445b5b01e5afc199a956de36496f19f8a9ab571dc905da16e941c0a3 files/digest-echoping-5.2.0 244
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