[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn-plugin-otcurrent/

["David Seifert" <soap@gentoo.org>]

commit:     c3d1b4150aa7de28de8c142b1eb1dfb187985fe4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 20:20:29 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 20:20:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d1b415

sci-geosciences/opencpn-plugin-otcurrent: need-wxwidgets -> setup-wxwidgets

Bug: https://bugs.gentoo.org/770622
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../opencpn-plugin-otcurrent-1.2.ebuild            | 27 +++++++++++-----------
 .../opencpn-plugin-otcurrent-9999.ebuild           | 27 +++++++++++-----------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
index 0d88a9a5e63..d7fcccf5a57 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
+++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="otcurrent_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }

diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
index 0d88a9a5e63..d7fcccf5a57 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="otcurrent_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }