gentoo resync : 23.09.2020

5 files changed, 113 insertions, 8 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 0d7b8ddc425e..a67a08d6db5d 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,8 +1,10 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
-AUX bluealsa-init.d 365 BLAKE2B e94570ce6b6e25b0c9e2d2aec573c1b4a698d94117825b3708c1e046808787f97f2ef0d5bb0b1aa87910bbc33bbd9b997b6c30b90940d40fa9acd3e31505848d SHA512 b8d6b81e6ea0480975685396a3fbc349d6da7dc5a5c386271b1facdfc91ed0c2ffa79e1f78b54b530b28d413ff786ad1578ab504875905499dc5f8f075641f4d
+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-9999.ebuild 2052 BLAKE2B 11d92d789735a86e632958151f86da7dbf1636eb445739313abbb2917be6c356e4f86b09be23203e0b5322d31f08c88db4ed3ef408500d646c558efde6d96a4a SHA512 918776dc7e26d5bbef9863c5345e05701b5b2f7d400980a7b7a90cbc117800a9dc4209f394bf5c10d6a00ef06f4942f9982693905cadf7a0de6e4e0a349d9ae5
-MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
+EBUILD bluez-alsa-3.0.0.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+EBUILD bluez-alsa-9999.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+MISC metadata.xml 780 BLAKE2B ac2e3d17efbdf9a80db3e6b58b47438931483a3ea4de163d171ee03157bb1d940d4b720b63d645011bb5cdfd89ef05574593501f79402cf5d64e1d19138231f6 SHA512 e6a7a33cf5da26f96d49bad352a26ae08665ade39ac1b676c1a4dcbd815116ce65fa5f9d788ec668e393a4c1fe3a4d6092a3d9a8c8404eed6017dfaa3afbfd29
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
new file mode 100644
index 000000000000..3ab8343e3815
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
@@ -0,0 +1,90 @@
+# 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 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[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}] )
+	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-rfcomm
+		$(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 hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(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 35b7533e4c48..3ab8343e3815 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test upower"
+IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
@@ -30,16 +30,23 @@ RDEPEND="
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	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"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/pandoc )
+"
 
 src_prepare() {
 	default
@@ -51,12 +58,16 @@ multilib_src_configure() {
 		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
-		$(use_enable ofono)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
 		$(use_enable static-libs static)
 		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d
index 087b35386eb6..f85b822c53e3 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -2,7 +2,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-pidfile="/var/run/bluealsa.pid"
+pidfile="/run/bluealsa.pid"
 command="/usr/bin/bluealsa"
 command_args="${BLUEALSA_CONF}"
 command_background="true"
@@ -13,5 +13,5 @@ depend() {
 }
 
 start_pre() {
-	checkpath -q -D -m 0770 -o :audio /var/run/bluealsa
+	checkpath -q -D -m 0770 -o :audio /run/bluealsa
 }
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 4fa05b5a0f0c..cf14e256b358 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -11,6 +11,8 @@
   <use>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
     <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
+    <flag name="man">Generate (and install) man pages with <pkg>app-text/pandoc</pkg></flag>
+    <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
     <flag name="ofono">Enable ofono elephony support</flag>
   </use>
 </pkgmetadata>