From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 sci-geosciences/opencpn-plugin-br24radar/Manifest  |  4 ++--
 .../opencpn-plugin-br24radar-2.1.ebuild            | 27 +++++++++++-----------
 .../opencpn-plugin-br24radar-9999.ebuild           | 27 +++++++++++-----------
 3 files changed, 28 insertions(+), 30 deletions(-)

(limited to 'sci-geosciences/opencpn-plugin-br24radar')

diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest
index d872eb0ddb79..1c4c7e20cce7 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/Manifest
+++ b/sci-geosciences/opencpn-plugin-br24radar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-br24radar-2.1.tar.gz 3947426 BLAKE2B a850973caa64ba4855d97e9374a5e40e292fd0df47a783a711453c49a07f3d945e33247a6199c5c1378dcc1ae29c2e4707675a12b02d3abbd8a115eaf107470c SHA512 357553396fd020e192dbbd5a05af1cd9e06c99244b426239a1d0aac4688affc1702bc16b62010236fc3af1ec7356f1dfb49e3afe3a94cb4dd7b1e0a2ef007af3
-EBUILD opencpn-plugin-br24radar-2.1.ebuild 816 BLAKE2B 0933819067e98b59f62af29a65c438f8ad3737fee78405f5c2de7068d34d2b8935c0a9c8651099e2f563f0182cb2c3bbf28ebd1176c7dc0906aea3f87538bc12 SHA512 559debd8b86e561b101d1269de551e53352b243cbcd226a5f5c23e439b737f5e6627596663e742cfc7828d4b57643d361259483d13d9a7de8218f4a11dbe5d1b
-EBUILD opencpn-plugin-br24radar-9999.ebuild 816 BLAKE2B 0933819067e98b59f62af29a65c438f8ad3737fee78405f5c2de7068d34d2b8935c0a9c8651099e2f563f0182cb2c3bbf28ebd1176c7dc0906aea3f87538bc12 SHA512 559debd8b86e561b101d1269de551e53352b243cbcd226a5f5c23e439b737f5e6627596663e742cfc7828d4b57643d361259483d13d9a7de8218f4a11dbe5d1b
+EBUILD opencpn-plugin-br24radar-2.1.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
+EBUILD opencpn-plugin-br24radar-9999.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
 MISC metadata.xml 465 BLAKE2B 3e0c72f423aaecd1092b831028dc7a728047a32a2297283d0877b082b1bd8adf51abed24710cc42222e3ba516b87f62c6bb5ba9c1da4a8d4e16b078d64ab5653 SHA512 42172f62749df96fbef1cf5bea2c1b07375ae435e2151ce086c461956311143658fc7dab4cb78f8e8f1ac4eda27c3bd175513874fc9a998e4b9a13d0ad470ae5
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
index aed41213a94b..72253384403b 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.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="BR24radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/canboat/${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/canboat/BR24radar_pi"
 
 LICENSE="GPL-3+"
 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-br24radar/opencpn-plugin-br24radar-9999.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
index aed41213a94b..72253384403b 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-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="BR24radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/canboat/${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/canboat/BR24radar_pi"
 
 LICENSE="GPL-3+"
 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
 }
-- 
cgit v1.2.3