[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

["Sam James" <sam@gentoo.org>]

commit:     ffc4b0ff48f2ba9a2241b91a791ae9ef210103b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 01:47:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 01:47:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc4b0ff

net-misc/iputils: add 20211215

Closes: https://bugs.gentoo.org/834321
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/iputils/Manifest                          |  2 ++
 ...ils-99999999.ebuild => iputils-20211215.ebuild} | 26 ++++++++++++------
 net-misc/iputils/iputils-99999999.ebuild           | 31 +++++++++++++---------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 76291183702d..80b40f8eee83 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,4 +1,6 @@
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
 DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
+DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
+DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-20211215.ebuild
similarity index 84%
copy from net-misc/iputils/iputils-99999999.ebuild
copy to net-misc/iputils/iputils-20211215.ebuild
index 34966ccdc145..e468421730e4 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-20211215.ebuild
@@ -19,6 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -28,7 +29,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tracepath"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -43,10 +44,7 @@ LIB_DEPEND="
 	nls? ( virtual/libintl[static-libs(+)] )
 "
 
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 
 DEPEND="
 	${RDEPEND}
@@ -82,9 +80,7 @@ src_configure() {
 		-DBUILD_RARPD="$(usex rarpd true false)"
 		-DBUILD_RDISC="$(usex rdisc true false)"
 		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
 		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
 		-DBUILD_NINFOD="false"
 		-DNINFOD_MESSAGES="false"
 		-DNO_SETCAP_OR_SUID="true"
@@ -93,7 +89,7 @@ src_configure() {
 		$(meson_use !test SKIP_TESTS)
 	)
 
-	if [[ "${PV}" == 99999999 ]] ; then
+	if [[ ${PV} == 99999999 ]] ; then
 		emesonargs+=(
 			-DBUILD_HTML_MANS="$(usex doc true false)"
 			-DBUILD_MANS="true"
@@ -171,7 +167,21 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
 pkg_postinst() {
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+
 	fcaps cap_net_raw \
 		bin/ping \
 		$(usex arping 'bin/arping' '') \

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 34966ccdc145..320cee546b5e 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -19,6 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -28,7 +29,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls ssl static test tracepath"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -43,10 +44,7 @@ LIB_DEPEND="
 	nls? ( virtual/libintl[static-libs(+)] )
 "
 
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 
 DEPEND="
 	${RDEPEND}
@@ -79,21 +77,14 @@ src_configure() {
 		-DBUILD_ARPING="$(usex arping true false)"
 		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
 		-DBUILD_PING="true"
-		-DBUILD_RARPD="$(usex rarpd true false)"
-		-DBUILD_RDISC="$(usex rdisc true false)"
-		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
 		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
 		-DNO_SETCAP_OR_SUID="true"
 		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
 		-DUSE_GETTEXT="$(usex nls true false)"
 		$(meson_use !test SKIP_TESTS)
 	)
 
-	if [[ "${PV}" == 99999999 ]] ; then
+	if [[ ${PV} == 99999999 ]] ; then
 		emesonargs+=(
 			-DBUILD_HTML_MANS="$(usex doc true false)"
 			-DBUILD_MANS="true"
@@ -171,7 +162,21 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
 pkg_postinst() {
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+
 	fcaps cap_net_raw \
 		bin/ping \
 		$(usex arping 'bin/arping' '') \