gentoo resync : 20.03.2022

3 files changed, 227 insertions, 3 deletions

diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 98fe27f7b642..4515813a7b9c 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -29,6 +29,7 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0a04aeeed1475080755fb07853da63353343b0ad66d97588679f461c7f5e5f69b753372174799c52ee7fc3e7d0 SHA512 64577b5f82878ff465eee0bd5f154522640e9bae7e6d52c1c8b868412a2297ded69b104b85b7ca6b6031d6a6eef60579933cb6502bb7342af1f9aa593428a256
 DIST clang-sys-1.2.2.crate 37661 BLAKE2B cbf637171253aca4892270e28c54c43b01cd1d56311555bd6c5e6b142b5f42d561a2808e1ce0baee344d08a2fbc19be1712ca34bbc5b33356a845042ba0df5bd SHA512 7f1736bce5dbc644a4901a73926ea2f6a92a419a7399b6cb49bf8ffed6a3177e9327add6e68fdf6b9966f4b0b580b213555d6cefbe194ad7a4bee987adf555e5
 DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
+DIST clang-sys-1.3.1.crate 37840 BLAKE2B 4c925a684d66fddb5f3953fff6b96fa56b0b996eed227e17873ccd5555baf4ca77964a38ff279999533e7409e2b1d355c13470a6c461fb4b0e11807bc948dbe4 SHA512 aeea37957f7e9a7ecc862f56c6492b68b57217d1a893d3978f5d48d5ef9f80cefa8c52604d7201b9c96402d87ca43ba694890b0bc849d4d623f74ea009ce45bb
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
@@ -76,6 +77,7 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.102.crate 537138 BLAKE2B 2814792c4215555d5a33d4e3d21f2c78e1d9c87b3e1884d7fffa512aaed0737ed2329db6298fc074d477abfdc02f5bd30ec485f3fa7afe7d7a3e608453985c63 SHA512 cec681043b9c279e25ffbfdf2aeffe2a5fe057a8187fc2c986aca9a3fc900eac96ae3134632b124f1aaae4e5d2ecbc7122aeb40d94f83b5ec075769ede361643
 DIST libc-0.2.115.crate 565468 BLAKE2B b13d56f63d9da517d89ec97f8a4b20b6ad14637eda3241b08fd8bbd3244e7821fecdf81721e27653372ecb04f347769c742147c3c747f7cbe678ef78ca737b60 SHA512 885f31e148391d739015e22ca87737041ed4deea25f02e566c31a64a1534d27a29f711e24c2c6eb2614e9f930972220a3a5e20716d7a14a8603239ed21d0c410
+DIST libc-0.2.117.crate 566541 BLAKE2B a0ee103e6167ccf84cbaca9e41934ccaa1f4abcbaad9d7a4d4a8cccdc2f22ff36ccc46a16a295fed9c3113e1534df86a3d19eda9e0cb609bb75145acf8ca9a0a SHA512 1ff22201cad04f8a21674c25bd57e2c708738af7ff1d5677b513d728ecb99f4eec4b78e9685aa633518672de0d44d5dd2e727ee7b6b06c74718181565df3fa7f
 DIST libc-0.2.95.crate 515341 BLAKE2B 5bbb10917433ac9b305e4eadd4626a31149ec46aaef91f7d360bea8b5956499c55066339ea63102e71976a3aa969744c871c0683eb137e3c8ad2f8d62570cea0 SHA512 40ba9908c202f3d40c1bd7d7bf516f3b236e7751020bad0007f185802fada64fc5e959b68a33aa1f59de76d5a649f62bcce7eea671fd420852e0bb902544ebbf
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
@@ -110,6 +112,7 @@ DIST qlog-0.5.0.crate 18586 BLAKE2B 81a2c7650d019069a0ed101e27bfd0fe729fbbcb5c51
 DIST qlog-0.6.0.crate 21322 BLAKE2B 24e74c6ab14820423867dcfe85fbae8fe9912c942afcc4011972049782dfa0ec9f5d2fa55a07358b9bc4f86bdeb422b80e9aac20b2349ec62d19abbacbc05c9d SHA512 29e2945890fd3146af594293c8ad4803cd7a3cf2ddea2cdad62d7c4fe84abcae0875204b08a99bc53c0b0e3519a1634fd3c6eb99b50854655de1b30fb8ae0a34
 DIST quiche-0.10.0.crate 3604568 BLAKE2B b79bf113e21bfe613ef88a1279f0a6be2df5efa82db719a8407ff5db2f1f757a076326e1f243483e042000dfdee6bf81a649b51384a8f804f39016d388e14efe SHA512 94265a4245dd64e40e211a8e3dda356c0774971009afe0aa6c10c507d688535a3e54d318217de4b98de1b7828a5de921e6490003d55a77b7a4fd5b1316a262a3
 DIST quiche-0.11.0.crate 3608178 BLAKE2B 8a2d01733dc3094237be1371a9f6ad33ed27a40289c16c41febcd20ed1d091a2b68c7c2f43a034c7a2a7779a3060813bdaacee6a4bdc96f82d7b2a14db217876 SHA512 293e95302dc812f5be24ff5153ec979fc0fa802b374b734dd2fae152532ba0d7eaf91a192c86959e8fdd6ea5017303c4b72076f3bc2bc80ce6636285759aeb60
