gentoo auto-resync : 10:11:2024 - 03:03:09

15 files changed, 234 insertions, 226 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4b5b013b8e43..f977881439df 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 35bfc88a9efa..a96756b6b821 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,8 +1,6 @@
 AUX libnice-0.1.19-remove-graphviz-dependency.patch 1054 BLAKE2B f0e6b17994794e7418bfd4b5fbd070d078258d419e2704ab600aa426f911d1d4e95f8c97bc5f598da1901b940e180c537b38751c69f48b9c39ca17220a22eb5b SHA512 770caf8a3dfce997cf8145fff83c511b193beca747479752241186dea367f1b4b0722696945736102f6f9bc7a4a3c3e77d30644ea4406bdee8dd8376a8f4b007
-DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
 DIST libnice-0.1.21.tar.gz 460086 BLAKE2B 61f0807ad0d959ffbaf8dce7b0321a19ae42e4c57cc6ac9b8f39bd27645ef60bb342f4105b6ce4c4c82573592a52388888d72031033e9e7368f8b5d53afa37d6 SHA512 acbd1e0e8aacb0a65cad5b70b470a74a7c4a4f1306bc4e17cd4fd899f2fae2bb538bd099e6c0f9cba6bb9a38e95bc14087aa4f77f6aa5b70d6398179783c6e26
 DIST libnice-0.1.22.tar.gz 460696 BLAKE2B ebc4877664568e9a93bd3eeb93c1e6fd067df81596cff2d4ca74fc8e30c7b3af0eb0dd98e605f58161d6f002a5b91b13237ae63fd719d37ad3126a2bc3f0a7e7 SHA512 c3aae2d36d2cec8654b87ecc464296711a4a64335052dfc1477f43f59e90341f7a6a01ebd4edf91a72d9ec425440e6dd0bd8f817c77e03578854e70193b3306b
-EBUILD libnice-0.1.19-r1.ebuild 1649 BLAKE2B 47cfb8913f22276e52a0c3e58dc43df130d7d36f3da81d082948991f3421f62be85aecb83a5d6d0c3a373badf73da4d66cf9b442347528bc1b6b74aa2dbc82d3 SHA512 a92f184cea81db0dd3f0879c9d7cf9f3461aae2e6dbf3ba21d970391ff2e9f4238988e5712c4b497ff4bf5b6c6b624ce958d5edb6976a30924cf8149b6e68213
 EBUILD libnice-0.1.21.ebuild 1649 BLAKE2B 47cfb8913f22276e52a0c3e58dc43df130d7d36f3da81d082948991f3421f62be85aecb83a5d6d0c3a373badf73da4d66cf9b442347528bc1b6b74aa2dbc82d3 SHA512 a92f184cea81db0dd3f0879c9d7cf9f3461aae2e6dbf3ba21d970391ff2e9f4238988e5712c4b497ff4bf5b6c6b624ce958d5edb6976a30924cf8149b6e68213
 EBUILD libnice-0.1.22.ebuild 1652 BLAKE2B a4d3f26975c9a2a552207b433e893747bfeb690b23c1998ae936720201249e76cbc556e5f8cac492a648d484e05ef457db403623198c6c759a374fa77c7b5284 SHA512 fa5c857f50275da7336fbe395c3f6f53eb86f3f5801ddcc212d6cf59aceddc2e275960142f52de34a0fd5850b1023b2cc78cd2d0faff0eeb3d3ef7a72bef4003
 MISC metadata.xml 265 BLAKE2B 62185df549a5149fbedc3226512a38a2ab3a45bb6bed1c57c52f7e1d03832d47bffeaed10fb1bbe2d4dcdaaafb988f00c48c60247c069b527a8fb772855c3636 SHA512 1511e91cb7da5a9f719039f4d8da162d3fc746831b20685fa5945d0a8d549cc7f0d22ca6b3f0f741d276913dcd2037a685cca1ed3fcb3fa65580190b442f64f6
