gentoo resync : 24.03.2019

5 files changed, 118 insertions, 5 deletions

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index a5c178400183..b4703ce0f020 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,6 +1,9 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
+AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
+DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
-EBUILD bluez-alsa-9999.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
-MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
+EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
+EBUILD bluez-alsa-9999.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
+MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
new file mode 100644
index 000000000000..6c33c4f7d936
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+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"
+
+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-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 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
+)
+
+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)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+}
+
+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 c883ca5ff3ef..6c33c4f7d936 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,10 +17,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop static-libs"
+IUSE="aac debug hcitop ldac ofono static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.0[${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-libs/readline:0=
@@ -28,10 +28,15 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
-	)"
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -42,8 +47,11 @@ multilib_src_configure() {
 		--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)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
new file mode 100644
index 000000000000..55530ea8b831
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
@@ -0,0 +1,31 @@
+From 52b08766b08ec7ef8393343553934ca148c175af Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 24 Mar 2019 13:04:24 +0100
+Subject: [PATCH] configure.ac: Fix pkg-config checks for libldac
+
+libldac actually provides the following two pkgconfig files:
+
+ldacBT-enc.pc
+ldacBT-abr.pc
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 270a74c..6f0b04b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,8 +81,8 @@ AC_ARG_ENABLE([ldac],
+ 	[AS_HELP_STRING([--enable-ldac], [enable LDAC support])])
+ AM_CONDITIONAL([ENABLE_LDAC], [test "x$enable_ldac" = "xyes"])
+ AM_COND_IF([ENABLE_LDAC], [
+-	PKG_CHECK_MODULES([LDAC], [libldacBT >= 2.0.0])
+-	PKG_CHECK_MODULES([LDAC_ABR], [libldacBT_abr >= 2.0.0])
++	PKG_CHECK_MODULES([LDAC], [ldacBT-enc >= 2.0.0])
++	PKG_CHECK_MODULES([LDAC_ABR], [ldacBT-abr >= 2.0.0])
+ 	AC_DEFINE([ENABLE_LDAC], [1], [Define to 1 if LDAC is enabled.])
+ ])
+ 
+-- 
+2.21.0
+
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index d35dea0f11fb..4fa05b5a0f0c 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -10,5 +10,7 @@
   </upstream>
   <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="ofono">Enable ofono elephony support</flag>
   </use>
 </pkgmetadata>