gentoo resync : 29.12.2022

4 files changed, 37 insertions, 21 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 30241b7c809c..ffaf618d0f3b 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,9 @@
 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
-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
+DIST bluez-alsa-4.0.0.tar.gz 230879 BLAKE2B 998127cb4e03afc019679b80fc1ac7d56351aeb8274efe76a74d6c5600c4b8527d5463e864cc8f68c1fa82c1729ef38d8168e90e7092dfe5eaf5a7cf25ba4bfa SHA512 8a79e5a1189db2d39b2d772cb8f8cd51ebb96b9bd91489556195e83dfd16f40a581dce68c5ad9e886b66cec8a03ae7f959e8288bb4c5c87ea5a2bbd6aee9c5f0
 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 779 BLAKE2B 3c2a49262beb77e21765228bc74be5b9372113afd4901ecee57d6bbf556fa661c02a015f72bea98a31510fee663a5b82629bfa5dbb3286f199441d1ba2bbf2a8 SHA512 17bb471278f9056174750d9256fb8e692f0dd373aab21d5b97698e54da6c6d6f7e930e9ed919ed348edd18e98c26eb77b821753cf7cb32c7e7ac034e4f78b620
+EBUILD bluez-alsa-4.0.0.ebuild 2801 BLAKE2B 555a60393f17848589385e45bde02f116eb907d86780502cfb8f89cd23cb4b9571418857e82c78f01dab35a4ec94000dbd62d2c435b1441ac384f8d03f1c9248 SHA512 c3e4a002751c05d2914578b0f939d53a169fd6315c09ce4501926ce8811536d4b44248c53c14d3cf05c1aad07062aed5acd9b42ab8c09155cf653f974f696065
+EBUILD bluez-alsa-9999.ebuild 2801 BLAKE2B 555a60393f17848589385e45bde02f116eb907d86780502cfb8f89cd23cb4b9571418857e82c78f01dab35a4ec94000dbd62d2c435b1441ac384f8d03f1c9248 SHA512 c3e4a002751c05d2914578b0f939d53a169fd6315c09ce4501926ce8811536d4b44248c53c14d3cf05c1aad07062aed5acd9b42ab8c09155cf653f974f696065
+MISC metadata.xml 690 BLAKE2B e0d390bd64b6250bc9df327a59938c60e6e19bfc019e395277443e60dfcff948ae6582154825cbad55d6ffdf39bcd7af2b115eda1bdb9c041aa529889761f9ef SHA512 1a088f9c50127bb606a109acd990bbee0a368a03e39b2f9954b2e0526a212f04b0a705d98f08576173c79b48fbccb20f975712e3a511ea00fd98aa33971ca268
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
index e7b9c1c647a3..1343401528ab 100644
--- a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools multilib-minimal systemd
+EAPI=8
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,19 +17,20 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd 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}]
+	>=dev-libs/glib-2.32[${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? (
@@ -38,11 +39,15 @@ RDEPEND="
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
 BDEPEND="
 	virtual/pkgconfig
 	man? ( app-text/pandoc )
@@ -55,18 +60,25 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
+		--enable-faststream
 		--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 systemd)
 		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
+		$(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[@]}"
@@ -78,7 +90,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
+	#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/"
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 80ea97b69dbe..1343401528ab 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
@@ -17,13 +17,13 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd 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}]
+	>=dev-libs/glib-2.32[${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}]
@@ -39,11 +39,15 @@ RDEPEND="
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
 	ofono? ( net-misc/ofono )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? (
+		dev-libs/check
+		media-libs/libsndfile
+	)"
 BDEPEND="
 	virtual/pkgconfig
 	man? ( app-text/pandoc )
@@ -57,6 +61,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-cli
+		--enable-faststream
 		--enable-rfcomm
 		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
@@ -65,7 +70,9 @@ multilib_src_configure() {
 		$(use_enable man manpages)
 		$(use_enable mpg123)
 		$(use_enable static-libs static)
+		$(use_enable systemd)
 		$(use_enable test)
+		$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
 		$(multilib_native_use_enable aptx)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
@@ -83,7 +90,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-	systemd_dounit "${FILESDIR}"/bluealsa.service
+	#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/"
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 8da3eff66042..5533720929d0 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Arkq/bluez-alsa</remote-id>
   </upstream>