From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99F6A13835A for ; Sat, 17 Apr 2021 20:08:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBC40E087B; Sat, 17 Apr 2021 20:08:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C55CFE087B for ; Sat, 17 Apr 2021 20:08:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E24C83408A6 for ; Sat, 17 Apr 2021 20:08:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 830BB66A for ; Sat, 17 Apr 2021 20:08:36 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1618690099.4664467787ca26dc8ec56918e9619bfa7681b954.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio-modules-bt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild X-VCS-Directories: media-sound/pulseaudio-modules-bt/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 4664467787ca26dc8ec56918e9619bfa7681b954 X-VCS-Branch: master Date: Sat, 17 Apr 2021 20:08:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8deb1e11-2164-49b2-9dfe-3ba383143479 X-Archives-Hash: 770d2ac8d26cd09d769c9f4f63e91124 commit: 4664467787ca26dc8ec56918e9619bfa7681b954 Author: Pacho Ramos gentoo org> AuthorDate: Sat Apr 17 19:09:44 2021 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Apr 17 20:08:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46644677 media-sound/pulseaudio-modules-bt: Port to cmake.utils Closes: https://bugs.gentoo.org/783408 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> .../pulseaudio-modules-bt-1.4.ebuild | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild index 56a66ff8e9e..9139708288d 100644 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils readme.gentoo-r1 +inherit cmake readme.gentoo-r1 DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth" HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt" @@ -51,6 +51,14 @@ load-module module-bluetooth-discover .endif " +src_prepare() { + cmake_src_prepare + + # pulseaudio headers needed to build + rmdir pa/ || die + ln -s ../pulseaudio-${PULSE_VER}/ pa || die +} + src_configure() { local mycmakeargs=( -DCODEC_AAC_FDK=$(usex fdk "ON" "OFF") @@ -60,19 +68,11 @@ src_configure() { -DNATIVE_HEADSET=$(usex native-headset "ON" "OFF") -DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF") ) - cmake-utils_src_configure -} - -src_prepare() { - cmake-utils_src_prepare - - # pulseaudio headers needed to build - rmdir pa/ || die - ln -s ../pulseaudio-${PULSE_VER}/ pa || die + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install readme.gentoo_create_doc }