summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/nghttp3/nghttp3-0_pre20190912.ebuild5
-rw-r--r--net-libs/nghttp3/nghttp3-9999.ebuild5
-rw-r--r--net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild5
-rw-r--r--net-libs/ngtcp2/ngtcp2-9999.ebuild5
-rw-r--r--net-libs/quiche/quiche-0.1.0-r1.ebuild8
-rw-r--r--net-libs/quiche/quiche-9999.ebuild8
6 files changed, 20 insertions, 16 deletions
diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
index 82c8375e72b0..03aecea14f7e 100644
--- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
+++ b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]] ; then
@@ -33,9 +34,9 @@ multilib_src_configure() {
-DENABLE_EXAMPLES=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_test() {
- cmake-utils_src_make check
+ cmake_build check
}
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 7df7eb88b3ac..d6e17cdeb225 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]] ; then
@@ -31,9 +32,9 @@ multilib_src_configure() {
-DENABLE_EXAMPLES=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_test() {
- cmake-utils_src_make check
+ cmake_build check
}
diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
index 044390610304..b5cafbd8d8df 100644
--- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]] ; then
@@ -35,9 +36,9 @@ multilib_src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_test() {
- cmake-utils_src_make check
+ cmake_build check
}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 43db6bf28c55..8031a8e7028a 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
if [[ ${PV} == 9999 ]] ; then
@@ -33,9 +34,9 @@ multilib_src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_test() {
- cmake-utils_src_make check
+ cmake_build check
}
diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
index 38155800dc09..8b2edcdb5727 100644
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -122,7 +122,7 @@ wincolor-1.0.2
ws2_32-sys-0.2.1
"
-inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+inherit cargo cmake 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-utils_src_prepare
+ cmake_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-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 pkg-config-meta --target="$(rust_abi)"
}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index f1dc7f801705..6a43728ec78d 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 cmake-utils flag-o-matic multilib-minimal rust-toolchain
+inherit cargo cmake 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-utils_src_prepare
+ cmake_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-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 pkg-config-meta --target="$(rust_abi)"
}