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

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

diff --git a/sci-geosciences/opencpn-plugin-route/Manifest b/sci-geosciences/opencpn-plugin-route/Manifest
index a8aacb892b8a..c0136f4510a5 100644
--- a/sci-geosciences/opencpn-plugin-route/Manifest
+++ b/sci-geosciences/opencpn-plugin-route/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-route-1.2.tar.gz 373474 BLAKE2B ca0054882d7fde3f3c244f242acdbb34a5bc7003cd643e76c7e9ecedc35edbc507d2c6336f8746632d3b6bc23ba202953ce66e4e5941b81c46296129823a0eaa SHA512 4dcaa4592f72c6a093276689db5ffa8dae1ed3e0ac6790b85352a6a1942d8863c8f19dfd1110256df9ac28e8056442344852d7790ae97201efe965485a5faa26
-EBUILD opencpn-plugin-route-1.2.ebuild 776 BLAKE2B 2dc3abf37582d14c42212ee4a4a1a5ddfbd20140d577e265e78547531ec8995c86ed6a0a6e1b055816763dcf39f224698a3a502d5f3db29a37b724052e690e7a SHA512 ed86d29455439523e2dde9a3c46f94a83b7562248d0ac6a2d3c2bebc06d5f5478e6ca8f56b48cb767a9fb6021f0dfe07541cca28057cf0a4ff1bf9183b4eb4de
-EBUILD opencpn-plugin-route-9999.ebuild 776 BLAKE2B 2dc3abf37582d14c42212ee4a4a1a5ddfbd20140d577e265e78547531ec8995c86ed6a0a6e1b055816763dcf39f224698a3a502d5f3db29a37b724052e690e7a SHA512 ed86d29455439523e2dde9a3c46f94a83b7562248d0ac6a2d3c2bebc06d5f5478e6ca8f56b48cb767a9fb6021f0dfe07541cca28057cf0a4ff1bf9183b4eb4de
+EBUILD opencpn-plugin-route-1.2.ebuild 743 BLAKE2B 012286c3a6d244b6ba63f332b7fd37b7cec5e955e4bf1b0f302e5f1704d44ed39b6db624dcb881c3088e9ab9715b2347dffc3b130cdc7f86a7986deed377dfef SHA512 9aa97a75b9b6a4391e66a5ad8f2146c08b60f34e46bc48787474bcd5520ba67e2f87ae7e48397db90004e974fd61642cb9db7790fb5996cca0af44089f90ed0c
+EBUILD opencpn-plugin-route-9999.ebuild 743 BLAKE2B 012286c3a6d244b6ba63f332b7fd37b7cec5e955e4bf1b0f302e5f1704d44ed39b6db624dcb881c3088e9ab9715b2347dffc3b130cdc7f86a7986deed377dfef SHA512 9aa97a75b9b6a4391e66a5ad8f2146c08b60f34e46bc48787474bcd5520ba67e2f87ae7e48397db90004e974fd61642cb9db7790fb5996cca0af44089f90ed0c
 MISC metadata.xml 463 BLAKE2B 1c2e2744ea0ad0ba55ba23972872ad96dee8254ddc0870dd2c190ddf6e367d4d4eedb269a177aafae82a22650218fa4707a3875b657e69d132dcac97703c5d99 SHA512 56be58d5be8fc8adc1ad3f1fe85be7e0a5dce179e047796e3db6795f77f16b53461822525ef6ab807af07f672b53210760870e96789d0abaa56a3edc90df23eb
diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild
index 7318cf9e6c91..a2b93f3991c2 100644
--- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild
+++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-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="route_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/SaltyPaws/${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/SaltyPaws/route_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-route/opencpn-plugin-route-9999.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild
index 7318cf9e6c91..a2b93f3991c2 100644
--- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-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="route_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/SaltyPaws/${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/SaltyPaws/route_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