[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     84a612ae902ed90b13887a252b9ed81c57c15712
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 11:40:22 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 11:40:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a612ae

net-misc/iputils: Fix IUSE

...and update live ebuild with recent changes.

Closes: https://bugs.gentoo.org/643304
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-misc/iputils/iputils-20171016_pre-r1.ebuild | 20 +++++++++++---------
 net-misc/iputils/iputils-99999999.ebuild        | 25 ++++++++++++++-----------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/net-misc/iputils/iputils-20171016_pre-r1.ebuild b/net-misc/iputils/iputils-20171016_pre-r1.ebuild
index 0bd65c82627..d743b00c0a5 100644
--- a/net-misc/iputils/iputils-20171016_pre-r1.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre-r1.ebuild
@@ -36,17 +36,19 @@ IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SEC
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		!gcrypt? (
-			nettle? ( dev-libs/nettle[static-libs(+)] )
-			!nettle? (
-				libressl? ( dev-libs/libressl:0[static-libs(+)] )
-				!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	ipv6? (
+		ssl? (
+			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+			!gcrypt? (
+				nettle? ( dev-libs/nettle[static-libs(+)] )
+				!nettle? (
+					libressl? ( dev-libs/libressl[static-libs(+)] )
+					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+				)
 			)
 		)
 	)
-)"
+"
 RDEPEND="arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
 	traceroute? ( !net-analyzer/traceroute )
@@ -94,7 +96,7 @@ src_configure() {
 
 	if use ipv6 && use ssl ; then
 		myconf=(
-			USE_CRYPTO=$(usex openssl)
+			USE_CRYPTO=yes
 			USE_GCRYPT=$(usex gcrypt)
 			USE_NETTLE=$(usex nettle)
 		)

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index e56a7e5363f..b0387bf3f39 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -27,18 +27,23 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		nettle? ( dev-libs/nettle[static-libs(+)] )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
+	ipv6? (
+		ssl? (
+			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+			!gcrypt? (
+				nettle? ( dev-libs/nettle[static-libs(+)] )
+				!nettle? (
+					libressl? ( dev-libs/libressl[static-libs(+)] )
+					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+				)
+			)
 		)
-	) )"
+	)
+"
 RDEPEND="arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
 	traceroute? ( !net-analyzer/traceroute )
@@ -55,8 +60,6 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 fi
 
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
 [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
 src_prepare() {
@@ -86,7 +89,7 @@ src_configure() {
 
 	if use ipv6 && use ssl ; then
 		myconf=(
-			USE_CRYPTO=$(usex openssl)
+			USE_CRYPTO=yes
 			USE_GCRYPT=$(usex gcrypt)
 			USE_NETTLE=$(usex nettle)
 		)