commit:     9be10e73612456cded43ee76f513436f49bf65d0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 02:52:34 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 02:58:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be10e73

app-emulation/ruffle: adjust workspace handling

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/ruffle/ruffle-0_p20230525.ebuild | 12 ++++++------
 app-emulation/ruffle/ruffle-9999.ebuild        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-emulation/ruffle/ruffle-0_p20230525.ebuild 
b/app-emulation/ruffle/ruffle-0_p20230525.ebuild
index 9b524bb27a10..437ae7c21095 100644
--- a/app-emulation/ruffle/ruffle-0_p20230525.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20230525.ebuild
@@ -587,12 +587,12 @@ src_configure() {
        # see .cargo/cargo.toml, only needed if RUSTFLAGS is set by the user
        [[ -v RUSTFLAGS ]] && RUSTFLAGS+=" --cfg=web_sys_unstable_apis"
 
-       if use test; then
-               # tests will be skipped if don't build everything
-               cargo_src_configure --workspace
-       else
-               cargo_src_configure 
--package={ruffle_{desktop,scanner},exporter}
-       fi
+       local workspaces=(
+               ruffle_{desktop,scanner}
+               exporter
+               $(usev test tests)
+       )
+       cargo_src_configure ${workspaces[*]/#/--package=}
 }
 
 src_test() {

diff --git a/app-emulation/ruffle/ruffle-9999.ebuild 
b/app-emulation/ruffle/ruffle-9999.ebuild
index dc60eb5bf290..e0410394da4a 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -68,12 +68,12 @@ src_configure() {
        # see .cargo/cargo.toml, only needed if RUSTFLAGS is set by the user
        [[ -v RUSTFLAGS ]] && RUSTFLAGS+=" --cfg=web_sys_unstable_apis"
 
-       if use test; then
-               # tests will be skipped if don't build everything
-               cargo_src_configure --workspace
-       else
-               cargo_src_configure 
--package={ruffle_{desktop,scanner},exporter}
-       fi
+       local workspaces=(
+               ruffle_{desktop,scanner}
+               exporter
+               $(usev test tests)
+       )
+       cargo_src_configure ${workspaces[*]/#/--package=}
 }
 
 src_test() {

Reply via email to