From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 net-libs/quiche/Manifest               |   4 +-
 net-libs/quiche/quiche-0.1.0-r1.ebuild | 204 +++++++++++++++++++++++++++++++++
 net-libs/quiche/quiche-0.1.0.ebuild    | 190 ------------------------------
 net-libs/quiche/quiche-9999.ebuild     |  26 ++++-
 4 files changed, 226 insertions(+), 198 deletions(-)
 create mode 100644 net-libs/quiche/quiche-0.1.0-r1.ebuild
 delete mode 100644 net-libs/quiche/quiche-0.1.0.ebuild

(limited to 'net-libs/quiche')

diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 105215d86b50..941dc0d41a47 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -132,7 +132,7 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.1.0.ebuild 3416 BLAKE2B 3f8e6d6255a0f918e75c68aa7d236552d7265f292a3dfcb447c6f53662f2a9899cd016cf3841183196a45176e6cd8366c4c7468d4b758b22fb778967b43a3a05 SHA512 371ca431bdaac4aed1ff9916233132b50047bb69550bbf69d80512d70794d59912abb1e8e08395f1f9eb7390d8e6cf426d1e7635739347cec4fff4e29ad27b61
+EBUILD quiche-0.1.0-r1.ebuild 3988 BLAKE2B 39f2e25701cf7bd72fac25257f43088dc51f19fcfd24bb0e031615c307fadb670b0a7940c7dc6deff0d8e35f4e0abd2f5b8d460626ce25aac051f5649850b505 SHA512 9c00fad5edadc7d28662872ecc947889921a221e3ba91ceaf0d672549d105c571013cdc37eaf08e0c7cf6af9397d3488431a146e56f5c39c5b8d5de329707bd6
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
-EBUILD quiche-9999.ebuild 3415 BLAKE2B 7e3e0cb674eb426272e8dfc52ebed7f10bba3ebe5d58e697f214a152abeba6dc2db6956fb9ce22f378caa65fce97c2bd8f0717784dc8986434054873e64fb7be SHA512 8f573254a6230e6fb22b32094efa2f59da06befb4f0a59e4d88ff94f6a4b1fd14b5f56e752e2bd77746826f957015004e5fc337fedbd74ef4b224ecf82e7cdd0
+EBUILD quiche-9999.ebuild 3987 BLAKE2B f9fa4525be4439f8ac2b8526a9223352289896b939bc96bb313f011996429d8f917c050fe654aa811848210bbbb1c66f6a35566ae767c73e31f076e7102a1991 SHA512 c89f95f983dc18c08add4031158b8b5d40a233e5dde382717d2325489d8a534531c2eaedf61d28937922c34a61ba2c4bed461c1b30b4e0c4b4d135ec0b2d6779
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..68ddc23bf7a3
--- /dev/null
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.38
+backtrace-sys-0.1.31
+bitflags-1.2.0
+bstr-0.2.8
+bumpalo-2.6.0
+byteorder-1.3.2
+cast-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.42
+criterion-0.3.0
+criterion-plot-0.4.0
+crossbeam-deque-0.7.1
+crossbeam-epoch-0.7.2
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+csv-1.1.1
+csv-core-0.1.6
+docopt-1.1.0
+either-1.5.3
+env_logger-0.6.2
+failure-0.1.5
+failure_derive-0.1.5
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.1.12
+heck-0.3.1
+humantime-1.3.0
+idna-0.1.5
+iovec-0.1.2
+itertools-0.8.0
+itoa-0.4.4
+js-sys-0.3.28
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+memoffset-0.5.1
+mio-0.6.19
+miow-0.2.1
+net2-0.2.33
+nodrop-0.1.13
+nom-4.2.3
+num-traits-0.2.8
+num_cpus-1.10.1
+percent-encoding-1.0.1
+proc-macro2-0.4.30
+proc-macro2-1.0.4
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand_core-0.5.1
+rand_os-0.2.2
+rand_xoshiro-0.3.1
+rayon-1.2.0
+rayon-core-1.6.0
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+ring-0.16.9
+rustc-demangle-0.1.16
+rustc_version-0.2.3
+ryu-1.0.0
+same-file-1.0.5
+scopeguard-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.40
+slab-0.4.2
+smallvec-0.6.10
+sourcefile-0.1.4
+spin-0.5.2
+strsim-0.9.2
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+tinytemplate-1.0.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.0
+url-1.7.2
+version_check-0.1.5
+walkdir-2.2.9
+wasi-0.7.0
+wasm-bindgen-0.2.51
+wasm-bindgen-backend-0.2.51
+wasm-bindgen-macro-0.2.51
+wasm-bindgen-macro-support-0.2.51
+wasm-bindgen-shared-0.2.51
+wasm-bindgen-webidl-0.2.51
+web-sys-0.3.28
+weedle-0.10.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.2
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+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
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${P//_/-}"
+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=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+	dev-lang/go
+	dev-lang/perl
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+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(){
+	default
+	cmake-utils_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-utils_src_configure
+}
+
+multilib_src_compile(){
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features 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/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+}
diff --git a/net-libs/quiche/quiche-0.1.0.ebuild b/net-libs/quiche/quiche-0.1.0.ebuild
deleted file mode 100644
index 8736c5d257b0..000000000000
--- a/net-libs/quiche/quiche-0.1.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-arrayvec-0.4.11
-atty-0.2.13
-autocfg-0.1.6
-backtrace-0.3.38
-backtrace-sys-0.1.31
-bitflags-1.2.0
-bstr-0.2.8
-bumpalo-2.6.0
-byteorder-1.3.2
-cast-0.2.2
-cc-1.0.45
-cfg-if-0.1.10
-clap-2.33.0
-cmake-0.1.42
-criterion-0.3.0
-criterion-plot-0.4.0
-crossbeam-deque-0.7.1
-crossbeam-epoch-0.7.2
-crossbeam-queue-0.1.2
-crossbeam-utils-0.6.6
-csv-1.1.1
-csv-core-0.1.6
-docopt-1.1.0
-either-1.5.3
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-getrandom-0.1.12
-heck-0.3.1
-humantime-1.3.0
-idna-0.1.5
-iovec-0.1.2
-itertools-0.8.0
-itoa-0.4.4
-js-sys-0.3.28
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.62
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-memoffset-0.5.1
-mio-0.6.19
-miow-0.2.1
-net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.8
-num_cpus-1.10.1
-percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.4
-quick-error-1.2.2
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
-rayon-1.2.0
-rayon-core-1.6.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
-rustc_version-0.2.3
-ryu-1.0.0
-same-file-1.0.5
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.101
-serde_derive-1.0.101
-serde_json-1.0.40
-slab-0.4.2
-smallvec-0.6.10
-sourcefile-0.1.4
-spin-0.5.2
-strsim-0.9.2
-syn-0.15.44
-syn-1.0.5
-synstructure-0.10.2
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-tinytemplate-1.0.2
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-untrusted-0.7.0
-url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.7.0
-wasm-bindgen-0.2.51
-wasm-bindgen-backend-0.2.51
-wasm-bindgen-macro-0.2.51
-wasm-bindgen-macro-support-0.2.51
-wasm-bindgen-shared-0.2.51
-wasm-bindgen-webidl-0.2.51
-web-sys-0.3.28
-weedle-0.10.0
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
-ws2_32-sys-0.2.1
-"
-
-inherit cargo 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
-else
-	CRATES+=" ${P//_/-}"
-	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${P//_/-}"
-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=( CODEOWNERS  COPYING README.md )
-
-BDEPEND="
-	>=virtual/rust-1.35.0
-	dev-util/cmake
-	dev-lang/go
-"
-DEPEND=""
-RDEPEND=""
-
-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(){
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile(){
-	cargo_src_compile --features pkg-config-meta
-}
-
-multilib_src_test(){
-	cargo_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
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins target/release/quiche.pc
-	doheader -r include/*
-	dolib.so target/release/libquiche.so
-}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 0c71fee6d049..f641b6907a83 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo multilib-minimal
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -133,7 +133,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -151,13 +151,16 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.35.0
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
+	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
 
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -170,15 +173,26 @@ src_unpack() {
 
 src_prepare(){
 	default
+	cmake-utils_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-utils_src_configure
+}
+
 multilib_src_compile(){
-	cargo_src_compile --features pkg-config-meta
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
 multilib_src_test(){
-	cargo_src_test
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
 multilib_src_install() {
@@ -186,5 +200,5 @@ multilib_src_install() {
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins target/release/quiche.pc
 	doheader -r include/*
-	dolib.so target/release/libquiche.so
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
 }
-- 
cgit v1.2.3