gentoo auto-resync : 22:09:2022 - 23:28:46

5 files changed, 35 insertions, 18 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index fbb43bcd56b0..faa8d283a22d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 144e4c0a7f69..4fd70923f9dd 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,3 +1,3 @@
 DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
-EBUILD aria2-1.36.0.ebuild 5079 BLAKE2B 28a36b8aad56a4f380b97f406a6b1f100ec81fabcc87303830bb4dd155560c2729a58c45f2bf062ac9b720967cb53433f2c66bcdff52cccbcea4fb2cc02dcaa7 SHA512 c4c1a1337d326ace51be27a562e1c8bd1c21005bc9a9a51ea66d0074170bff76314f4e19c50033f82804c680c4ea8ce50d37740589cd8b1154b4621ee1ad9b5e
+EBUILD aria2-1.36.0-r1.ebuild 5144 BLAKE2B 25da9ec2d83bc61f947e630db0a845d84e0b286d2363d0ce4bae0d4b7e5aa931f100a2786c842ee94bdbbb936fa7481b7c53ead8fb76d1f5b75d4300e80bf1df SHA512 7dc3116b666361b675efff500626dcab208f2b7c898b94317f54efe2db95b92d8d9ddc39711aa8bdbd09795b56a091f57bd2d22628da175340a734bdbaaff5fc
 MISC metadata.xml 1326 BLAKE2B 3ac9bf38699dc1fbde6888fca4fbc4374d44e53d7c323fcf35e9303929502473dba40503c7ce3deaf232f6057d184e19bbf5ff7cbc5908d79ee3e6de7dc6a097 SHA512 5367b67da846fbcb0175b1ee4a3a532731e6b5285b8c3f244a175515b557a64732e58a8db67d4a691c28e707511ff894afe746366efd74c06353fa1df8efcf8b
diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild
index 88356647df78..c5eb810cec54 100644
--- a/net-misc/aria2/aria2-1.36.0.ebuild
+++ b/net-misc/aria2/aria2-1.36.0-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
 
 EAPI=8
@@ -12,11 +12,16 @@ SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar
 LICENSE="GPL-2+-with-openssl-exception"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+IUSE="
+	adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
+	nls sqlite scripts ssh ssl tcmalloc test xmlrpc
+"
 # xmlrpc has no explicit switch, it's turned out by any XML library
 # so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
+REQUIRED_USE="
+	?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )
+"
 RESTRICT="!test? ( test )"
 
 # Crazy GnuTLS/OpenSSL/etc. logic below:
@@ -34,13 +39,15 @@ RESTRICT="!test? ( test )"
 # We map this into:
 # ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
 # !ssl? -> nettle || libgcrypt
-RDEPEND="sys-libs/zlib:0=
+RDEPEND="
+	sys-libs/zlib:0=
 	adns? ( >=net-dns/c-ares-1.5.0:0= )
 	jemalloc? ( dev-libs/jemalloc )
 	libuv? ( >=dev-libs/libuv-1.13:0= )
 	metalink? (
 		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
+		!libxml2? ( dev-libs/expat:0= )
+	)
 	sqlite? ( dev-db/sqlite:3= )
 	ssh? ( net-libs/libssh2:= )
 	ssl? (
@@ -73,16 +80,22 @@ RDEPEND="sys-libs/zlib:0=
 	tcmalloc? ( dev-util/google-perftools )
 	xmlrpc? (
 		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
+		!libxml2? ( dev-libs/expat:0= )
+	)
+"
 
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-util/cppunit-1.12.0:0 )
+"
 RDEPEND+="
 	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
+	scripts? ( dev-lang/ruby )
+"
 BDEPEND="app-arch/xz-utils
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 pkg_setup() {
 	if use scripts && ! use xmlrpc; then
@@ -123,6 +136,9 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 		$(use_with ssh libssh2)
 		$(use_with tcmalloc)
+
+		# forces bundled wslay
+		--disable-websocket
 	)
 
 	# See TLS/MD logic described above deps.
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index cbbeb78ae5ed..113c2f8aeb0c 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,5 +1,5 @@
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20211215.ebuild 4754 BLAKE2B f5e6b11dcf1642695fb3fe8be537a5df04359d397c28f7a86fff5b11c8dc37743597df22721d41bdd8c45f3f06f76325c236e3159602b15bc8cd1200d3389c41 SHA512 aa0565d5645f4acba4bfa3ca6d425e2538922ec9f3405ba1f4542941e7f21f5399e8709b71d76292a927109911226cdaa2be56ad63b62006e59a759556747bd5
-EBUILD iputils-99999999.ebuild 4243 BLAKE2B 32a966a6d95fab5d84b080fbf4b541a0b95e450f1fe102e6d1504ac0f8a3de3f147791403433ee28ed25c6607218539eecdf38046523e448d63a21eac9d9ceb7 SHA512 7ce50a4b2d1f22d87f035070ed201afe7e06dc58b1df06834fa5468acfabf17d432e576e75c90eb5991688a1d45b73ed6f4c3e220220253310c4760500cd9161
+EBUILD iputils-99999999.ebuild 4285 BLAKE2B 39a671917897b5076e21dd0c413ef26553ee68883b9b972ae45f2de1fcc3d75fdcf9971b977ad6ce9eca52e2912ff0236524328dff61d3c2913d13a67fa09475 SHA512 4e3c9e4598d7517f06eddb38b6060421a3af035030b7a72d8ced53d335f0c5b1e6e8df3902edf9d719f124f4a13ad5f55f29d37fa0fe5d107487c1ccd124beed
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 6e435f7605da..7f3760b7d4f5 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -110,6 +110,10 @@ src_test() {
 src_install() {
 	meson_src_install
 
+	FILECAPS=( cap_net_raw usr/bin/ping )
+	use arping && FILECAPS+=( usr/bin/arping )
+	use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
 	dosym ping /usr/bin/ping4
 	dosym ping /usr/bin/ping6
 
@@ -159,15 +163,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	fcaps_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' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
 }