From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65103158042 for ; Sat, 9 Nov 2024 13:10:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 754A4E088A; Sat, 9 Nov 2024 13:10:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55E42E088A for ; Sat, 9 Nov 2024 13:10:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58477335C52 for ; Sat, 9 Nov 2024 13:10:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB01C1953 for ; Sat, 9 Nov 2024 13:10:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731157734.8b23041302f0a57b7035950b7ce25111d51a8a8d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/rustls-ffi/rustls-ffi-0.10.0-r2.ebuild net-libs/rustls-ffi/rustls-ffi-0.12.1-r3.ebuild net-libs/rustls-ffi/rustls-ffi-0.12.2-r1.ebuild net-libs/rustls-ffi/rustls-ffi-0.13.0-r1.ebuild net-libs/rustls-ffi/rustls-ffi-0.14.0.ebuild net-libs/rustls-ffi/rustls-ffi-0.9.1-r2.ebuild X-VCS-Directories: net-libs/rustls-ffi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8b23041302f0a57b7035950b7ce25111d51a8a8d X-VCS-Branch: master Date: Sat, 9 Nov 2024 13:10:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 769f1a55-b422-4d65-9af4-42c3742bae69 X-Archives-Hash: b69ba3ed66178de20eb5e28843351c3b commit: 8b23041302f0a57b7035950b7ce25111d51a8a8d Author: Sam James gentoo org> AuthorDate: Sat Nov 9 13:08:54 2024 +0000 Commit: Sam James gentoo 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 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