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

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

diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
index f57dad54571a..b9fb9a403045 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-ocpn_draw-1.3.14.tar.gz 1341500 BLAKE2B 9324a05d4c7772808be9b90e4b9451724eb8b4ed5439e0dcb40eda13d9583246f9ee47e627e09c219c0fb7e8173079e85c2a0f7be2da2f1cc0f7d7d0548ef974 SHA512 8102eda5edc1b198db639a662f3533423e67ee6a3633c1a74b727a56e3176737deb930d77fb9dbbf38b8c8f678fb31c8087ae5636bc3f9ed156dbec77bdbe6cf
-EBUILD opencpn-plugin-ocpn_draw-1.3.14.ebuild 771 BLAKE2B dc73bf82f70fe4ae3af1caaf276b597e88319039717a77b378b7ea663b9e9ce09e70821e2fc6d023d4fc6bf39614f1b9f407dc421c979802ffd1853edd1f50a4 SHA512 7fee64e5f2334092c7439edac84a77083885c59292880328d0b4013320bfbc1b17ee5b43a168db55eb4786bcb455eebdd7f39d5d9d0504755a63a97b4aff6ffb
-EBUILD opencpn-plugin-ocpn_draw-9999.ebuild 770 BLAKE2B 840da62a3f7060c99de922075f1966839288479aefe882bafa5ad1bdb93680e838d1dceb63e16c8706f1724494c3d375548ee2930329b52bb1902eb76cdf47a5 SHA512 d29d5e89ca7e2de9164a9d191313b52f117075eaa91c12fffa6f3a541d3b811ec54dcacf53b4775515d87f3a666efcc94b0ff455911ba7da5d93ccb6c34c3b77
+EBUILD opencpn-plugin-ocpn_draw-1.3.14.ebuild 738 BLAKE2B 2fbcc9938a35a2bc279a2444ce436ad6b4e5257eca60d7ec681e7c5cc40287c005d50ae2efb2583d821478c8f6943ca9db0b44fee8119d8483bb13c5fa453485 SHA512 08d5cfb796bad8753960e0770f4a27f371e7798a11efa4195012dec525dd740e51b01c3bee97b8fb989b55809b3918c85fd3dc9343f8eb65f27d5b3c28baf4c8
+EBUILD opencpn-plugin-ocpn_draw-9999.ebuild 738 BLAKE2B 2fbcc9938a35a2bc279a2444ce436ad6b4e5257eca60d7ec681e7c5cc40287c005d50ae2efb2583d821478c8f6943ca9db0b44fee8119d8483bb13c5fa453485 SHA512 08d5cfb796bad8753960e0770f4a27f371e7798a11efa4195012dec525dd740e51b01c3bee97b8fb989b55809b3918c85fd3dc9343f8eb65f27d5b3c28baf4c8
 MISC metadata.xml 466 BLAKE2B 56c6ce77a0496bbc1c8fbfa8abcf37487bfba38f448cfe139fee70cbf60e64001da61e5bccd59f69074dd28799c077d7882c013495b582aaf508b78a1d90c642 SHA512 018ebc234b7cd3fad579532636a57d8649b20ddafc25a43af81fe79189ce1cdbc6b5c227fa5b2591e114739ae9d48e1943213065ebdad779ea1209f7516c7dcf
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
index 8f665fffa34c..26a9865b3471 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.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="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/jongough/${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/jongough/ocpn_draw_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-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
index bf8b08e593af..26a9865b3471 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-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="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/jongough/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/jongough/${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/jongough/ocpn_draw_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