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 AB24D1382C5 for ; Sun, 25 Apr 2021 11:38:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9308E07D8; Sun, 25 Apr 2021 11:38:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 6D942E07D8 for ; Sun, 25 Apr 2021 11:38:06 +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 38D2E341496 for ; Sun, 25 Apr 2021 11:38:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5142D4C3 for ; Sun, 25 Apr 2021 11:38:03 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1619350670.41c7b4e172c7922fcaac6d4e86b484f1841297af.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/cubicsdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild net-wireless/cubicsdr/cubicsdr-9999.ebuild X-VCS-Directories: net-wireless/cubicsdr/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 41c7b4e172c7922fcaac6d4e86b484f1841297af X-VCS-Branch: master Date: Sun, 25 Apr 2021 11:38:03 +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: f683cc0a-1166-4a5c-bf5b-ecbecc0bfad3 X-Archives-Hash: 5c4c67b73d64cd7356ce0b47d97582aa commit: 41c7b4e172c7922fcaac6d4e86b484f1841297af Author: David Seifert gentoo org> AuthorDate: Sun Apr 25 11:37:50 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 25 11:37:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c7b4e1 net-wireless/cubicsdr: Port to EAPI 7 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild | 23 +++++++++++------------ net-wireless/cubicsdr/cubicsdr-9999.ebuild | 23 +++++++++++------------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild b/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild index bf112d039bd..8cb4b6b56d0 100644 --- a/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild +++ b/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -WX_GTK_VER="3.0-gtk3" +EAPI=7 -inherit cmake-utils wxwidgets +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" +if [[ ${PV} == *9999 ]]; then inherit git-r3 + EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" else MY_P="CubicSDR" SRC_URI="https://github.com/cjcliffe/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -23,23 +23,22 @@ LICENSE="GPL-2" SLOT="0" IUSE="alsa pulseaudio" -DEPEND=" +RDEPEND=" net-libs/liquid-dsp x11-libs/wxGTK:${WX_GTK_VER}[opengl] net-wireless/soapysdr virtual/opengl alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" + pulseaudio? ( media-sound/pulseaudio )" +DEPEND="${RDEPEND}" src_configure() { setup-wxwidgets local mycmakeargs=( - -DUSE_AUDIO_ALSA="$(usex alsa)" - -DUSE_AUDIO_PULSE="$(usex pulseaudio)" + -DUSE_AUDIO_ALSA=$(usex alsa) + -DUSE_AUDIO_PULSE=$(usex pulseaudio) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/net-wireless/cubicsdr/cubicsdr-9999.ebuild b/net-wireless/cubicsdr/cubicsdr-9999.ebuild index bf112d039bd..8cb4b6b56d0 100644 --- a/net-wireless/cubicsdr/cubicsdr-9999.ebuild +++ b/net-wireless/cubicsdr/cubicsdr-9999.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -WX_GTK_VER="3.0-gtk3" +EAPI=7 -inherit cmake-utils wxwidgets +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" +if [[ ${PV} == *9999 ]]; then inherit git-r3 + EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" else MY_P="CubicSDR" SRC_URI="https://github.com/cjcliffe/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -23,23 +23,22 @@ LICENSE="GPL-2" SLOT="0" IUSE="alsa pulseaudio" -DEPEND=" +RDEPEND=" net-libs/liquid-dsp x11-libs/wxGTK:${WX_GTK_VER}[opengl] net-wireless/soapysdr virtual/opengl alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" + pulseaudio? ( media-sound/pulseaudio )" +DEPEND="${RDEPEND}" src_configure() { setup-wxwidgets local mycmakeargs=( - -DUSE_AUDIO_ALSA="$(usex alsa)" - -DUSE_AUDIO_PULSE="$(usex pulseaudio)" + -DUSE_AUDIO_ALSA=$(usex alsa) + -DUSE_AUDIO_PULSE=$(usex pulseaudio) ) - cmake-utils_src_configure + cmake_src_configure }