[gentoo-commits] repo/gentoo:master commit in: net-wireless/cubicsdr/

[David Seifert]

commit:     41c7b4e172c7922fcaac6d4e86b484f1841297af
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 11:37:50 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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
 }