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
