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

diff --git a/net-misc/iputils/iputils-20171016_pre-r1.ebuild b/net-misc/iputils/iputils-20171016_pre-r1.ebuild
index 0bd65c8262790aca359b6ccbb19aee6eef6bfe92..d743b00c0a5325c1148d4dc0dbe2a8cbc0d765fc 100644 (file)
--- 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 e56a7e5363f9c15776b46ea6a4cf7977e04b3229..b0387bf3f39266cbd2890d016cf6a45895d82a8c 100644 (file)
--- 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)
                )