[gentoo-commits] repo/gentoo:master commit in: app-emulation/ruffle/

[Ionen Wolkens]

commit:     bb94019db06fdeb28b3f140d4c97e1abbce4fe99
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 13:17:41 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 13:26:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb94019d

app-emulation/ruffle: update live

dasp workaround is finally obsolete

tests patch had to be updated due to moved files,
but otherwise is unchanged.

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

 app-emulation/ruffle/ruffle-9999.ebuild | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/app-emulation/ruffle/ruffle-9999.ebuild 
b/app-emulation/ruffle/ruffle-9999.ebuild
index a54f26933afa..0e624cd11f48 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo desktop flag-o-matic git-r3 xdg
+inherit cargo desktop git-r3 xdg
 
 DESCRIPTION="Flash Player emulator written in Rust"
 HOMEPAGE="https://ruffle.rs/";
@@ -38,38 +38,21 @@ DEPEND="
 BDEPEND="
        virtual/jre:*
        virtual/pkgconfig
-       >=virtual/rust-1.70
+       >=virtual/rust-1.72
 "
 
 QA_FLAGS_IGNORED="usr/bin/${PN}.*"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-0_p20230724-skip-render-tests.patch
+       "${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
 )
 
 src_unpack() {
        git-r3_src_unpack
-
-       # hack: cargo_live_src_unpack (currently) fails due to dasp being
-       # vendored from two sources, roughly merge with a patch directive
-       # https://github.com/rust-lang/cargo/issues/10310
-       local rev=$(sed -En '/^dasp =/s/.*, rev = "([a-z0-9]+).*/\1/p' \
-               "${S}"/core/Cargo.toml) # skip || die
-       if [[ ${rev} ]]; then
-               cat >> "${S}"/Cargo.toml <<-EOF || die
-                       [patch.crates-io]
-                       dasp_sample = { git = 
"https://github.com/RustAudio/dasp";, rev = "${rev}" }
-               EOF
-       else
-               eqawarn "dasp hack either needs an update or removal"
-       fi
-
        cargo_live_src_unpack
 }
 
 src_configure() {
-       filter-lto # TODO: cleanup after bug #893658
-
        # see .cargo/config.toml, only needed if RUSTFLAGS is set by the user
        [[ -v RUSTFLAGS ]] && RUSTFLAGS+=" --cfg=web_sys_unstable_apis"
 
@@ -79,7 +62,7 @@ src_configure() {
                $(usev test tests)
        )
 
-       cargo_src_configure ${workspaces[*]/#/--package=}
+       cargo_src_configure "${workspaces[@]/#/--package=}"
 }
 
 src_test() {