From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1368589-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2E06515808B
for <garchives@archives.gentoo.org>; Fri, 18 Feb 2022 02:44:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7AF182BC00A;
Fri, 18 Feb 2022 02:44:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 286142BC008
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 02:44:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9FCBE3433A1
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 02:44:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E167F2EB
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 02:44:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1645152013.71342476da70a32fa23f736f2c3162bb6b2cfded.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/iputils/iputils-20210722-r1.ebuild net-misc/iputils/iputils-99999999.ebuild
X-VCS-Directories: net-misc/iputils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 71342476da70a32fa23f736f2c3162bb6b2cfded
X-VCS-Branch: master
Date: Fri, 18 Feb 2022 02:44:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1462732e-f005-4cf2-bea6-aa3499efcb26
X-Archives-Hash: b26f0226a2b120daff546ce649844d7b
commit: 71342476da70a32fa23f736f2c3162bb6b2cfded
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 10:51:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:40:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71342476
net-misc/iputils: Remove unneccessary USE=-ipv6
At this point, USE=ipv6 is only used to control creating "ping6"
and "tracepath6" symlinks. Just remove the flag and install the links
unconditionally.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/iputils/iputils-20210722-r1.ebuild | 18 ++++++------------
net-misc/iputils/iputils-99999999.ebuild | 18 ++++++------------
2 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
index f572846d61e0..2ae5257319b0 100644
--- a/net-misc/iputils/iputils-20210722-r1.ebuild
+++ b/net-misc/iputils/iputils-20210722-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
LICENSE="BSD GPL-2+ rdisc"
SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
RESTRICT="!test? ( test )"
BDEPEND="
@@ -91,7 +91,7 @@ src_configure() {
-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-DBUILD_TFTPD="$(usex tftpd true false)"
-DBUILD_TRACEPATH="$(usex tracepath true false)"
- -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
+ -DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
-DBUILD_NINFOD="false"
-DNINFOD_MESSAGES="false"
-DNO_SETCAP_OR_SUID="true"
@@ -138,18 +138,12 @@ src_install() {
mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
done
dosym ping /bin/ping4
+ dosym ping /bin/ping6
if use tracepath ; then
dosym tracepath /usr/bin/tracepath4
- fi
-
- if use ipv6 ; then
- dosym ping /bin/ping6
-
- if use tracepath ; then
- dosym tracepath /usr/bin/tracepath6
- dosym tracepath.8 /usr/share/man/man8/tracepath6.8
- fi
+ dosym tracepath /usr/bin/tracepath6
+ dosym tracepath.8 /usr/share/man/man8/tracepath6.8
fi
if [[ "${PV}" != 99999999 ]] ; then
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index fe97d131c7f4..34966ccdc145 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
LICENSE="BSD GPL-2+ rdisc"
SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
RESTRICT="!test? ( test )"
BDEPEND="
@@ -84,7 +84,7 @@ src_configure() {
-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-DBUILD_TFTPD="$(usex tftpd true false)"
-DBUILD_TRACEPATH="$(usex tracepath true false)"
- -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
+ -DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
-DBUILD_NINFOD="false"
-DNINFOD_MESSAGES="false"
-DNO_SETCAP_OR_SUID="true"
@@ -131,18 +131,12 @@ src_install() {
mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
done
dosym ping /bin/ping4
+ dosym ping /bin/ping6
if use tracepath ; then
dosym tracepath /usr/bin/tracepath4
- fi
-
- if use ipv6 ; then
- dosym ping /bin/ping6
-
- if use tracepath ; then
- dosym tracepath /usr/bin/tracepath6
- dosym tracepath.8 /usr/share/man/man8/tracepath6.8
- fi
+ dosym tracepath /usr/bin/tracepath6
+ dosym tracepath.8 /usr/share/man/man8/tracepath6.8
fi
if [[ "${PV}" != 99999999 ]] ; then