commit:     c9e6756894c481964d49f031827edd6aff91d40b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 17:13:01 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 17:13:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e67568

net-libs/quiche: Switch back to cmake-utils.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/quiche/quiche-0.1.0-r1.ebuild | 10 +++++-----
 net-libs/quiche/quiche-9999.ebuild     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild 
b/net-libs/quiche/quiche-0.1.0-r1.ebuild
index 8b2edcdb572..1caba1ec4de 100644
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
+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";
@@ -173,7 +173,7 @@ src_unpack() {
 
 src_prepare(){
        default
-       cmake_src_prepare
+       cmake-utils_src_prepare
        multilib_copy_sources
 }
 
@@ -183,11 +183,11 @@ multilib_src_configure(){
                -DOPENSSL_NO_ASM=ON
                -DBUILD_SHARED_LIBS=OFF
        )
-       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
+       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
 }
 
 multilib_src_compile(){
-       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
+       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)"
 }
 

diff --git a/net-libs/quiche/quiche-9999.ebuild 
b/net-libs/quiche/quiche-9999.ebuild
index 6a43728ec78..8d70ad34dc5 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
+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";
@@ -173,7 +173,7 @@ src_unpack() {
 
 src_prepare(){
        default
-       cmake_src_prepare
+       cmake-utils_src_prepare
        multilib_copy_sources
 }
 
@@ -183,11 +183,11 @@ multilib_src_configure(){
                -DOPENSSL_NO_ASM=ON
                -DBUILD_SHARED_LIBS=OFF
        )
-       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
+       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
 }
 
 multilib_src_compile(){
-       BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
+       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)"
 }
 

Reply via email to