public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/
Date: Sat,  9 Nov 2024 13:10:13 +0000 (UTC)	[thread overview]
Message-ID: <1731157734.8b23041302f0a57b7035950b7ce25111d51a8a8d.sam@gentoo> (raw)

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="
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winnow@0.4.1
 "
-
-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="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-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="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-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="
 	windows_x86_64_msvc@0.48.5
 	zeroize@1.7.0
 "
-
-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="
 	windows_x86_64_msvc@0.52.4
 	zeroize@1.7.0
 "
-
-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="
 	winapi-i686-pc-windows-gnu@0.4.0
 	winapi-x86_64-pc-windows-gnu@0.4.0
 "
-
-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


             reply	other threads:[~2024-11-09 13:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-09 13:10 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-01 23:38 [gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/ Matt Jolly
2024-11-09 13:00 Sam James
2024-11-08  4:07 Matt Jolly
2024-11-08  4:07 Matt Jolly
2024-11-08  3:49 Sam James
2024-11-08  3:47 Sam James
2024-04-20  4:42 Sam James
2024-04-20  4:42 Sam James
2024-04-01  3:46 Sam James
2024-03-28  0:45 Sam James
2024-03-28  0:45 Sam James
2023-09-25  4:23 Sam James
2023-09-25  4:05 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1731157734.8b23041302f0a57b7035950b7ce25111d51a8a8d.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox