From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1370604-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BE80E15808B
for <garchives@archives.gentoo.org>; Thu, 24 Feb 2022 16:04:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A34B4E084A;
Thu, 24 Feb 2022 16:04:49 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 89028E084A
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2022 16:04:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9A1DE342D8C
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2022 16:04:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CC6612EC
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2022 16:04:45 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
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" <zerochaos@gentoo.org>
Message-ID: <1645718665.37b450a21884e166125aa38e6a72bb1e7a1b7906.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-wireless/uhd/uhd-3.15.0.0-r100.ebuild net-wireless/uhd/uhd-4.1.0.4.ebuild
X-VCS-Directories: net-wireless/uhd/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: 37b450a21884e166125aa38e6a72bb1e7a1b7906
X-VCS-Branch: master
Date: Thu, 24 Feb 2022 16:04:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 382ede4c-1276-471d-9d09-fc5fb9160baa
X-Archives-Hash: b7674b7f4eea7c800b7ceaba2848b03e
commit: 37b450a21884e166125aa38e6a72bb1e7a1b7906
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 17:24:19 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b450a2
net-wireless/uhd: fix ebuild deprecation
Bump eapi 7 -> 8
Migrate eclass cmake-utils -> cmake
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 11 +++++------
net-wireless/uhd/uhd-4.1.0.4.ebuild | 13 ++++++-------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 439b2f78fc50..598f6ea06237 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-#not sure why, but eapi 7 fails
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
+inherit python-single-r1 gnome2-utils cmake
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -61,7 +60,7 @@ src_unpack() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
gnome2_environment_reset #534582
@@ -97,10 +96,10 @@ src_configure() {
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [ "${PV}" != "9999" ]; then
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 3b262ab66ff5..8fbc0ab1a94a 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-#not sure why, but eapi 7 fails
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
+inherit python-single-r1 gnome2-utils cmake
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -61,7 +60,7 @@ src_unpack() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
gnome2_environment_reset #534582
@@ -92,10 +91,10 @@ src_configure() {
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [ "${PV}" != "9999" ]; then
@@ -143,5 +142,5 @@ src_install() {
src_test() {
#we can disable the python tests
#ctest -E 'py*'
- PYTHON_PATH=python/ cmake-utils_src_test
+ PYTHON_PATH=python/ cmake_src_test
}