commit: 8b23041302f0a57b7035950b7ce25111d51a8a8d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 13:08:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 13:08:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b230413
net-libs/rustls-ffi: fix multilib dep
And then while fixing it, change phases like in
fb6cd96657ff2b678b9568060648bea4e452ce52
until we have a better fix later today.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild | 16 ++++++++++++++--
net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild | 16 ++++++++++++++--
net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild | 16 ++++++++++++++--
net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild | 16 ++++++++++++++--
net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild | 16 ++++++++++++++--
net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild | 16 ++++++++++++++--
6 files changed, 84 insertions(+), 12 deletions(-)
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
index 0c0ba2d6ae50..47f8f0189fb5 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild
@@ -45,8 +45,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -83,6 +83,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -95,6 +99,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix=/usr
@@ -106,6 +114,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
index 962808494628..9bc35e508086 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild
@@ -36,8 +36,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -77,6 +77,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -89,6 +93,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix="${EPREFIX}"/usr
@@ -100,6 +108,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
index a09c7412e487..aebb2837d484 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild
@@ -36,8 +36,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -73,6 +73,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -85,6 +89,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix="${EPREFIX}"/usr
@@ -96,6 +104,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
index 4f144686f120..f745928b4ab7 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild
@@ -37,8 +37,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -70,6 +70,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -82,6 +86,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix="${EPREFIX}"/usr
@@ -93,6 +101,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
index c8fa3cd18021..bc429940dc68 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild
@@ -115,8 +115,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -151,6 +151,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -163,6 +167,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix="${EPREFIX}"/usr
@@ -174,6 +182,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
index 0c4392683cb3..878decfd7c0d 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild
@@ -65,8 +65,8 @@ CRATES="
[email protected]
[email protected]
"
-
-inherit cargo flag-o-matic multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo flag-o-matic rust-toolchain
DESCRIPTION="C-to-rustls bindings"
HOMEPAGE="https://github.com/rustls/rustls-ffi";
@@ -102,6 +102,10 @@ src_configure() {
multilib-minimal_src_configure
}
+src_compile() {
+ multilib-minimal_src_compile
+}
+
multilib_src_compile() {
local cargoargs=(
--library-type=cdylib
@@ -114,6 +118,10 @@ multilib_src_compile() {
cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
}
+src_test() {
+ multilib-minimal_src_test
+}
+
multilib_src_test() {
local cargoargs=(
--prefix=/usr
@@ -125,6 +133,10 @@ multilib_src_test() {
cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
}
+src_install() {
+ multilib-minimal_src_install
+}
+
multilib_src_install() {
local cargoargs=(
--library-type=cdylib
