From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 490C31382C5 for ; Wed, 11 Apr 2018 11:40:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58726E08EF; Wed, 11 Apr 2018 11:40:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2447DE08EF for ; Wed, 11 Apr 2018 11:40:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 710DF335C30 for ; Wed, 11 Apr 2018 11:40:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BED9F253 for ; Wed, 11 Apr 2018 11:40:53 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1523446822.84a612ae902ed90b13887a252b9ed81c57c15712.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/iputils/iputils-20171016_pre-r1.ebuild net-misc/iputils/iputils-99999999.ebuild X-VCS-Directories: net-misc/iputils/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 84a612ae902ed90b13887a252b9ed81c57c15712 X-VCS-Branch: master Date: Wed, 11 Apr 2018 11:40:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 50d36046-89b4-4782-aba1-f0fa29a43b64 X-Archives-Hash: 6e2f45b6a0e9a5a3cb79656af5031de8 commit: 84a612ae902ed90b13887a252b9ed81c57c15712 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 11 11:40:22 2018 +0000 Commit: Thomas Deutschmann gentoo 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) )