summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2023-10-29 22:59:46 +0000
committerJames Le Cuirot <chewi@gentoo.org>2023-10-29 23:00:32 +0000
commitecadd137d4240f6302589e70c0ae782e336e5e9b (patch)
tree2d0650ab5053e24a698d1ffe21f504bb6ec9322d
parentapp-emulation/gallium-nine-standalone: Version bump to 0.9, EAPI 8 (diff)
downloadgentoo-ecadd137d4240f6302589e70c0ae782e336e5e9b.tar.gz
gentoo-ecadd137d4240f6302589e70c0ae782e336e5e9b.tar.bz2
gentoo-ecadd137d4240f6302589e70c0ae782e336e5e9b.zip
app-emulation/gallium-nine-standalone: Use meson-format-array
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-rw-r--r--app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild11
-rw-r--r--app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild11
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
}