gentoo resync : 25.11.2020

5 files changed, 4 insertions, 235 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index a67a08d6db5d..27daa109b4dc 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,10 +1,7 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 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
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
-EBUILD bluez-alsa-2.1.0-r1.ebuild 2105 BLAKE2B 6afd74d6e52478e52201bebf5b9a9991d8106488f090049361771824912f475f02653b8b8e56718a559fcd0135a1a0191d0bfe86bb66a40684f0c1ef138a478f SHA512 0e822dc45450a35fad11568875d45908e0db49bdf9fa21fe205481cbd1189902d900e808a6ede91b56ab7f5fb6c3e7a138fb9cde2b15e1e43fa1636c2aa98362
-EBUILD bluez-alsa-3.0.0.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
-EBUILD bluez-alsa-9999.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+EBUILD bluez-alsa-3.0.0.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
+EBUILD bluez-alsa-9999.ebuild 2406 BLAKE2B 68c8643f6084d40405f7888f84b56914c9a1c0e4310168bf373755b07898ca70bed4dc8231a22bd60560b3918ebc34d8bc5b1e6eb8e301d000786686f206a232 SHA512 8ac1d87dcc0c33646529363256cbcac8abdc1a3d29e1204044182eba99ea3c1db682ef719b73b5e349277e0d3a41b62becd6b31cf211b9292c1e4b7bf25034ee
 MISC metadata.xml 780 BLAKE2B ac2e3d17efbdf9a80db3e6b58b47438931483a3ea4de163d171ee03157bb1d940d4b720b63d645011bb5cdfd89ef05574593501f79402cf5d64e1d19138231f6 SHA512 e6a7a33cf5da26f96d49bad352a26ae08665ade39ac1b676c1a4dcbd815116ce65fa5f9d788ec668e393a4c1fe3a4d6092a3d9a8c8404eed6017dfaa3afbfd29
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
deleted file mode 100644
index f654ac56596f..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal systemd
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
-else
-	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test upower"
-RESTRICT="!test? ( test )"
-
-# bluez-alsa does not directly link to upower but
-# is using the upower interface via dbus calls.
-RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
-	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
-	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
-	hcitop? (
-		dev-libs/libbsd
-		sys-libs/ncurses:0=
-	)
-	ldac? ( >=media-libs/libldac-2.0.0 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch" #706680
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-rfcomm
-		$(use_enable aac)
-		$(use_enable debug)
-		$(use_enable ofono)
-		$(use_enable static-libs static)
-		$(use_enable test)
-		$(multilib_native_use_enable hcitop)
-		$(multilib_native_use_enable ldac)
-		$(multilib_native_use_enable upower)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	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() {
-	elog "Users can use this service when they are members of the \"audio\" group."
-}
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
index 3ab8343e3815..c8620648df98 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 3ab8343e3815..c8620648df98 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 # bluez-alsa does not directly link to upower but
 # is using the upower interface via dbus calls.
 RDEPEND="
-	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch b/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch
deleted file mode 100644
index df8e148842e2..000000000000
--- a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 450ba2c898303cea2cba9a5efa99c7d919fc9e55 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
-Date: Sun, 9 Feb 2020 22:26:16 +0100
-Subject: [PATCH] Fix linkage - mark external variable as extern
-
----
- src/bluealsa-iface.h | 6 +++---
- src/bluez-a2dp.h     | 4 ++--
- src/bluez-iface.h    | 6 +++---
- src/ofono-iface.h    | 4 ++--
- test/server-mock.c   | 1 +
- test/test-ba.c       | 1 +
- test/test-io.c       | 1 +
- test/test-rfcomm.c   | 1 +
- 8 files changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h
-index 262fb76..1d3366d 100644
---- a/src/bluealsa-iface.h
-+++ b/src/bluealsa-iface.h
-@@ -32,8 +32,8 @@
- #define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG"
- #define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS"
- 
--const GDBusInterfaceInfo bluealsa_iface_manager;
--const GDBusInterfaceInfo bluealsa_iface_pcm;
--const GDBusInterfaceInfo bluealsa_iface_rfcomm;
-+extern const GDBusInterfaceInfo bluealsa_iface_manager;
-+extern const GDBusInterfaceInfo bluealsa_iface_pcm;
-+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm;
- 
- #endif
-diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h
-index 7c0e33b..4a695d9 100644
---- a/src/bluez-a2dp.h
-+++ b/src/bluez-a2dp.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - bluez-a2dp.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *
-  * This file is a part of bluez-alsa.
-  *
-@@ -58,6 +58,6 @@ struct bluez_a2dp_codec {
- };
- 
- /* NULL-terminated list of available A2DP codecs */
--const struct bluez_a2dp_codec **bluez_a2dp_codecs;
-+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs;
- 
- #endif
-diff --git a/src/bluez-iface.h b/src/bluez-iface.h
-index 34269c5..ca8fba5 100644
---- a/src/bluez-iface.h
-+++ b/src/bluez-iface.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - bluez-iface.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *
-  * This file is a part of bluez-alsa.
-  *
-@@ -27,7 +27,7 @@
- #define BLUEZ_TRANSPORT_STATE_PENDING "pending"
- #define BLUEZ_TRANSPORT_STATE_ACTIVE  "active"
- 
--const GDBusInterfaceInfo bluez_iface_endpoint;
--const GDBusInterfaceInfo bluez_iface_profile;
-+extern const GDBusInterfaceInfo bluez_iface_endpoint;
-+extern const GDBusInterfaceInfo bluez_iface_profile;
- 
- #endif
-diff --git a/src/ofono-iface.h b/src/ofono-iface.h
-index d5a6715..d5b9065 100644
---- a/src/ofono-iface.h
-+++ b/src/ofono-iface.h
-@@ -1,6 +1,6 @@
- /*
-  * BlueALSA - ofono-iface.h
-- * Copyright (c) 2016-2019 Arkadiusz Bokowy
-+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
-  *               2018 Thierry Bultel
-  *
-  * This file is a part of bluez-alsa.
-@@ -27,6 +27,6 @@
- #define OFONO_AUDIO_CODEC_CVSD 0x01
- #define OFONO_AUDIO_CODEC_MSBC 0x02
- 
--const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
-+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
- 
- #endif
-diff --git a/test/server-mock.c b/test/server-mock.c
-index 34934e8..a42e845 100644
---- a/test/server-mock.c
-+++ b/test/server-mock.c
-@@ -36,6 +36,7 @@
- #include "../src/ba-adapter.c"
- #include "../src/ba-device.c"
- #include "../src/ba-transport.c"
-+#include "../src/bluez-a2dp.c"
- #include "../src/hci.c"
- #include "../src/msbc.c"
- #include "../src/rfcomm.c"
-diff --git a/test/test-ba.c b/test/test-ba.c
-index f9eb145..97d57d6 100644
---- a/test/test-ba.c
-+++ b/test/test-ba.c
-@@ -22,6 +22,7 @@
- #include "../src/utils.c"
- #include "../src/shared/log.c"
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- int a2dp_thread_create(struct ba_transport *t) { (void)t; return 0; }
- void *rfcomm_thread(struct ba_transport *t) { (void)t; return 0; }
- void *sco_thread(struct ba_transport *t) { (void)t; return 0; }
-diff --git a/test/test-io.c b/test/test-io.c
-index 9dbd0e9..85d3fe7 100644
---- a/test/test-io.c
-+++ b/test/test-io.c
-@@ -33,6 +33,7 @@
- #include "../src/shared/log.c"
- #include "../src/shared/rt.c"
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) {
- 	debug("%s: %p", __func__, (void *)t); (void)error; return 0; }
- void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) {
-diff --git a/test/test-rfcomm.c b/test/test-rfcomm.c
-index d14a7bd..248939f 100644
---- a/test/test-rfcomm.c
-+++ b/test/test-rfcomm.c
-@@ -34,6 +34,7 @@ static pthread_mutex_t transport_codec_updated_mtx = PTHREAD_MUTEX_INITIALIZER;
- static pthread_cond_t transport_codec_updated = PTHREAD_COND_INITIALIZER;
- static unsigned int transport_codec_updated_cnt = 0;
- 
-+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL;
- unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) {
- 	debug("%s: %p", __func__, (void *)t); (void)error; return 0; }
- void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) {
--- 
-2.24.1
-