net-libs/quiche: migrate from 'cmake-utils' to 'cmake'

Closes: https://bugs.gentoo.org/811954
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews@gentoo.org>

2 files changed, 224 insertions, 5 deletions

diff --git a/net-libs/quiche/quiche-0.9.0-r1.ebuild b/net-libs/quiche/quiche-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e3b15c8690e5
--- /dev/null
+++ b/net-libs/quiche/quiche-0.9.0-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 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.57.0
+bitflags-1.2.1
+boring-sys-1.1.1
+bstr-0.2.12
+bumpalo-3.7.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.68
+cexpr-0.4.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.2.0
+clap-2.33.3
+cmake-0.1.45
+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.0
+darling_core-0.13.0
+darling_macro-0.13.0
+env_logger-0.8.3
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.9.1
+hermit-abi-0.1.18
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+js-sys-0.3.51
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.95
+libloading-0.7.0
+libm-0.2.1
+log-0.4.14
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.4.0
+memoffset-0.5.3
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-5.1.2
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.6.2
+once_cell-1.7.2
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.27
+qlog-0.4.0
+quote-1.0.9
+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.5
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+serde_with-1.9.2
+serde_with_macros-1.4.2
+shlex-0.1.1
+slab-0.4.3
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.72
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-width-0.1.8
+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.3
+walkdir-2.3.1
+wasm-bindgen-0.2.74
+wasm-bindgen-backend-0.2.74
+wasm-bindgen-macro-0.2.74
+wasm-bindgen-macro-support-0.2.74
+wasm-bindgen-shared-0.2.74
+wasm-bindgen-webidl-0.2.74
+web-sys-0.3.51
+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
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	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.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+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() {
+	default
+	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/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"
+	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 d2759feb7f7f..e3b15c8690e5 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 ws2_32-sys-0.2.1
 "
 
-inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+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"
@@ -172,6 +172,7 @@ DEPEND=""
 RDEPEND=""
 
 CMAKE_USE_DIR="${S}/deps/boringssl"
+BUILD_DIR="${WORKDIR}/${P}"
 
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
@@ -185,7 +186,7 @@ src_unpack() {
 
 src_prepare() {
 	default
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	multilib_copy_sources
 }
 
@@ -195,11 +196,11 @@ multilib_src_configure() {
 		-DOPENSSL_NO_ASM=ON
 		-DBUILD_SHARED_LIBS=OFF
 	)
-	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
 }
 
 multilib_src_compile() {
-	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	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)"
 }
 
@@ -215,5 +216,4 @@ multilib_src_install() {
 	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
-
 }