+DIST quiche-0.12.0.crate 3608965 BLAKE2B 9694a97eb276c4302ebf9b425e8aa35d44535d45233600e487d427cf922d7bae664120726c741d36074373e6eb7f16801ac6c192958513117922ddc11cadb165 SHA512 85c48e8f9da82ff58a0f6e06cd3ec2fdb50b51fc0e904fdef85340f29d8bd5d693f9fad3db04b0ad36ac1a014536778daef163ef1574cd33cf272c4be6b88184
 DIST quiche-0.9.0.crate 3536510 BLAKE2B 0051d349677f7a5b9c7560c8765c8eaa551ee2575a7234f01eab32878140cdf2ffedc5dd78abe3156ac554f7c4d0d078ba1ebaba93870a3445e63ccb2fb201eb SHA512 791945f5c15dfbf018f6329b7fb8e0b19912d1ed85b58e6490df5a72115a715f654ac57c5a5658877f5e7e4a5e365535b89172667c42a9425c5528973e157de8
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
@@ -207,6 +210,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.10.0.ebuild 4388 BLAKE2B 7723e5f6b1cd1a5f052dccbbecb9decfe241529162464c1eaf4533e0bf61aab0c745cdd29b5c0cde64f37105c2042b1ab8e880377bee7cd7f61b747e4890828e SHA512 da18092392eec34d21110f18f3dc075b31308f2bc87eef885d8d85a5a4de2f479d5991854e846626867a479d33465d4a5d76658d1d258c99fc119ff2bd2a21ee
 EBUILD quiche-0.11.0.ebuild 4525 BLAKE2B ba53f89b0e54312b7009e2efaba5defd9974a8720107193eb63b6aceedf79ac38c70e957321272d894d1b04ec71fd5f463cd7a41ee31c712157122120fc386cb SHA512 38554157f972a37a864a0ac39f3b6b23dc596b9fabd513995ad9d7ee8267f93938a3bee15a7d330db3337a9dc935ee4682ea74fc98a7a338ed3eab5a7bd34511
+EBUILD quiche-0.12.0.ebuild 4459 BLAKE2B 2e8b1284efe314e7bb78ba897ff31fa1943f8b83230447e5bd79ba3677d7c17df15416b67f1692a143bb15e07a8db1a91c6be7140de317771a10e91d5e7be7b8 SHA512 3e449cf3fbbef5ac984f9bba58d1820a5d2bb1d9c5b0550c19ef26286ae73fca19ef0d2f91682ee922d431c8465aec23bff98d5f8521155e0f7692c9558dcf50
 EBUILD quiche-0.9.0-r1.ebuild 4385 BLAKE2B 1c130db59001681420c487d090436dcdc195010c27f1ad9a1cab4abdcbcf37a2d8aae42a28ef9df5aa984b6ddb445c5b6b3b880caee86f77a4014a7fe33f233b SHA512 42624f53406d711dfe664d9aabffa36dc997f0ddc7b18aa5b77802633fa4b92c9bd76ba0ef767c2d6851b78adf8df9a1626e4b24fed1bd13a332102f9c12e847
