From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sun, 5 Feb 2017 23:57:19 +0000 (+0100)
Subject: media-sound/bluez-alsa: Added conf.d file (bug #608354).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8554d7d102cbbf958d287711a6fc52f8fddce6c5;p=gentoo.git

media-sound/bluez-alsa: Added conf.d file (bug #608354).

This enables users to submit their own set of options.
Thanks to Sander Sweers for opening the bug and providing the initial
patches.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
similarity index 91%
rename from media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild
rename to media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
index 20e4c0d30b5e..4cdd6730581f 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,6 +43,7 @@ src_install() {
 	prune_libtool_files --modules
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
 }
 
 pkg_postinst() {
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 263c3be8e5d1..fc34300d92b3 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -51,6 +51,7 @@ multilib_src_install_all() {
 	prune_libtool_files --modules
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
 }
 
 pkg_postinst() {
diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d b/media-sound/bluez-alsa/files/bluealsa-conf.d
new file mode 100644
index 000000000000..feb2e1e6a662
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF="--disable-hsp"
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d
index 1b61e83faf03..0f60e93672d2 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 pidfile="/var/run/bluealsa.pid"
 command="/usr/bin/bluealsa"
-command_args="--disable-hsp"
+command_args="${BLUEALSA_CONF}"
 command_background="true"
 
 depend() {