From 7457a55b31bce1d433214f23e0150a9a993019bf Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 11 Jun 2018 18:49:44 -0700
Subject: [PATCH] media-libs/mesa: Simplify and optimize driver_list()

Make *_DRIVERS arrays instead of strings.
---
 media-libs/mesa/mesa-9999.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 9df1aa45f58d..efc874f4902e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -351,16 +351,16 @@ multilib_src_configure() {
 	fi
 
 	if use gallium; then
-		GALLIUM_DRIVERS+="swrast "
+		GALLIUM_DRIVERS+=(swrast)
 		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
 	else
-		DRI_DRIVERS+="swrast "
+		DRI_DRIVERS+=(swrast)
 		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
 	fi
 
 	driver_list() {
-		arr=($(printf "%s\n" "$@" | sort -u | tr '\n' ','))
-		echo "${arr: : -1}"
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
 	}
 
 	emesonargs+=(
@@ -376,9 +376,9 @@ multilib_src_configure() {
 		$(meson_use unwind libunwind)
 		$(meson_use lm_sensors lmsensors)
 		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list ${DRI_DRIVERS})
-		-Dgallium-drivers=$(driver_list ${GALLIUM_DRIVERS})
-		-Dvulkan-drivers=$(driver_list ${VULKAN_DRIVERS})
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
 	)
 	meson_src_configure
 }
@@ -462,20 +462,20 @@ pkg_prerm() {
 dri_driver_enable() {
 	if use $1; then
 		shift
-		DRI_DRIVERS+="$@ "
+		DRI_DRIVERS+=("$@")
 	fi
 }
 
 gallium_enable() {
 	if use $1; then
 		shift
-		GALLIUM_DRIVERS+="$@ "
+		GALLIUM_DRIVERS+=("$@")
 	fi
 }
 
 vulkan_enable() {
 	if use $1; then
 		shift
-		VULKAN_DRIVERS+="$@ "
+		VULKAN_DRIVERS+=("$@")
 	fi
 }
-- 
2.26.2