gentoo Easter resync : 12.04.2020

4 files changed, 60 insertions, 19 deletions

diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 6750540dbe65..7a743e4373f7 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,5 +1,5 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
-EBUILD pulseaudio-modules-bt-1.3.ebuild 1816 BLAKE2B 14b1edfce44e867bc555dc26dac64273965c55eb2cc5c43a1b3aa924dc8e88fe7e2cb079a0151cdd142d1d27348ef8c1d38ba4206a26f40df27b49b92a0f8400 SHA512 b5e08c87657adfcc954dbe6d29a2306f0225684fedcf6be0012acfc082bf28a19da534539b7c4cf830ec705d09731619f4aaf604c73bc63e32ca3070bdfecb6e
-EBUILD pulseaudio-modules-bt-9999.ebuild 1685 BLAKE2B bdce8163372a4ffc867aedb776a6bdc5a2735d3942a8a5adb5f285b763ff334f9be0b25d45df23b69523cb5c5acfb72bc9da590a52828dc518f0f8a96bd2659f SHA512 064f16de80bdd9d5d2bd1e8a74767e5e75f0a11fe1b123b7df5eb1129cdc05d81eb69d2e49e0cb9d56ede6647dd1e644a07e358c6551d3343d6817a92db74bd4
-MISC metadata.xml 287 BLAKE2B 97a6dbf2f2d8ec4f843481ad45df44044774a9d886fcea246694b5568fee990b15bf8c13a04f7bef5f348ec0b1a705f71fa1eb77973df0bcb90a8432b99b8057 SHA512 37dce9f554f78faee8b0ff3a1c10ec05b8fc38a91e1530e8842684e05efc2cc7eb185dc2c91af38399487e4eaece927d9d3e36f6306cd4dfd4520497e84a7b45
+EBUILD pulseaudio-modules-bt-1.3-r1.ebuild 2260 BLAKE2B 80a0482c671988a498f4988f6f8d078a69dd5d7b124951ca5952f52fb1b7bf546b02d5b93750d5c4fe0328db45e86daa54b3902bd8aa2de4a2e710c83816e1b0 SHA512 f9f309cfde4d6afde934ec2a032c08af684090048a28ff57d19caf6fcc0646453ac6a64f26c3f36a6cd752d7219c8be6d7ab0fdfeb168913f5285fc1f098516a
+EBUILD pulseaudio-modules-bt-9999.ebuild 2129 BLAKE2B e9dc4ad7b297a96ce866c3d02c326ee91e9c77b76921a149a749411b4625f53d202a30d8a79129ac75e0a6e20064c4793a53f7de1b178b8a04531627066681e9 SHA512 c6adbb85a715afc3d2241562ed0f87e4790d280556c7407dd9971df28e77b05189b78edbae2016226b63ffab261da45bbec021f6349d111988b102e019a6a8bd
+MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
index c6a40a7b9cb4..ecdf5fddd6d7 100644
--- a/media-sound/pulseaudio-modules-bt/metadata.xml
+++ b/media-sound/pulseaudio-modules-bt/metadata.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>zx2c4@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-	<email>pacho@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="fdk">
+		AAC encoding support using media-libs/fdk-aac
+		</flag>
+		<flag name="ffmpeg">
+		APTX, APTX-HD encoding support
+		</flag>
+		<flag name="ldac">
+		LDAC encoding support, using media-libs/libldac
+		</flag>
+		<flag name="native-headset">
+		Build with native HSP (Headset Profile) headset for bluez 5
+		</flag>
+		<flag name="ofono-headset">
+		Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
index 72132d0bcd33..22faf22ec86d 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
@@ -16,16 +16,16 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
 
 DEPEND="
-	media-libs/fdk-aac:0=
-	virtual/ffmpeg
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( virtual/ffmpeg )
 	media-libs/sbc
-	media-libs/libldac
+	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
-	>=net-misc/ofono-1.13
+	ofono-headset? ( >=net-misc/ofono-1.13 )
 	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
@@ -53,6 +53,18 @@ load-module module-bluetooth-discover
 .endif
 "
 
+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake-utils_src_configure
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
index 4dbb99143961..8b8e74ca04f7 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -17,16 +17,16 @@ EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
 
 DEPEND="
-	media-libs/fdk-aac:0=
-	virtual/ffmpeg
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( virtual/ffmpeg )
 	media-libs/sbc
-	media-libs/libldac
+	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
-	>=net-misc/ofono-1.13
+	ofono-headset? ( >=net-misc/ofono-1.13 )
 	>=media-sound/pulseaudio-13[-bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
@@ -55,6 +55,18 @@ load-module module-bluetooth-discover
 .endif
 "
 
+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake-utils_src_configure
+}
+
 src_install() {
 	cmake-utils_src_install
 	readme.gentoo_create_doc