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-radar/Manifest      |  4 ++--
 .../opencpn-plugin-radar-0.98.ebuild               | 27 +++++++++++-----------
 .../opencpn-plugin-radar-9999.ebuild               | 27 +++++++++++-----------
 3 files changed, 28 insertions(+), 30 deletions(-)

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

diff --git a/sci-geosciences/opencpn-plugin-radar/Manifest b/sci-geosciences/opencpn-plugin-radar/Manifest
index d8bef995b88c..9289a638e82e 100644
--- a/sci-geosciences/opencpn-plugin-radar/Manifest
+++ b/sci-geosciences/opencpn-plugin-radar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-radar-0.98.tar.gz 113968 BLAKE2B 8eefaf047071c16c055cd2d05e2a0c284d2929b9e450c78044f7864e9d266a682b41e7674a6d495b468181f3b4d17cf0680d420a85e92e8c5818bfac31a215a2 SHA512 f424659e446c79eefbc37999154dc912f26c380a90cf54be40f034a052ae48b3eb479d7cd23b216db8484eae25a5d1c3ab42afd9f3b336aa0534903d8da8bbd1
-EBUILD opencpn-plugin-radar-0.98.ebuild 796 BLAKE2B ecbac3884562c406283d17ece50a0f8e5464887b601faf2160a331d5404f650ee76274c08e3acf25bb0db7e9f3b283c63c4279a4ccafd97cba733546cc323cf0 SHA512 4290ba7f7647d34d345450f9de5710ecfe860544bacb4fc8b70b60734d2ea5a4af75ac7efa7718dc06e2afe03a39568921f281ca2944a96682db30ce134ba031
-EBUILD opencpn-plugin-radar-9999.ebuild 796 BLAKE2B ecbac3884562c406283d17ece50a0f8e5464887b601faf2160a331d5404f650ee76274c08e3acf25bb0db7e9f3b283c63c4279a4ccafd97cba733546cc323cf0 SHA512 4290ba7f7647d34d345450f9de5710ecfe860544bacb4fc8b70b60734d2ea5a4af75ac7efa7718dc06e2afe03a39568921f281ca2944a96682db30ce134ba031
+EBUILD opencpn-plugin-radar-0.98.ebuild 763 BLAKE2B d81eb7d15a9dd50a7ad8bcafb3b6eb141abc959775a9aed4d5ba18efec0060c4f013139a28e97965f3e9080f878054a54b52409c4a61833af05e1f53a783f569 SHA512 abcf905d762f4e88b4f6a5d80e165c0e1d0e6507633dcb2e95857434a4c913bae2bbf526182739be260ba52c8be64b91e4163db8a5071da1f581ce8cd497b946
+EBUILD opencpn-plugin-radar-9999.ebuild 763 BLAKE2B d81eb7d15a9dd50a7ad8bcafb3b6eb141abc959775a9aed4d5ba18efec0060c4f013139a28e97965f3e9080f878054a54b52409c4a61833af05e1f53a783f569 SHA512 abcf905d762f4e88b4f6a5d80e165c0e1d0e6507633dcb2e95857434a4c913bae2bbf526182739be260ba52c8be64b91e4163db8a5071da1f581ce8cd497b946
 MISC metadata.xml 462 BLAKE2B b84445d2093a9a14350d70cda137dc312a6464abcbc8e79895a635b35aff9896b1762dbdf34e16954ef3c056ff1e077f36f32efe7bcd77a198ca2ad614ddce91 SHA512 a55828c3828d2596b3357421282025f9098f5f0a38599f33594516d14b96ba57d5d18d488a5b3780ffedadf33206753af6375026ecb1035ee5934275b6eb6ee7
diff --git a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild
index 2926ea6725ca..9322ab47c120 100644
--- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild
+++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.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="radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Verezano/radar_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-radar/opencpn-plugin-radar-9999.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild
index 2926ea6725ca..9322ab47c120 100644
--- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-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="radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Verezano/radar_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
 }
-- 
cgit v1.2.3