gentoo resync : 25.08.2020

4 files changed, 16 insertions, 6 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index aaf0991da444..0d7b8ddc425e 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,8 +1,8 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
-AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
+AUX bluealsa-init.d 365 BLAKE2B e94570ce6b6e25b0c9e2d2aec573c1b4a698d94117825b3708c1e046808787f97f2ef0d5bb0b1aa87910bbc33bbd9b997b6c30b90940d40fa9acd3e31505848d SHA512 b8d6b81e6ea0480975685396a3fbc349d6da7dc5a5c386271b1facdfc91ed0c2ffa79e1f78b54b530b28d413ff786ad1578ab504875905499dc5f8f075641f4d
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 AUX bluez-alsa-2.1.0-gcc10.patch 4802 BLAKE2B f57c2920deaec93bf57e56440c20f01a23e58300e062f9d8f83b56719cbc8620dfac8e1420639db7cabc589a231e9f33ff6f2de6e8ad7ba9b2d9b2c18fa35b32 SHA512 e26c4cf6b4184c99ba85f9640f5f5db38ae66999560147af91aff1d9aebb10ef534dd631f8a8421164431401ee2a35da529c298deff6b955bd6747fc7a9f5605
 DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584
-EBUILD bluez-alsa-2.1.0.ebuild 1930 BLAKE2B 32a79bd8fbdc218bc2e968d77b1fbc9ef79a97aaf67b377687202d43150f6ac61419cf4507175627b90d519af028dbcfa1c50bf582764fc3d98af63b5ac22424 SHA512 740f21e0a17acc513cfe776361808782d047399219bab175a8aeeae5a6aa71d99ab31a74d173ca40c37a744b1c175afec6c6585f28b7e5b5b0b379c70eaf8057
-EBUILD bluez-alsa-9999.ebuild 1877 BLAKE2B f499f35e7e189820ea2554c576ea2ebae05c5fadf7386d76e4abbbbb2ffa057544cc6b12af313ae3ec48331d4bcdc98d087adc93323dd7adccc5cd64b59bb57e SHA512 a1e2c29746fdc1701b8ae6d7c0384466fd21a44e052d08e8be46b9d93de2eeaee71fb931babc1ef472e4480fbd6e6bea82fe46c7787c7bc7f472d84bbacae479
+EBUILD bluez-alsa-2.1.0-r1.ebuild 2105 BLAKE2B 6afd74d6e52478e52201bebf5b9a9991d8106488f090049361771824912f475f02653b8b8e56718a559fcd0135a1a0191d0bfe86bb66a40684f0c1ef138a478f SHA512 0e822dc45450a35fad11568875d45908e0db49bdf9fa21fe205481cbd1189902d900e808a6ede91b56ab7f5fb6c3e7a138fb9cde2b15e1e43fa1636c2aa98362
+EBUILD bluez-alsa-9999.ebuild 2052 BLAKE2B 11d92d789735a86e632958151f86da7dbf1636eb445739313abbb2917be6c356e4f86b09be23203e0b5322d31f08c88db4ed3ef408500d646c558efde6d96a4a SHA512 918776dc7e26d5bbef9863c5345e05701b5b2f7d400980a7b7a90cbc117800a9dc4209f394bf5c10d6a00ef06f4942f9982693905cadf7a0de6e4e0a349d9ae5
 MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
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
index c0b3a72b1abb..f654ac56596f 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
@@ -37,7 +37,8 @@ RDEPEND="
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	upower? ( sys-power/upower )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -71,6 +72,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 fc03fb3b79e0..35b7533e4c48 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -37,7 +37,8 @@ RDEPEND="
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	upower? ( sys-power/upower )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
@@ -67,6 +68,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 9b6a3178b63a..087b35386eb6 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"