gentoo resync : 06.04.2022

1 files changed, 43 insertions, 40 deletions

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 34966ccdc145..cef1837240e2 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -14,11 +14,12 @@ PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
 inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == 99999999 ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	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,39 +29,33 @@ 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="
-	virtual/pkgconfig
-	test? ( sys-apps/iproute2 )
-	nls? ( sys-devel/gettext )
-"
-
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
 	nls? ( virtual/libintl[static-libs(+)] )
 "
-
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="
 	${RDEPEND}
 	virtual/os-headers
 	static? ( ${LIB_DEPEND} )
 "
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == 99999999 ]] ; then
 	BDEPEND+="
 		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-ns-stylesheets
 		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
+		dev-libs/libxslt
 	"
 fi
 
@@ -74,34 +69,27 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local emesonargs=(
-		-DUSE_CAP="$(usex caps true false)"
-		-DUSE_IDN="$(usex idn true false)"
-		-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)"
+		-DUSE_CAP=$(usex caps true false)
+		-DUSE_IDN=$(usex idn true false)
+		-DBUILD_ARPING=$(usex arping true false)
+		-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+		-DBUILD_PING=true
+		-DBUILD_TRACEPATH=$(usex tracepath true 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"
+			-DBUILD_HTML_MANS=$(usex doc true false)
+			-DBUILD_MANS=true
 		)
 	else
 		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
+			-DBUILD_HTML_MANS=false
+			-DBUILD_MANS=false
 		)
 	fi
 
@@ -110,12 +98,13 @@ src_configure() {
 
 src_compile() {
 	tc-export CC
+
 	meson_src_compile
 }
 
 src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		einfo "Tests require root privileges; Skipping ..."
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Tests require root privileges. Skipping ..."
 		return
 	fi
 
@@ -139,7 +128,7 @@ src_install() {
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
-	if [[ "${PV}" != 99999999 ]] ; then
+	if [[ ${PV} != 99999999 ]] ; then
 		local -a man_pages
 		local -a html_man_pages
 
@@ -171,7 +160,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' '') \