From b956900a6d8107b67fdcaffe9004d9e9695ab8df Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 6 May 2020 13:00:55 +0200
Subject: [PATCH] spotifyd: unbreak feature handling, simplify

Fixes for https://github.com/void-linux/void-packages/pull/21446
---
 srcpkgs/spotifyd/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 7a7ddc789e8..3dbbbf8cd9f 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -17,18 +17,17 @@ checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 build_options="alsa pulseaudio dbus"
 build_options_default="alsa pulseaudio dbus"
 
-_features="$(vopt_if alsa 'alsa_backend,')"
-_features+="$(vopt_if pulseaudio 'pulseaudio_backend,')"
-_features+="$(vopt_if dbus 'dbus_mpris,dbus_keyring')"
+export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
+export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+
+_features="$(vopt_if alsa ',alsa_backend')"
+_features+="$(vopt_if pulseaudio ',pulseaudio_backend')"
+_features+="$(vopt_if dbus ',dbus_mpris,dbus_keyring')"
 
 if [ "$_features" ]; then
-	echo $_features
-	configure_args="$configure_args --features $_features"
+	configure_args+=" --features $_features"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
-
-export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
-export CC_${RUST_BUILD//-/_}="${BUILD_CC}"