[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

[Lars Wendler]

commit:     6d06f1f17739c5d5b3d5f23a9f1339ffc1f8afef
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 11:28:07 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 11:28:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d06f1f1

media-sound/bluez-alsa: Sync with upstream changes.

Thanks-to: Arkadiusz Bokowy
Closes: https://bugs.gentoo.org/659838
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-sound/bluez-alsa/bluez-alsa-9999.ebuild  | 20 ++++++++++----------
 media-sound/bluez-alsa/files/bluealsa-conf.d-2 |  4 ++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 8b3787db68d..186e2b9681c 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils multilib-minimal
+EAPI=7
+inherit autotools multilib-minimal
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -29,7 +29,6 @@ RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
 		sys-libs/ncurses:0=
 	)"
 DEPEND="${RDEPEND}
-	net-libs/ortp
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -38,19 +37,20 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable aac) \
-		$(use_enable debug) \
+	local myeconfargs=(
+		$(use_enable aac)
+		$(use_enable debug)
 		$(multilib_native_use_enable hcitop)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name "*.la" -delete || die
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d-2 b/media-sound/bluez-alsa/files/bluealsa-conf.d-2
new file mode 100644
index 00000000000..29d52f4a1fc
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d-2
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF=""