gentoo resync : 02.02.2022

1 files changed, 47 insertions, 46 deletions

diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 1af1e9043742..510c2a7fa793 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.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=7
@@ -12,20 +12,20 @@ atty-0.2.14
 autocfg-1.0.1
 backtrace-0.3.37
 backtrace-sys-0.1.31
-bindgen-0.57.0
+bindgen-0.59.2
 bitflags-1.3.2
-boring-sys-1.1.1
+boring-sys-2.0.0
 bstr-0.2.12
-bumpalo-3.7.1
+bumpalo-3.9.1
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.70
-cexpr-0.4.0
+cc-1.0.72
+cexpr-0.6.0
 cfg-if-0.1.10
 cfg-if-1.0.0
-clang-sys-1.2.2
+clang-sys-1.3.0
 clap-2.33.3
-cmake-0.1.45
+cmake-0.1.48
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -35,9 +35,9 @@ crossbeam-utils-0.7.2
 csv-1.1.3
 csv-core-0.1.10
 either-1.5.3
-darling-0.13.0
-darling_core-0.13.0
-darling_macro-0.13.0
+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
@@ -50,34 +50,35 @@ ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-0.4.8
-js-sys-0.3.55
+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.102
-libloading-0.7.0
+libc-0.2.115
+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-5.1.2
+nom-7.1.0
 num-traits-0.2.11
 num_cpus-1.12.0
 peeking_take_while-0.1.2
-indexmap-1.7.0
-once_cell-1.8.0
+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.29
-qlog-0.5.0
-quote-1.0.9
+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
@@ -86,30 +87,30 @@ regex-syntax-0.6.25
 ring-0.16.20
 rustc_version-0.2.3
 rustc-hash-1.1.0
-rustversion-1.0.5
-ryu-1.0.5
+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.130
-serde_derive-1.0.130
-serde_json-1.0.68
-serde_with-1.10.0
-serde_with_macros-1.5.0
-shlex-0.1.1
-slab-0.4.4
+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.76
+syn-1.0.86
 termcolor-1.1.2
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-1.4.0
+tinyvec-1.5.1
 tinyvec_macros-0.1.0
-unicode-bidi-0.3.6
+unicode-bidi-0.3.7
 unicode-normalization-0.1.19
 unicode-width-0.1.9
 unicode-xid-0.1.0
@@ -117,15 +118,15 @@ unicode-xid-0.2.2
 untrusted-0.7.1
 url-1.7.2
 vec_map-0.8.2
-version_check-0.9.3
+version_check-0.9.4
 walkdir-2.3.1
-wasm-bindgen-0.2.78
-wasm-bindgen-backend-0.2.78
-wasm-bindgen-macro-0.2.78
-wasm-bindgen-macro-support-0.2.78
-wasm-bindgen-shared-0.2.78
-wasm-bindgen-webidl-0.2.74
-web-sys-0.3.55
+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
@@ -144,11 +145,13 @@ 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 )
@@ -162,7 +165,7 @@ LICENSE="|| ( Apache-2.0 Boost-1.0 )
 	openssl"
 SLOT="0/0"
 IUSE=""
-DOCS=( CODEOWNERS  COPYING README.md )
+DOCS=( COPYING README.md )
 
 BDEPEND="
 	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
@@ -171,7 +174,6 @@ BDEPEND="
 DEPEND=""
 RDEPEND=""
 
-CMAKE_USE_DIR="${S}/deps/boringssl"
 BUILD_DIR="${WORKDIR}/${P}"
 
 src_unpack() {
@@ -185,7 +187,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
 	cmake_src_prepare
 	multilib_copy_sources
 }
@@ -209,9 +210,9 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	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/release/quiche.pc
+	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