summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-04-11 13:40:22 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-04-11 13:40:22 +0200
commit84a612ae902ed90b13887a252b9ed81c57c15712 (patch)
treee9008f7bd59510236fca0938581330a66ebba993 /net-misc/iputils
parentx11-plugins/purple-hangouts: Version bump (diff)
downloadgentoo-84a612ae902ed90b13887a252b9ed81c57c15712.tar.gz
gentoo-84a612ae902ed90b13887a252b9ed81c57c15712.tar.bz2
gentoo-84a612ae902ed90b13887a252b9ed81c57c15712.zip
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
Diffstat (limited to 'net-misc/iputils')
-rw-r--r--net-misc/iputils/iputils-20171016_pre-r1.ebuild20
-rw-r--r--net-misc/iputils/iputils-99999999.ebuild25
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)
)