From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Jan 2021 21:06:00 +0000
Subject: gentoo new year resync : 01.01.2021

---
 eclass/meson.eclass | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'eclass/meson.eclass')

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 21338280df33..67b7ca831fd2 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -55,7 +55,9 @@ if [[ -z ${_MESON_ECLASS} ]]; then
 _MESON_ECLASS=1
 
 MESON_DEPEND=">=dev-util/meson-0.54.0
-	>=dev-util/ninja-1.8.2"
+	>=dev-util/ninja-1.8.2
+	dev-util/meson-format-array
+"
 
 if [[ ${EAPI:-0} == [6] ]]; then
 	DEPEND=${MESON_DEPEND}
@@ -94,19 +96,6 @@ fi
 # User-controlled environment variable containing arguments to be passed to
 # meson in meson_src_configure.
 
-read -d '' __MESON_ARRAY_PARSER <<"EOF"
-import shlex
-import sys
-
-# See http://mesonbuild.com/Syntax.html#strings
-def quote(str):
-	escaped = str.replace("\\\\", "\\\\\\\\").replace("'", "\\\\'")
-	return "'{}'".format(escaped)
-
-print("[{}]".format(
-	", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
-EOF
-
 # @FUNCTION: _meson_env_array
 # @INTERNAL
 # @DESCRIPTION:
@@ -126,7 +115,7 @@ EOF
 #          '--unicode-16=𐐷', '--unicode-32=𐤅']
 #
 _meson_env_array() {
-	python -c "${__MESON_ARRAY_PARSER}" "$@"
+	meson-format-array "$@"
 }
 
 # @FUNCTION: _meson_get_machine_info
-- 
cgit v1.2.3