diff --git a/net-libs/libnice/libnice-0.1.19-r1.ebuild b/net-libs/libnice/libnice-0.1.19-r1.ebuild
deleted file mode 100644
index 62c8f7bbbb42..000000000000
--- a/net-libs/libnice/libnice-0.1.19-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson-multilib xdg
-
-DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
-HOMEPAGE="https://libnice.freedesktop.org/"
-SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+gnutls gtk-doc +introspection test +upnp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-	gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
-	!gnutls? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	upnp? ( >=net-libs/gupnp-igd-0.2.4:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	# bugs 877451, 889820
-	"${FILESDIR}/libnice-0.1.19-remove-graphviz-dependency.patch"
-)
-
-src_prepare() {
-	default
-
-	# Broken w/ network-sandbox on (bug #847844)
-	sed -i -e '/test-set-port-range/d' tests/meson.build || die
-}
-
-multilib_src_configure() {
-	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
-	local emesonargs=(
-		-Dgstreamer=disabled
-		-Dcrypto-library=$(usex gnutls gnutls openssl)
-		$(meson_native_use_feature introspection)
-		$(meson_feature test tests)
-		$(meson_feature upnp gupnp)
-		$(meson_native_use_feature gtk-doc gtk_doc)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 0194f1969cc7..570af71aa29d 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,6 +2,5 @@ AUX libsmi-0.5.0-clang-15-configure.patch 1078 BLAKE2B 7d3de7a5ffaa91784808ae435
 AUX libsmi-0.5.0-fix-macro-clang16.patch 433 BLAKE2B 8ee8219c7b803fc24d78540bcc3306cb1a643f7d1fb383bda3f049b27780f1ca95ace8f2a149d745b7d2ce6b0b2b84cf04c5c908721d89ab6c140abfa01da287 SHA512 e8b683ee1c02632f13b44d3ecd7f2db57508c3fcee1352fdffa8ba077ea91f0d2bf125289ff652a33c181e716a0afd3363c2aafe524081dd88b23d3dd4760cca
 AUX libsmi-0.5.0-implicit-function-declarations.patch 1887 BLAKE2B e18558f09095008d79a94a3baddc6e6623865b18b0a829d0e53f0bca7afa23ee4a45eda5c77edc54f3fd88c009d4623673909469164ec9c3d64b19ae35bfdec1 SHA512 ab4e978066252f4a8df72b6877bae8574579c3d06c0d31f268fce50aecd645b1f003b9d29b440070c80ad8025a6599e238399f4d037893e67f31cedb2476593c
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.5.0-r1.ebuild 907 BLAKE2B 17f40eb0eaa4fe0185df81547a9d2ca3774d4b5b6fbed8b0847f864673bed0bc27ecb619e891528b29739cc585625943f32764fc002e9f05b9ada975a01e67bf SHA512 d3e6547e20f38e7003718443df503db97bd1f513fcaced71cd1809bb658f35aa71960fe5fbdec87f82acc135cc463cb3dd2482d90247165385d6ff99f9c687d9
 EBUILD libsmi-0.5.0-r5.ebuild 1240 BLAKE2B 05a920e1e28eb248fcf4a2e6b52ee6da536eae3c20bfe6e74a9031c1e4b0c1d260b5937063a3e02775dd9266430f990ee906a00fd232b075b0006071a22a36de SHA512 6991f362cd035841aacaf6fef683ceae7914864d0c49a9ae777730afc0ffeed7a31d31115acc1c04ca4d086f6b9cdf50953cc56367950489511e7b9ac301ff7f
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
deleted file mode 100644
index 9b676da0898e..000000000000
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A Library to Access SMI MIB Information"
-HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
-SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	# sming test is known to fail and some other fail if LC_ALL!=C:
-	# https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
-	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
-	LC_ALL=C emake -j1 check
-}
-
-src_install() {
-	default
-
-	dodoc ANNOUNCE ChangeLog README THANKS TODO \
-		doc/{*.txt,smi.dia,smi.dtd,smi.xsd} smi.conf-example
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index de1e80c8e235..a587296d274d 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -187,6 +187,6 @@ DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a63
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.22.0.ebuild 5666 BLAKE2B e53eb87b14f56735566b6389159dbcf2a579627a36a9577169b92333fa0570c77f358a573f73cfd3d6c7bfc3ea6a743f7a8da2b8e87a00f5e5201886079bca38 SHA512 639a7fbb356c0017c373b0c9e335a7eda94d5e571942237f9a1353e73c3d7a2b7638db893c6e2e76aafa2e7e22c6a9049b817ab28c9ff7973124ff35af38fbff
-EBUILD quiche-9999.ebuild 5667 BLAKE2B 80af26a6d99e0554c89791fa3a3cf26da57c25a80fad4d4fc35318f8090466bf422b44aab863daf10a02e40433b1640f6297f71ee73b3984e4995859ebf106db SHA512 d0f7ae28e6bbbdc69db363f9188d6965111d3e9d5ba52e70b7273433237e374c77befda3daa56b13184765919c5d345caf3f40208b2b5f1344d7368ee3f7cdb3
+EBUILD quiche-0.22.0-r2.ebuild 5850 BLAKE2B 4bd479115a03989726061adbaf8558c66a1ada53a5248e7fb91487cfca7ae0c8e79bb0e01753e31be80ae5056ceb8c89032989bd2e62ce2f8067f7e8e7e2a1d6 SHA512 11e1b49f301c00ba0c6b55f57cea0b5a260a558bdfbaf563f0286896b6d645a961d9fc1dff76459450599ea9da9ff6c738c98aed82cc729e911c141ef4efa9de
+EBUILD quiche-9999.ebuild 5851 BLAKE2B bd9b3f7cf69fccd6e07f917ae9c7e69e7a5f42190116ec77ca38ffed46d1ab5d493c749b98548e69fd112eb3a9e9575ad4723a05c84bb7fa42a5c13ff1f7a12a SHA512 29e7662f0c2e5d5d3cadf1d4744f3f8244b5ea4d06b6cc4cac77bec205f944819d9b3521a72fdf3187fd792776e1051715078a7e3c6587fcc8da7a280c9e5def
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/quiche-0.22.0.ebuild b/net-libs/quiche/quiche-0.22.0-r2.ebuild
index 7a39592d3b3c..a767d0b6925c 100644
--- a/net-libs/quiche/quiche-0.22.0.ebuild
+++ b/net-libs/quiche/quiche-0.22.0-r2.ebuild
@@ -195,7 +195,9 @@ windows-targets@0.52.5
 ws2_32-sys@0.2.1
 "
 
-inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -225,7 +227,6 @@ IUSE=""
 DOCS=( COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.66.0[${MULTILIB_USEDEP}]
 	dev-build/cmake
 "
 DEPEND=""
@@ -248,6 +249,10 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+src_configure() {
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	append-flags "-fPIC"
 	local mycmakeargs=(
@@ -257,13 +262,25 @@ multilib_src_configure() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
-	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)"
+}
+
+src_install() {
+	multilib-minimal_src_install
 }
 
 multilib_src_install() {
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 85a385a6452c..b01b0f1aace8 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -195,7 +195,9 @@ windows-targets@0.52.5
 ws2_32-sys@0.2.1
 "
 
-inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -225,7 +227,6 @@ IUSE=""
 DOCS=( COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.66.0[${MULTILIB_USEDEP}]
 	dev-build/cmake
 "
 DEPEND=""
@@ -248,6 +249,10 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+src_configure() {
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	append-flags "-fPIC"
 	local mycmakeargs=(
@@ -257,13 +262,25 @@ multilib_src_configure() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
-	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)"
+}
+
+src_install() {
+	multilib-minimal_src_install
 }
 
 multilib_src_install() {
diff --git a/net-libs/rustls-ffi/Manifest b/net-libs/rustls-ffi/Manifest
index 807c9efd58ca..edb0f0ce587d 100644
--- a/net-libs/rustls-ffi/Manifest
+++ b/net-libs/rustls-ffi/Manifest
@@ -207,10 +207,10 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
 DIST winnow-0.4.1.crate 138177 BLAKE2B 9fb55dc5dbca2250c5921aebc42fd8dff7da6fc70656d5690475cf9d81d569b01e68c5134401f70759a9edbe1704cf76727efe5442961b1d220827130497b735 SHA512 390b3da6688d61d90d9bb221d95c7243968209b692737999b13326204954d1e916b390ac8a3a0e0864695ad9a073ed8a79e592ca565be374cc6e909b4166d52a
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
-EBUILD rustls-ffi-0.10.0-r1.ebuild 2429 BLAKE2B 834e8ae3ba8886ee2170c8e5a62f9c882f3b60f8204397d598de3b95d4b2edd324013d4810d3d8ff4abaf5c09e8542d320f01028c48bf074425fb00edba91d06 SHA512 677d5ace039db50d3581a34eb3fc2e2c9f3b636c2993b804cda37a102cda02198bd8a45b5bf763bc3206dc4ca0ecbe4bd1900d53c1db92de9264bd92a081aa1f
-EBUILD rustls-ffi-0.12.1-r2.ebuild 2413 BLAKE2B 7c5e20bd8c82ff986eb12c3cbcdb5e64c5cd44d7007e060e30afd68723ebe4a05cc4b77a6ebcd6c31d72ce26b406992c64adffab2ea00197150d74610b4916b7 SHA512 0c6886c70a6118a9cba72d128a77951b7abe0244a17562d38918a0150bd64e9f5eb916418218dab8d9385ae99c454402db476f1140e4a7660e17212e995f6c87
-EBUILD rustls-ffi-0.12.2.ebuild 2350 BLAKE2B c687a42ed365c1ef386e9cfd83339fe03137c1bc3058718eff641fbe56b1ab52f6a83c2e89eac91dd69bd387faf266e50ac22fceac4903d853a346e3fdd4f1b1 SHA512 7a931f98a44b37667a8a1525c3135e7c9e934f38f4a54ebf3cdcbdb1f5a5d4a2fd5a2d188f747433259a7d507b0d828d40e4a6522250928bdecc16fc5bb4aab8
-EBUILD rustls-ffi-0.13.0.ebuild 2221 BLAKE2B bc51f8d07a9a14c0a3b4b6038d2bbbbf89ae00db126b0e5c5fe64f269c26179bd2d652749b8c04c52611253c92ea6c3fdd42d79fdbbadacaeb51cfdc482a7083 SHA512 ffaaf13bb3b741c49fff80a2070953cae7eca44ba2f8e3a7b13501afaa84aca8ce63f07b8d4bb6f995d883f33c040bc4bcca95236b0db7fe2bdc5194adba46c7
-EBUILD rustls-ffi-0.14.0.ebuild 3813 BLAKE2B b6764d085ed74c55037ec2a45e06024b0817bc132a257570211ee827002698ac9d8ed688c6c50a27adf7e9b8ae5ea6e01c3e0578777ddfb284d0fcfaad994513 SHA512 529051078d685b3b47b4c381c9a1a423f4d8ed7978f909b08667538a7ee5737283d5939bb5bbc37e570fe199e327adfc065a59b30d541859b6a39363d7d1ce77
-EBUILD rustls-ffi-0.9.1-r1.ebuild 2747 BLAKE2B f73c676004c7a4869ada531391b2dd442bc1541259465e3171b8a2f478dbc737d91d7446b52cc6a44ce7716266c7eca0fb5f7cabab4aedab9b8771b6510aab84 SHA512 3fa80f3657fcb1ef2bb6dc8976469c87ac101f616e41626469270d750b1fd9e8fbe67522d90ba46f5ee07f3cd88854d4feff871b8024d2bea9430616b65de9b3
+EBUILD rustls-ffi-0.10.0-r2.ebuild 2602 BLAKE2B c2245e0f13d6c2cb6894d7f80b22f0d046d2c1332fcaaaef96c12b182ab156c6f83f3ad4744e9fc5fce752496bc32b9fb48983595b7e777c514acce1a4a0df9d SHA512 1968a75cf46e5ea0659c34bcaf97bf19a4b53a21f800dae9d9306cd15bbadcdf233de0d0a2f79802aa370f6831f12baf0e93d1651a1821f3d079f9826c47b662
+EBUILD rustls-ffi-0.12.1-r3.ebuild 2586 BLAKE2B a356a642b5ee5b95907c7d33fb4d872b40df0e5858b5d50877bbf8da03fc10aaf4f1ba2e74cc84193c9dc8797e8cf9dc166b355d2a9723afb72214b296864e73 SHA512 7ca15fa6ba2b5e46644a626401b25cab48571317a9d75422cf73a0a020c54467247a30d432f4841a9cf4f305cee1df5304ae424e1abe1163bec28af981d8d628
+EBUILD rustls-ffi-0.12.2-r1.ebuild 2523 BLAKE2B df98a67c59f4f6e65f5878a7bdd9efe1e88d99aabc8ff0b4feaea8a852395a7b015fe548feb275bd25b94ea87123934c8162e9f6b0d77b2915e2912b49ae10a0 SHA512 3d5d46b510e2041ad77b738bbb5e0a17630d159b8f833528d1ddda6d0869fb58014ba504084e9ebc9476125762a826c76164d8797bf1364eccd2ed8764da763c
+EBUILD rustls-ffi-0.13.0-r1.ebuild 2394 BLAKE2B a8e96b1afb1c84e27041eb8d23de78c50a69d69b18729b1fc9acae7f5cad129d3fd462694dddee7f21032c50560ac733281ef9b7a2d7db2531bf295f22594456 SHA512 165e207893eaf4f288bd7adf029286d47cfa416a013f35ae67385ac27067c7a55128c09cb5225406c30ea15c7fab99d117c0600ef7083f30d9eb3f7d02181d91
+EBUILD rustls-ffi-0.14.0.ebuild 3986 BLAKE2B 461e73904d6d5efe90be612999a5f1b2bd1dfb25d9ab835578e0a139605ea99e87f559bbe8f7829d5e560653df477e315f3a4adbeff1e3ecb0dd023f7ab6bac0 SHA512 af050fe80cfaf40376546bcacec28626ae35e8b29fa503b07e0be532196ead8867ee6eb3cef016204a5f917016d0cfc704d031aedff8ee9bb2ff8f0c6d5a5ef0
+EBUILD rustls-ffi-0.9.1-r2.ebuild 2920 BLAKE2B 7ef7f11ec4a0c8741497ec7e04149a3257c89fdc018b6d5836361955eeb99baecab695472b40773804eab011a4fa3d30bbe53e62cde4f1a16feb35ada5e32a70 SHA512 3c5a0d5858661eca1147cecf17e895e9bfb168c992bb6a504a39981a27d107ac454a97bed0550fabb1f9934c79735565230b1f146038916ea8e9c2f3bad3cfb5
 MISC metadata.xml 322 BLAKE2B 8c95cd2d631dfe96e34412bbc1c12bce2f13f631840642f2bd52384b554b0c1eeb03e2b959921ff2cf0f15f9cdb2ba37acc016549f84c47ca6e7ad857cf3e7df SHA512 08c35857ba4e7e85d619e94b5e6f0a3203faced5f83fb7bdb63d8e25c793bfb8af1b5e1f252613fa8e60e45e3e1a5e092b64f96b8ac2156c9f336bab7a4d6ae1
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
index db915dbc209b..47f8f0189fb5 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
@@ -4,54 +4,54 @@
 EAPI=8
 
 CRATES="
-	autocfg-1.1.0
-	base64-0.13.1
-	bumpalo-3.12.0
-	cc-1.0.79
-	cfg-if-1.0.0
-	hashbrown-0.12.3
-	indexmap-1.9.3
-	js-sys-0.3.61
-	libc-0.2.140
-	log-0.4.17
-	memchr-2.5.0
-	num_enum-0.5.11
-	num_enum_derive-0.5.11
-	once_cell-1.17.1
-	proc-macro-crate-1.3.1
-	proc-macro2-1.0.55
-	quote-1.0.26
-	ring-0.16.20
-	rustls-0.21.0
-	rustls-pemfile-0.2.1
-	rustls-webpki-0.100.1
-	rustversion-1.0.12
-	sct-0.7.0
-	spin-0.5.2
-	syn-1.0.109
-	toml_datetime-0.6.1
-	toml_edit-0.19.8
-	unicode-ident-1.0.8
-	untrusted-0.7.1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	web-sys-0.3.61
-	webpki-0.22.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	winnow-0.4.1
+	autocfg@1.1.0
+	base64@0.13.1
+	bumpalo@3.12.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	hashbrown@0.12.3
+	indexmap@1.9.3
+	js-sys@0.3.61
+	libc@0.2.140
+	log@0.4.17
+	memchr@2.5.0
+	num_enum@0.5.11
+	num_enum_derive@0.5.11
+	once_cell@1.17.1
+	proc-macro-crate@1.3.1
+	proc-macro2@1.0.55
+	quote@1.0.26
+	ring@0.16.20
+	rustls@0.21.0
+	rustls-pemfile@0.2.1
+	rustls-webpki@0.100.1
+	rustversion@1.0.12
+	sct@0.7.0
+	spin@0.5.2
+	syn@1.0.109
+	toml_datetime@0.6.1
+	toml_edit@0.19.8
+	unicode-ident@1.0.8
+	untrusted@0.7.1
+	wasm-bindgen@0.2.84
+	wasm-bindgen-backend@0.2.84
+	wasm-bindgen-macro@0.2.84
+	wasm-bindgen-macro-support@0.2.84
+	wasm-bindgen-shared@0.2.84
+	web-sys@0.3.61
+	webpki@0.22.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winnow@0.4.1
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
 SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris)"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
 
 # From cargo-ebuild (note that webpki is also just ISC)
 LICENSE="|| ( MIT Apache-2.0 ) BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016"
@@ -83,6 +83,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -95,6 +99,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix=/usr
@@ -106,6 +114,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
index 962808494628..9bc35e508086 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
@@ -36,8 +36,8 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
@@ -77,6 +77,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -89,6 +93,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix="${EPREFIX}"/usr
@@ -100,6 +108,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
index a09c7412e487..aebb2837d484 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
@@ -36,8 +36,8 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
@@ -73,6 +73,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -85,6 +89,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix="${EPREFIX}"/usr
@@ -96,6 +104,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.13.0.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
index 4f144686f120..f745928b4ab7 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.13.0.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
@@ -37,8 +37,8 @@ CRATES="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
@@ -70,6 +70,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -82,6 +86,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix="${EPREFIX}"/usr
@@ -93,6 +101,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
index c8fa3cd18021..bc429940dc68 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
@@ -115,8 +115,8 @@ CRATES="
 	windows_x86_64_msvc@0.52.4
 	zeroize@1.7.0
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
@@ -151,6 +151,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -163,6 +167,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix="${EPREFIX}"/usr
@@ -174,6 +182,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
index bf9f34bba51c..878decfd7c0d 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
@@ -4,74 +4,74 @@
 EAPI=8
 
 CRATES="
-	ansi_term-0.12.1
-	atty-0.2.14
-	autocfg-1.1.0
-	base64-0.13.1
-	bitflags-1.3.2
-	bumpalo-3.11.1
-	cbindgen-0.19.0
-	cc-1.0.77
-	cfg-if-1.0.0
-	clap-2.34.0
-	fastrand-1.8.0
-	hashbrown-0.12.3
-	heck-0.3.3
-	hermit-abi-0.1.19
-	indexmap-1.9.2
-	instant-0.1.12
-	itoa-1.0.4
-	js-sys-0.3.60
-	libc-0.2.138
-	log-0.4.17
-	num_enum-0.5.7
-	num_enum_derive-0.5.7
-	once_cell-1.16.0
-	proc-macro-crate-1.2.1
-	proc-macro2-1.0.47
-	quote-1.0.21
-	redox_syscall-0.2.16
-	remove_dir_all-0.5.3
-	ring-0.16.20
-	rustls-0.20.4
-	rustls-pemfile-0.2.1
-	rustversion-1.0.9
-	ryu-1.0.11
-	sct-0.7.0
-	serde-1.0.149
-	serde_derive-1.0.149
-	serde_json-1.0.89
-	spin-0.5.2
-	strsim-0.8.0
-	syn-1.0.105
-	tempfile-3.3.0
-	textwrap-0.11.0
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	toml-0.5.9
-	unicode-ident-1.0.5
-	unicode-segmentation-1.10.0
-	unicode-width-0.1.10
-	untrusted-0.7.1
-	vec_map-0.8.2
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	web-sys-0.3.60
-	webpki-0.22.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
+	ansi_term@0.12.1
+	atty@0.2.14
+	autocfg@1.1.0
+	base64@0.13.1
+	bitflags@1.3.2
+	bumpalo@3.11.1
+	cbindgen@0.19.0
+	cc@1.0.77
+	cfg-if@1.0.0
+	clap@2.34.0
+	fastrand@1.8.0
+	hashbrown@0.12.3
+	heck@0.3.3
+	hermit-abi@0.1.19
+	indexmap@1.9.2
+	instant@0.1.12
+	itoa@1.0.4
+	js-sys@0.3.60
+	libc@0.2.138
+	log@0.4.17
+	num_enum@0.5.7
+	num_enum_derive@0.5.7
+	once_cell@1.16.0
+	proc-macro-crate@1.2.1
+	proc-macro2@1.0.47
+	quote@1.0.21
+	redox_syscall@0.2.16
+	remove_dir_all@0.5.3
+	ring@0.16.20
+	rustls@0.20.4
+	rustls-pemfile@0.2.1
+	rustversion@1.0.9
+	ryu@1.0.11
+	sct@0.7.0
+	serde@1.0.149
+	serde_derive@1.0.149
+	serde_json@1.0.89
+	spin@0.5.2
+	strsim@0.8.0
+	syn@1.0.105
+	tempfile@3.3.0
+	textwrap@0.11.0
+	thiserror@1.0.37
+	thiserror-impl@1.0.37
+	toml@0.5.9
+	unicode-ident@1.0.5
+	unicode-segmentation@1.10.0
+	unicode-width@0.1.10
+	untrusted@0.7.1
+	vec_map@0.8.2
+	wasm-bindgen@0.2.83
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-shared@0.2.83
+	web-sys@0.3.60
+	webpki@0.22.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
 "
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
 
 DESCRIPTION="C-to-rustls bindings"
 HOMEPAGE="https://github.com/rustls/rustls-ffi"
 SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris)"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
 
 # From cargo-ebuild (note that webpki is also just ISC)
 LICENSE="|| ( MIT Apache-2.0 ) BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016"
@@ -102,6 +102,10 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	local cargoargs=(
 		--library-type=cdylib
@@ -114,6 +118,10 @@ multilib_src_compile() {
 	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
 multilib_src_test() {
 	local cargoargs=(
 		--prefix=/usr
@@ -125,6 +133,10 @@ multilib_src_test() {
 	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
 }
 
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	local cargoargs=(
 		--library-type=cdylib