Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at a time #509100 by David Heidelberger.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 14 insertions, 9 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index fba9b26ab89b..c410c38af5b8 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.125 2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.126 2014/04/29 19:22:34 vapier Exp $
+
+  29 Apr 2014; Mike Frysinger <vapier@gentoo.org> iputils-20121221-r1.ebuild,
+  iputils-99999999.ebuild:
+  Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at
+  a time #509100 by David Heidelberger.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> iputils-20121221-r1.ebuild,
   iputils-20121221.ebuild, iputils-99999999.ebuild:
diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
index 62597eb89dfa..00de074d06c8 100644
--- a/net-misc/iputils/iputils-20121221-r1.ebuild
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.5 2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.6 2014/04/29 19:22:34 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -28,10 +28,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? (
+	ipv6? ( ssl? (
 		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		ssl? ( dev-libs/openssl:0[static-libs(+)] )
-	)"
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	) )"
 RDEPEND="!net-misc/rarpd
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index a0a4bd289b93..8ad665f813ca 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.12 2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.13 2014/04/29 19:22:34 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -28,10 +28,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? (
+	ipv6? ( ssl? (
 		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		ssl? ( dev-libs/openssl:0[static-libs(+)] )
-	)"
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	) )"
 RDEPEND="!net-misc/rarpd
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}