-EBUILD quiche-9999.ebuild 4459 BLAKE2B 6edbefd6b1f40e28b40d17b497d84587d71560906c6170182d2b88d7620519ce3b4e7242982328252b4e5a9f427212a8e98c5d3e2c4c7c0383a3239f2e4aa78b SHA512 0bcdcbc6a20a9eb241d1f667d1d15767cd5d03003bdc72ad5dc3e0e2a13aeeb60a10bf090b205bc5db9d193405029f21ec948a6ffeff56585d9339bfd132d1e4
+EBUILD quiche-9999.ebuild 4459 BLAKE2B 2e8b1284efe314e7bb78ba897ff31fa1943f8b83230447e5bd79ba3677d7c17df15416b67f1692a143bb15e07a8db1a91c6be7140de317771a10e91d5e7be7b8 SHA512 3e449cf3fbbef5ac984f9bba58d1820a5d2bb1d9c5b0550c19ef26286ae73fca19ef0d2f91682ee922d431c8465aec23bff98d5f8521155e0f7692c9558dcf50
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/quiche-0.12.0.ebuild b/net-libs/quiche/quiche-0.12.0.ebuild
new file mode 100644
index 000000000000..95504d377f49
--- /dev/null
+++ b/net-libs/quiche/quiche-0.12.0.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.59.2
+bitflags-1.3.2
+boring-sys-2.0.0
+bstr-0.2.12
+bumpalo-3.9.1
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.72
+cexpr-0.6.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.3.1
+clap-2.33.3
+cmake-0.1.48
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.13.1
+darling_core-0.13.1
+darling_macro-0.13.1
+env_logger-0.8.4
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.11.2
+hermit-abi-0.1.19
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-1.0.1
+js-sys-0.3.56
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.117
+libloading-0.7.3
+libm-0.2.1
+log-0.4.14
+matches-0.1.9
+maybe-uninit-2.0.0
+memchr-2.4.1
+memoffset-0.5.3
+minimal-lexical-0.2.1
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-7.1.0
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.8.0
+once_cell-1.9.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.36
+qlog-0.6.0
+quote-1.0.15
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.5.4
+regex-automata-0.1.9
+regex-syntax-0.6.25
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.6
+ryu-1.0.9
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.136
+serde_derive-1.0.136
+serde_json-1.0.78
+serde_with-1.11.0
+serde_with_macros-1.5.1
+shlex-1.1.0
+slab-0.4.5
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.86
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-width-0.1.9
+unicode-xid-0.1.0
+unicode-xid-0.2.2
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.1
+wasm-bindgen-0.2.79
+wasm-bindgen-backend-0.2.79
+wasm-bindgen-macro-0.2.79
+wasm-bindgen-macro-support-0.2.79
+wasm-bindgen-shared-0.2.79
+wasm-bindgen-webidl-0.2.75
+web-sys-0.3.56
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+	CMAKE_USE_DIR="${S}/quiche/deps/boringssl"
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+	CMAKE_USE_DIR="${S}/deps/boringssl"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+BUILD_DIR="${WORKDIR}/${P}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
+}
+
+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)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/$(rust_abi)/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 510c2a7fa793..95504d377f49 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -23,7 +23,7 @@ cc-1.0.72
 cexpr-0.6.0
 cfg-if-0.1.10
 cfg-if-1.0.0
-clang-sys-1.3.0
+clang-sys-1.3.1
 clap-2.33.3
 cmake-0.1.48
 criterion-0.3.1
@@ -55,7 +55,7 @@ js-sys-0.3.56
 kernel32-sys-0.2.2
 lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.115
+libc-0.2.117
 libloading-0.7.3
 libm-0.2.1
 log-0.4.14