gentoo resync : 25.08.2020

5 files changed, 11 insertions, 436 deletions

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 010a85e4fa37..5afa15a74491 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -7,15 +7,11 @@ AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 285
 AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07
 AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338
 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada
-DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476
-DIST iputils-20190515.tar.gz 403228 BLAKE2B cebe2460ac4da5471a9b8e655bed1c1640f69d4dc41a724ab197533e3d532e34c28e9ccbc852e057d18c9867d9d668e2f73848b005439463dc4e7735c68ae87c SHA512 adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250
 DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5
-DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
-DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2
+DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
-EBUILD iputils-20180629.ebuild 3968 BLAKE2B 8e2fbe0e178ad92516ed47775b95db4fc4ec33a76fea341d9868edf76a942a63198df0871ab2cc036dcfdc321270c8f0498a5dbd83d54f14e81c8bb05cef5198 SHA512 c7c9132e64d0f62b5c64a433207afc49d30cc9c2a7cc761646a5921f37c7969c87ae50634128a90bf0e8d9617d563fdc2340b8faa62ef1249a7275a72b249667
-EBUILD iputils-20190515.ebuild 4919 BLAKE2B 4971db4c7e34487f58cd8475e5d5f1a8c4019ff74c14d9cb0dbbebe34c75d98033073c8faae6a6bbfc0b9ec70cead5bcbf3d69c532e418bb72b6c07a98f5323c SHA512 fcd0be342b6f865ca0b12e30d98f347b44d11dcf2871914a0e657c27d0cb9dfdae9c289cde19825fbd2c7aa7a3d5d10ce5cd31d0f585df58196977e1606f6cbe
+DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 EBUILD iputils-20190709-r1.ebuild 5054 BLAKE2B 917fae9c9867ef740c55121a47d1d4e34365f7c224e148e812a17c2d1556e41c60a2b13f97fd8e2cd69ea6e9f9eb6135eadbce5d338651c92ba37812b35a4257 SHA512 87e8b0cc765316ac1507a5e0f96c852effa7ddcd971baba445dc5e62fef8e96d0cffac545770d740444ac4131582002e0a22aaabe9b104ea9783e7bd7b24e337
-EBUILD iputils-20190709.ebuild 4832 BLAKE2B 568c48b41ebc6130dd0bc57a300bebd1e3f1994c5cea2f844dd43573e3e9fc24488784307649048ea83a30bcdc0696c56974f83a3a9a07a87d94c539d1fee6af SHA512 861e080265a15292a6c45adff6aec359b2f4cee26ce91d3d3a1ae01a9b06325f421d9016b27d68ff878e0432bd48a7adfade6b1828747ddbf1b90b9a924f02b0
-EBUILD iputils-99999999.ebuild 4839 BLAKE2B 36de576375669cde223c1a8e37225d9527969434238e1a12475679968ef2a76b1d696214c2b2e029d4480246e8d047a797484499da1324ad783296afd4c334ac SHA512 c600edbeb543af780408ac536c5fd89384c3b487aab5ea02cc0c17184b1f351f1d9ecde4f018085d16daf58ddaf2907378683b2f3ae450b91705461d3e54f404
+EBUILD iputils-20200821.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534
+EBUILD iputils-99999999.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
deleted file mode 100644
index c71a8d09411b..000000000000
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs fcaps
-
-MY_PV="${PV/_pre/}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20180629-musl.patch
-	"${FILESDIR}"/${P}-fix-ping-on-musl.patch
-)
-
-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/s${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	ipv6? (
-		ssl? (
-			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-			!gcrypt? (
-				nettle? ( dev-libs/nettle[static-libs(+)] )
-				!nettle? (
-					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-				)
-			)
-		)
-	)
-"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers
-"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-	"
-fi
-
-[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
-	default
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	if use ipv6 ; then
-		TARGETS+=(
-			$(usex traceroute6 'traceroute6' '')
-		)
-	fi
-
-	myconf=(
-		USE_CRYPTO=no
-		USE_GCRYPT=no
-		USE_NETTLE=no
-	)
-
-	if use ipv6 && use ssl ; then
-		myconf=(
-			USE_CRYPTO=yes
-			USE_GCRYPT=$(usex gcrypt)
-			USE_NETTLE=$(usex nettle)
-		)
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
-		TARGETS="${TARGETS[*]}" \
-		${myconf[@]}
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake man
-
-		use doc && emake html
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping
-	dosym ping /bin/ping4
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-		dosym ping.8 /usr/share/man/man8/ping6.8
-	fi
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	if use tracepath ; then
-		dosbin tracepath
-		doman doc/tracepath.8
-		dosym tracepath /usr/sbin/tracepath4
-	fi
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosym tracepath /usr/sbin/tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute6 && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL.md
-
-	use doc && dodoc doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild
deleted file mode 100644
index dbeb6834c857..000000000000
--- a/net-misc/iputils/iputils-20190515.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
-
-EAPI="6"
-
-PLOCALES="ja"
-
-inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
-
-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/s${PV}.tar.gz -> ${P}.tar.gz
-		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 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
-
-LIB_DEPEND="
-	caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	ipv6? (
-		ssl? (
-			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-			!gcrypt? (
-				nettle? ( dev-libs/nettle[static-libs(+)] )
-				!nettle? (
-					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-				)
-			)
-		)
-	)
-	nls? ( sys-devel/gettext[static-libs(+)] )
-"
-
-RDEPEND="
-	arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers
-	virtual/pkgconfig
-"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		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
-	"
-fi
-
-[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20190515-fix-setcap.patch
-)
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
-	default
-
-	l10n_get_locales > po/LINGUAS || die
-}
-
-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 ipv6 $(usex traceroute6 true false) false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
-		-DNO_SETCAP_OR_SUID="true"
-		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
-		-DUSE_GETTEXT="$(usex nls true false)"
-	)
-
-	if use ipv6 && use ssl ; then
-		emesonargs+=(
-			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
-		)
-	else
-		emesonargs+=(
-			-DUSE_CRYPTO="none"
-		)
-	fi
-
-	if [[ "${PV}" == 99999999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS="$(usex doc true false)"
-			-DBUILD_MANS="true"
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	tc-export CC
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /bin
-	local my_bin
-	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
-	done
-	dosym ping /bin/ping4
-
-	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
-	fi
-
-	if [[ "${PV}" != 99999999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		local oifs=${IFS}
-		while IFS= read -r -u 3 -d $'\0' my_bin
-		do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-		IFS=${oifs}
-
-		pushd doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			docinto html
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20200821.ebuild
index bdf494ae2e6f..3365b1ca6cc5 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20200821.ebuild
@@ -5,11 +5,12 @@
 # them in a tarball on our mirrors.  This avoids ugly issues while
 # building stages, and reduces depedencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+# EGIT_COMMIT set to release tag, all USE flags enabled and
+# tar ${S}/doc folder.
 
 EAPI="7"
 
-PLOCALES="ja"
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
 inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
 
@@ -19,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
@@ -34,18 +35,6 @@ BDEPEND="virtual/pkgconfig"
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	ipv6? (
-		ssl? (
-			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-			!gcrypt? (
-				nettle? ( dev-libs/nettle[static-libs(+)] )
-				!nettle? (
-					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-				)
-			)
-		)
-	)
 	nls? ( sys-devel/gettext[static-libs(+)] )
 "
 
@@ -106,16 +95,6 @@ src_configure() {
 		-DUSE_GETTEXT="$(usex nls true false)"
 	)
 
-	if use ipv6 && use ssl ; then
-		emesonargs+=(
-			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
-		)
-	else
-		emesonargs+=(
-			-DUSE_CRYPTO="none"
-		)
-	fi
-
 	if [[ "${PV}" == 99999999 ]] ; then
 		emesonargs+=(
 			-DBUILD_HTML_MANS="$(usex doc true false)"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index cc025fe8be3e..3365b1ca6cc5 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -5,11 +5,12 @@
 # them in a tarball on our mirrors.  This avoids ugly issues while
 # building stages, and reduces depedencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+# EGIT_COMMIT set to release tag, all USE flags enabled and
+# tar ${S}/doc folder.
 
 EAPI="7"
 
-PLOCALES="ja"
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
 inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
 
@@ -34,18 +35,6 @@ BDEPEND="virtual/pkgconfig"
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	ipv6? (
-		ssl? (
-			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-			!gcrypt? (
-				nettle? ( dev-libs/nettle[static-libs(+)] )
-				!nettle? (
-					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-				)
-			)
-		)
-	)
 	nls? ( sys-devel/gettext[static-libs(+)] )
 "
 
@@ -106,16 +95,6 @@ src_configure() {
 		-DUSE_GETTEXT="$(usex nls true false)"
 	)
 
-	if use ipv6 && use ssl ; then
-		emesonargs+=(
-			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
-		)
-	else
-		emesonargs+=(
-			-DUSE_CRYPTO="none"
-		)
-	fi
-
 	if [[ "${PV}" == 99999999 ]] ; then
 		emesonargs+=(
 			-DBUILD_HTML_MANS="$(usex doc true false)"