gentoo resync : 15.06.2021

3 files changed, 102 insertions, 3 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 8847cfc699a9..4ad1c0b80bc6 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -2,6 +2,8 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fc
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
+DIST bluez-alsa-3.1.0.tar.gz 179984 BLAKE2B b0bd5008d1bcc972577d8626970834934cc9424b4dff5c9ede1b1bfb0ac6c62c50dd8a7b94bdaa8884354379fb4fe06d758f620b2f42207d85f68da5064b3499 SHA512 8b2644cb2114569cc896869f22352386a9362eeacae823423a63d9b21198f561d4af796700fcd3267556bb69ff2575569474a1da8e3a645b5a2e779882c27cbf
 EBUILD bluez-alsa-3.0.0.ebuild 2413 BLAKE2B 1b79b12eaafb4edbc0ce2a1f90099f1f7ebf30e062d7d12b2a351d24a9681b56e8b17ef6e774d7121501f99374d678d1f0d33e971bf038a9a0f5ebecbb3f843d SHA512 76ce2586414a1fc995993600522fdc0183252e3f234bad6bf876ca94a772a622e3b8d32dde205322cb97aa063180c90d54344e3bbd2dcc6e8127468345470283
-EBUILD bluez-alsa-9999.ebuild 2529 BLAKE2B 4481a9048405bcfd3eaf197eceec9aeb31ccc64e0fbdf7db5478ce234ba19eb9da4fbfacb959b561628ef3db9bbc65e06066b0ea956a8b74a86780bef4938707 SHA512 7489fd50092bb3e3dc8a96d541629592af1f81cf17cfa24981430fa3ed5d5b95ae8e1ebe74f39d1e0b7d51be888cfd8e675562e9f3c8844ba6a8a6e7454a5675
+EBUILD bluez-alsa-3.1.0.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
+EBUILD bluez-alsa-9999.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
 MISC metadata.xml 778 BLAKE2B 3dada8fbc2d9ff4fcb093d437be17f1cae5e575a15ef65fb275e74459e72b4942fa5603c112ae15ceb7fc51f92c0961622cb00e64bc53e2ab8ef8b99a923614b SHA512 1b4913a7310386d7c01c54ba1d5baed8f392324759d6e58eb93084dc17903622d0dfaa247ff795a03fc91cfc0e6e438d51692a35272de6a882082b47fc8f5e61
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
new file mode 100644
index 000000000000..80ea97b69dbe
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 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 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind 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[${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}] )
+	aptx? ( media-libs/libopenaptx )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	upower? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/pandoc )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-cli
+		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
+		$(use_enable static-libs static)
+		$(use_enable test)
+		$(multilib_native_use_enable aptx)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
+		$(use_with unwind libunwind)
+	)
+	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-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 86a703524a0e..80ea97b69dbe 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal systemd
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -56,7 +56,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
 		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
 		$(use_enable debug)
 		$(use_enable lame mp3lame)