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 4D2591382C5 for ; Tue, 30 Mar 2021 20:20:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EE8EE0C5E; Tue, 30 Mar 2021 20:20:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 7C4C7E0C5E for ; Tue, 30 Mar 2021 20:20:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2805F340C6C for ; Tue, 30 Mar 2021 20:20:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89D3A5B4 for ; Tue, 30 Mar 2021 20:20:44 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1617135445.926f35c93c331860b759a883674e596e1f0c152f.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libbtbb/libbtbb-2020.12.1.ebuild net-libs/libbtbb/libbtbb-9999.ebuild X-VCS-Directories: net-libs/libbtbb/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 926f35c93c331860b759a883674e596e1f0c152f X-VCS-Branch: master Date: Tue, 30 Mar 2021 20:20:44 +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: c04c748c-79e2-4f0e-a710-b023d7da28b9 X-Archives-Hash: a995681b40544f5f2ca14a98589101b1 commit: 926f35c93c331860b759a883674e596e1f0c152f Author: Rick Farina gentoo org> AuthorDate: Tue Mar 30 20:17:25 2021 +0000 Commit: Rick Farina gentoo org> CommitDate: Tue Mar 30 20:17:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926f35c9 net-libs/libbtbb: migrate off cmake-utils Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Rick Farina gentoo.org> net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 24 ++++++++++++------------ net-libs/libbtbb/libbtbb-9999.ebuild | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild index 758b20c33cd..6db493027e1 100644 --- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild +++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib cmake-utils +inherit multilib cmake DESCRIPTION="A library to decode Bluetooth baseband packets" HOMEPAGE="http://libbtbb.sourceforge.net/" @@ -47,7 +47,7 @@ which_plugins() { src_prepare() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_prepare + cmake_src_prepare if use wireshark-plugins; then which_plugins @@ -60,7 +60,7 @@ src_prepare() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare + cmake_src_prepare done fi } @@ -73,7 +73,7 @@ src_configure() { -DBUILD_STATIC_LIB=$(usex static-libs) -DBUILD_ROOT="${ED}" ) - cmake-utils_src_configure + cmake_src_configure if use wireshark-plugins; then for i in ${plugins} @@ -87,7 +87,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" ) - cmake-utils_src_configure + cmake_src_configure done fi } @@ -95,7 +95,7 @@ src_configure() { src_compile() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_compile + cmake_src_compile if use wireshark-plugins; then for i in ${plugins} @@ -106,7 +106,7 @@ src_compile() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile + cmake_src_compile done fi } @@ -114,7 +114,7 @@ src_compile() { src_test() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_test + cmake_src_test if use wireshark-plugins; then for i in ${plugins} @@ -125,7 +125,7 @@ src_test() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test + cmake_src_test done fi } @@ -133,7 +133,7 @@ src_test() { src_install() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_install + cmake_src_install if use wireshark-plugins; then for i in ${plugins} @@ -144,7 +144,7 @@ src_install() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install + cmake_src_install done fi } diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index a1587cd739a..6db493027e1 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib cmake-utils +inherit multilib cmake DESCRIPTION="A library to decode Bluetooth baseband packets" HOMEPAGE="http://libbtbb.sourceforge.net/" @@ -47,7 +47,7 @@ which_plugins() { src_prepare() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_prepare + cmake_src_prepare if use wireshark-plugins; then which_plugins @@ -60,7 +60,7 @@ src_prepare() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare + cmake_src_prepare done fi } @@ -73,7 +73,7 @@ src_configure() { -DBUILD_STATIC_LIB=$(usex static-libs) -DBUILD_ROOT="${ED}" ) - cmake-utils_src_configure + cmake_src_configure if use wireshark-plugins; then for i in ${plugins} @@ -87,7 +87,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" ) - cmake-utils_src_configure + cmake_src_configure done fi } @@ -95,7 +95,7 @@ src_configure() { src_compile() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_compile + cmake_src_compile if use wireshark-plugins; then for i in ${plugins} @@ -106,7 +106,7 @@ src_compile() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile + cmake_src_compile done fi } @@ -114,7 +114,7 @@ src_compile() { src_test() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_test + cmake_src_test if use wireshark-plugins; then for i in ${plugins} @@ -125,7 +125,7 @@ src_test() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test + cmake_src_test done fi } @@ -133,7 +133,7 @@ src_test() { src_install() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build - cmake-utils_src_install + cmake_src_install if use wireshark-plugins; then for i in ${plugins} @@ -144,7 +144,7 @@ src_install() { CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} fi BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install + cmake_src_install done fi }