commit:     6a995cbf618cc337615794215a77a29abdab28d2
Author:     SuNova <sunova <AT> tutanota <DOT> com>
AuthorDate: Tue Aug 11 14:05:59 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 10:15:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a995cbf

media-sound/bluez-alsa: Copy config file to alsa datadir to preserve it

Signed-off-by: sunova <sunova <AT> tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/17079
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../{bluez-alsa-2.1.0.ebuild => bluez-alsa-2.1.0-r1.ebuild}           | 4 ++++
 media-sound/bluez-alsa/bluez-alsa-9999.ebuild                         | 4 ++++
 media-sound/bluez-alsa/files/bluealsa-init.d                          | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
similarity index 92%
rename from media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
rename to media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
index c0b3a72b1ab..e81144df9d1 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
@@ -71,6 +71,10 @@ multilib_src_install_all() {
        newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
        newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
        systemd_dounit "${FILESDIR}"/bluealsa.service
+
+       # Add config file to alsa datadir as well to preserve changes in /etc
+       insinto "/usr/share/alsa/alsa.conf.d/"
+       doins "src/asound/20-bluealsa.conf"
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index fc03fb3b79e..a399d0042c6 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -67,6 +67,10 @@ multilib_src_install_all() {
        newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
        newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
        systemd_dounit "${FILESDIR}"/bluealsa.service
+
+       # Add config file to alsa datadir as well to preserve changes in /etc
+       insinto "/usr/share/alsa/alsa.conf.d/"
+       doins "src/asound/20-bluealsa.conf"
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d 
b/media-sound/bluez-alsa/files/bluealsa-init.d
index 9b6a3178b63..087b35386eb 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/var/run/bluealsa.pid"

Reply via email to