[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/

[James Le Cuirot]

commit:     ecadd137d4240f6302589e70c0ae782e336e5e9b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 22:59:46 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 23:00:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadd137

app-emulation/gallium-nine-standalone: Use meson-format-array

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../gallium-nine-standalone-0.9.ebuild                        | 11 +++++++----
 .../gallium-nine-standalone-9999.ebuild                       | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
index a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
 
 DEPEND="
        ${RDEPEND}
-       virtual/pkgconfig
        virtual/wine[${MULTILIB_USEDEP}]
-       >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+       dev-util/meson-format-array
+       virtual/pkgconfig
 "
 
 PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
 
                sed \
                        -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-                       -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
-                       -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+                       -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
+                       -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
                        -e 
"s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!"
 \
                        ${file}.in > ${file} || die
        }

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
 
 DEPEND="
        ${RDEPEND}
-       virtual/pkgconfig
        virtual/wine[${MULTILIB_USEDEP}]
-       >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+       dev-util/meson-format-array
+       virtual/pkgconfig
 "
 
 PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
 
                sed \
                        -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-                       -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
-                       -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+                       -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
+                       -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
                        -e 
"s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!"
 \
                        ${file}.in > ${file} || die
        }