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

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

diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest
index 957a419c85af..9d88aabf2733 100644
--- a/sci-geosciences/opencpn-plugin-dr/Manifest
+++ b/sci-geosciences/opencpn-plugin-dr/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1
-EBUILD opencpn-plugin-dr-1.1.ebuild 774 BLAKE2B c6f3945848da58486993ade9341f3418ecf98b89da4e459eb6469ae822455eb941c63c2b16210b2e9080a95c54fbddfe0adc38f8524cada7852f5c65a8990c2c SHA512 39349398430f65feb28545baea26002f39aa0518cf89ae8df0187f5c593984fb355625164f03c37d61bd686d31931de52ce09e577ac21c39968c856f7dfe77aa
-EBUILD opencpn-plugin-dr-9999.ebuild 774 BLAKE2B 0b51a9ac63f0794765cc4c298cff902298c8e9a3ca4b53be73fd9e2d991a409c2b9ba28ff008301ad2ae049956e6badbda1db9136d548a239afc425da26b1800 SHA512 3638a6b8ccdc158346f945fd7afe35e59e7fe4b87b7d5f14cb3b722db4f97de48c39c1afb40e8432ab811c8aea906c71a1320b111b1f0703b36cde1d306fc16a
+EBUILD opencpn-plugin-dr-1.1.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
+EBUILD opencpn-plugin-dr-9999.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
 MISC metadata.xml 458 BLAKE2B 2fae861ce66a1fa1c2bfb5abb9a65e36105421f290535afeb6e80b7d3faf58de9e2265fc9c08acfde23fd2fa388843bdbb1789b067553b34a0e27479223133b6 SHA512 ac9bd60fd829efeef2b9ecc9e7964a94fd165d9c7bf4f3fa6c4d9419d24f97fe85649569bcfe119f3b90d256f7efa69a2b09196ea52f0b66d53ef4a855517148
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild
index f453203e30f1..96bb44ad6eeb 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.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="DR_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/DR_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-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
index 90487153bd03..96bb44ad6eeb 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-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="DR_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/DR_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