Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
Date: Sun, 31 Mar 2019 22:37:52
Message-Id: 1554071857.8986bbeb851ff4d7342b79cdb0971fc17e325d33.whissi@gentoo
1 commit: 8986bbeb851ff4d7342b79cdb0971fc17e325d33
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 31 22:26:01 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 31 22:37:37 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8986bbeb
7
8 net-misc/iputils: rename USE=traceroute to USE=traceroute6 and mark as deprecated
9
10 iputils always did only provide traceroute6. Renaming USE flag will clarify
11 that iputils can't provide normal IPv4 traceroute.
12
13 Also, mark USE=traceroute6 as deprecated (in metadata.xml). See Link 1.
14
15 Please use net-analyzer/traceroute for traceroute and traceroute6.
16
17 Link 1: https://github.com/iputils/iputils/issues/166
18
19 Package-Manager: Portage-2.3.62, Repoman-2.3.12
20 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
21
22 net-misc/iputils/iputils-20171016_pre.ebuild | 10 +++++-----
23 net-misc/iputils/iputils-20180629.ebuild | 8 ++++----
24 net-misc/iputils/iputils-99999999.ebuild | 8 ++++----
25 net-misc/iputils/metadata.xml | 2 +-
26 4 files changed, 14 insertions(+), 14 deletions(-)
27
28 diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
29 index 8d1bbffafa1..bea9c59247c 100644
30 --- a/net-misc/iputils/iputils-20171016_pre.ebuild
31 +++ b/net-misc/iputils/iputils-20171016_pre.ebuild
32 @@ -1,4 +1,4 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 +# Copyright 1999-2019 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 # For released versions, we precompile the man/html pages and store
38 @@ -32,7 +32,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
39
40 LICENSE="BSD GPL-2+ rdisc"
41 SLOT="0"
42 -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
43 +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
44
45 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
46 idn? ( net-dns/libidn:=[static-libs(+)] )
47 @@ -46,7 +46,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
48 ) )"
49 RDEPEND="arping? ( !net-misc/arping )
50 rarpd? ( !net-misc/rarpd )
51 - traceroute? ( !net-analyzer/traceroute )
52 + traceroute6? ( !net-analyzer/traceroute )
53 !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
54 DEPEND="${RDEPEND}
55 static? ( ${LIB_DEPEND} )
56 @@ -81,7 +81,7 @@ src_configure() {
57 )
58 if use ipv6 ; then
59 TARGETS+=(
60 - $(usex traceroute 'traceroute6' '')
61 + $(usex traceroute6 'traceroute6' '')
62 )
63 fi
64
65 @@ -155,7 +155,7 @@ src_install() {
66 dosym tracepath.8 /usr/share/man/man8/tracepath6.8
67 fi
68
69 - if use traceroute && use ipv6 ; then
70 + if use traceroute6 && use ipv6 ; then
71 dosbin traceroute6
72 doman doc/traceroute6.8
73 fi
74
75 diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
76 index a667ae038ad..9624d0deee7 100644
77 --- a/net-misc/iputils/iputils-20180629.ebuild
78 +++ b/net-misc/iputils/iputils-20180629.ebuild
79 @@ -32,7 +32,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
80
81 LICENSE="BSD GPL-2+ rdisc"
82 SLOT="0"
83 -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
84 +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
85
86 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
87 idn? ( net-dns/libidn2:=[static-libs(+)] )
88 @@ -51,7 +51,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
89 "
90 RDEPEND="arping? ( !net-misc/arping )
91 rarpd? ( !net-misc/rarpd )
92 - traceroute? ( !net-analyzer/traceroute )
93 + traceroute6? ( !net-analyzer/traceroute )
94 !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
95 DEPEND="${RDEPEND}
96 static? ( ${LIB_DEPEND} )
97 @@ -82,7 +82,7 @@ src_configure() {
98 )
99 if use ipv6 ; then
100 TARGETS+=(
101 - $(usex traceroute 'traceroute6' '')
102 + $(usex traceroute6 'traceroute6' '')
103 )
104 fi
105
106 @@ -156,7 +156,7 @@ src_install() {
107 dosym tracepath.8 /usr/share/man/man8/tracepath6.8
108 fi
109
110 - if use traceroute && use ipv6 ; then
111 + if use traceroute6 && use ipv6 ; then
112 dosbin traceroute6
113 doman doc/traceroute6.8
114 fi
115
116 diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
117 index ccc540e0855..84825935763 100644
118 --- a/net-misc/iputils/iputils-99999999.ebuild
119 +++ b/net-misc/iputils/iputils-99999999.ebuild
120 @@ -1,4 +1,4 @@
121 -# Copyright 1999-2018 Gentoo Authors
122 +# Copyright 1999-2019 Gentoo Authors
123 # Distributed under the terms of the GNU General Public License v2
124
125 # For released versions, we precompile the man/html pages and store
126 @@ -25,7 +25,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
127
128 LICENSE="BSD GPL-2+ rdisc"
129 SLOT="0"
130 -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
131 +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
132
133 LIB_DEPEND="
134 caps? ( sys-libs/libcap[static-libs(+)] )
135 @@ -46,7 +46,7 @@ LIB_DEPEND="
136 RDEPEND="
137 arping? ( !net-misc/arping )
138 rarpd? ( !net-misc/rarpd )
139 - traceroute? ( !net-analyzer/traceroute )
140 + traceroute6? ( !net-analyzer/traceroute )
141 !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
142 "
143 DEPEND="
144 @@ -88,7 +88,7 @@ src_configure() {
145 -DENABLE_RDISC_SERVER="$(usex rdisc true false)"
146 -DBUILD_TFTPD="$(usex tftpd true false)"
147 -DBUILD_TRACEPATH="$(usex tracepath true false)"
148 - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute true false) false)"
149 + -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
150 -DBUILD_NINFOD="false"
151 -DNINFOD_MESSAGES="false"
152 -DBUILD_HTML_MANS="$(usex doc true false)"
153
154 diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
155 index 8fb0527115b..2c0fdf44b67 100644
156 --- a/net-misc/iputils/metadata.xml
157 +++ b/net-misc/iputils/metadata.xml
158 @@ -15,7 +15,7 @@
159 <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
160 <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
161 <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
162 - <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag>
163 + <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag>
164 <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
165 </use>
166 <upstream>