| 1 |
commit: 41c7b4e172c7922fcaac6d4e86b484f1841297af |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 25 11:37:50 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 25 11:37:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c7b4e1 |
| 7 |
|
| 8 |
net-wireless/cubicsdr: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild | 23 +++++++++++------------ |
| 14 |
net-wireless/cubicsdr/cubicsdr-9999.ebuild | 23 +++++++++++------------ |
| 15 |
2 files changed, 22 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild b/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild |
| 18 |
index bf112d039bd..8cb4b6b56d0 100644 |
| 19 |
--- a/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild |
| 20 |
+++ b/net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild |
| 21 |
@@ -1,14 +1,14 @@ |
| 22 |
# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
-WX_GTK_VER="3.0-gtk3" |
| 27 |
+EAPI=7 |
| 28 |
|
| 29 |
-inherit cmake-utils wxwidgets |
| 30 |
+WX_GTK_VER="3.0-gtk3" |
| 31 |
+inherit cmake wxwidgets |
| 32 |
|
| 33 |
-if [ "${PV}" = "9999" ]; then |
| 34 |
- EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" |
| 35 |
+if [[ ${PV} == *9999 ]]; then |
| 36 |
inherit git-r3 |
| 37 |
+ EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" |
| 38 |
else |
| 39 |
MY_P="CubicSDR" |
| 40 |
SRC_URI="https://github.com/cjcliffe/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 41 |
@@ -23,23 +23,22 @@ LICENSE="GPL-2" |
| 42 |
SLOT="0" |
| 43 |
IUSE="alsa pulseaudio" |
| 44 |
|
| 45 |
-DEPEND=" |
| 46 |
+RDEPEND=" |
| 47 |
net-libs/liquid-dsp |
| 48 |
x11-libs/wxGTK:${WX_GTK_VER}[opengl] |
| 49 |
net-wireless/soapysdr |
| 50 |
virtual/opengl |
| 51 |
alsa? ( media-libs/alsa-lib ) |
| 52 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 53 |
-" |
| 54 |
-RDEPEND="${DEPEND}" |
| 55 |
+ pulseaudio? ( media-sound/pulseaudio )" |
| 56 |
+DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
setup-wxwidgets |
| 60 |
|
| 61 |
local mycmakeargs=( |
| 62 |
- -DUSE_AUDIO_ALSA="$(usex alsa)" |
| 63 |
- -DUSE_AUDIO_PULSE="$(usex pulseaudio)" |
| 64 |
+ -DUSE_AUDIO_ALSA=$(usex alsa) |
| 65 |
+ -DUSE_AUDIO_PULSE=$(usex pulseaudio) |
| 66 |
) |
| 67 |
|
| 68 |
- cmake-utils_src_configure |
| 69 |
+ cmake_src_configure |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/net-wireless/cubicsdr/cubicsdr-9999.ebuild b/net-wireless/cubicsdr/cubicsdr-9999.ebuild |
| 73 |
index bf112d039bd..8cb4b6b56d0 100644 |
| 74 |
--- a/net-wireless/cubicsdr/cubicsdr-9999.ebuild |
| 75 |
+++ b/net-wireless/cubicsdr/cubicsdr-9999.ebuild |
| 76 |
@@ -1,14 +1,14 @@ |
| 77 |
# Copyright 1999-2021 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
-EAPI=6 |
| 81 |
-WX_GTK_VER="3.0-gtk3" |
| 82 |
+EAPI=7 |
| 83 |
|
| 84 |
-inherit cmake-utils wxwidgets |
| 85 |
+WX_GTK_VER="3.0-gtk3" |
| 86 |
+inherit cmake wxwidgets |
| 87 |
|
| 88 |
-if [ "${PV}" = "9999" ]; then |
| 89 |
- EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" |
| 90 |
+if [[ ${PV} == *9999 ]]; then |
| 91 |
inherit git-r3 |
| 92 |
+ EGIT_REPO_URI="https://github.com/cjcliffe/CubicSDR.git" |
| 93 |
else |
| 94 |
MY_P="CubicSDR" |
| 95 |
SRC_URI="https://github.com/cjcliffe/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 96 |
@@ -23,23 +23,22 @@ LICENSE="GPL-2" |
| 97 |
SLOT="0" |
| 98 |
IUSE="alsa pulseaudio" |
| 99 |
|
| 100 |
-DEPEND=" |
| 101 |
+RDEPEND=" |
| 102 |
net-libs/liquid-dsp |
| 103 |
x11-libs/wxGTK:${WX_GTK_VER}[opengl] |
| 104 |
net-wireless/soapysdr |
| 105 |
virtual/opengl |
| 106 |
alsa? ( media-libs/alsa-lib ) |
| 107 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 108 |
-" |
| 109 |
-RDEPEND="${DEPEND}" |
| 110 |
+ pulseaudio? ( media-sound/pulseaudio )" |
| 111 |
+DEPEND="${RDEPEND}" |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
setup-wxwidgets |
| 115 |
|
| 116 |
local mycmakeargs=( |
| 117 |
- -DUSE_AUDIO_ALSA="$(usex alsa)" |
| 118 |
- -DUSE_AUDIO_PULSE="$(usex pulseaudio)" |
| 119 |
+ -DUSE_AUDIO_ALSA=$(usex alsa) |
| 120 |
+ -DUSE_AUDIO_PULSE=$(usex pulseaudio) |
| 121 |
) |
| 122 |
|
| 123 |
- cmake-utils_src_configure |
| 124 |
+ cmake_src_configure |
| 125 |
} |
Archives