[gentoo-commits] repo/gentoo:master commit in: media-libs/libdovi/

[Ionen Wolkens]

commit:     6b8004c0feea76de89abf38f7e0e2b2c2fca1001
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 10:31:53 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 10:31:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8004c0

media-libs/libdovi: adjust style

Prefer to avoid having pseudo-duplicate phases where possible.

Also simplify src_test, this has no tests (thus why there was no
phase defined using cargo-c) but still need to avoid cargo_src_test
or it'll start compiling.

Bug: https://bugs.gentoo.org/943114
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/libdovi/libdovi-3.3.1-r1.ebuild | 54 ++++++++++++++----------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/media-libs/libdovi/libdovi-3.3.1-r1.ebuild 
b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
index a6f9eb1cf1c3..6a4caf5acf88 100644
--- a/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
+++ b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
@@ -89,9 +89,7 @@ CRATES="
        windows_x86_64_msvc@0.52.6
        wyz@0.5.1
 "
-
 RUST_USEDEP='${MULTILIB_USEDEP}'
-
 inherit multilib-minimal cargo edo rust-toolchain
 
 DESCRIPTION="Dolby Vision metadata parsing and writing"
@@ -119,44 +117,42 @@ src_prepare() {
        multilib_copy_sources
 }
 
-multilib_src_configure() {
-       local -n cargoargs=${PN}_CARGOARGS_${ABI}
-
-       cargoargs=(
-               --prefix="${EPREFIX}/usr"
-               --libdir="${EPREFIX}/usr/$(get_libdir)"
-               --library-type=cdylib
-               --target="$(rust_abi)"
-               # cargo cbuild --help claims dev is default but (currently) 
this seems
-               # to always use release unless --profile=dev is explicitly 
passed?
-               $(usex debug --profile=dev --release)
-       )
-}
-
 src_configure() {
+       multilib_src_configure() {
+               local -n cargoargs=${PN}_CARGOARGS_${ABI}
+
+               cargoargs=(
+                       --prefix="${EPREFIX}/usr"
+                       --libdir="${EPREFIX}/usr/$(get_libdir)"
+                       --library-type=cdylib
+                       --target="$(rust_abi)"
+                       # cargo cbuild --help claims dev is default but 
(currently) seems
+                       # to always use release unless --profile=dev is 
explicitly passed?
+                       $(usex debug --profile=dev --release)
+               )
+       }
+
        multilib-minimal_src_configure
 }
 
-multilib_src_compile() {
-       local -n cargoargs=${PN}_CARGOARGS_${ABI}
+src_compile() {
+       multilib_src_compile() {
+               local -n cargoargs=${PN}_CARGOARGS_${ABI}
 
-       edo cargo cbuild "${cargoargs[@]}"
-}
+               edo cargo cbuild "${cargoargs[@]}"
+       }
 
-src_compile() {
        multilib-minimal_src_compile
 }
 
-multilib_src_install() {
-       local -n cargoargs=${PN}_CARGOARGS_${ABI}
+src_test() { :; } # no tests, and must not run cargo_src_test
 
-       edo cargo cinstall --destdir="${D}" "${cargoargs[@]}"
-}
+src_install() {
+       multilib_src_install() {
+               local -n cargoargs=${PN}_CARGOARGS_${ABI}
 
-src_test() {
-       multilib-minimal_src_test
-}
+               edo cargo cinstall --destdir="${D}" "${cargoargs[@]}"
+       }
 
-src_install() {
        multilib-minimal_src_install
 }