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

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

diff --git a/sci-geosciences/opencpn-plugin-weatherfax/Manifest b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
index e2062a4384cb..549d53d04ee3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/Manifest
+++ b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-weatherfax-1.3.20180316.tar.gz 585747 BLAKE2B f81de2da49cd16be62b4fc64e025626a3b7470563db32293803275c0a682b1eff5c85dead9d846e6b69362aa6faaf370f707ab7dab0db981a431bf8872a66430 SHA512 effa3fc2c348bf5a0d70dcfee8a4643f8cba51e5177e40affc50e2d85bffcb2c89c067a57eadb18834900691214b2b1ee17760a8b525cf12da4c7a3e6970daf0
-EBUILD opencpn-plugin-weatherfax-1.3.20180316.ebuild 788 BLAKE2B e8fd09fc1f6b1a313eab44e821291d2c69116953b05d57b3c46c482af05715ee07669b19677bf52263643c7b4ae69945b86b00c1dab06c55cd14d7df1daf598e SHA512 d16fe65db909b71d834de2d7ac90ada96e3764e4c435e2ffb0ae748925301fb4068f270a759306ab8e9810a85f52f8680a08041cc3885c163596b85d87acdf72
-EBUILD opencpn-plugin-weatherfax-9999.ebuild 788 BLAKE2B e8fd09fc1f6b1a313eab44e821291d2c69116953b05d57b3c46c482af05715ee07669b19677bf52263643c7b4ae69945b86b00c1dab06c55cd14d7df1daf598e SHA512 d16fe65db909b71d834de2d7ac90ada96e3764e4c435e2ffb0ae748925301fb4068f270a759306ab8e9810a85f52f8680a08041cc3885c163596b85d87acdf72
+EBUILD opencpn-plugin-weatherfax-1.3.20180316.ebuild 755 BLAKE2B 77b3b8fe994fa09cd2694e0c88e8a618ca32b4b636374f5fc5fb5535408c3337a2ef5079e3579f43f7790696ea29caaa5c56502af8e5a7a8a0835b08329f15b8 SHA512 1b4af80a7faa9d3a81cb107b2bf49ea6853ee04477ec9243dc195ca1e107c67e1b3e711beee29413b2ac682ec82f3d2fd1ae993ce5992a9d0d9619498cfd7beb
+EBUILD opencpn-plugin-weatherfax-9999.ebuild 755 BLAKE2B 77b3b8fe994fa09cd2694e0c88e8a618ca32b4b636374f5fc5fb5535408c3337a2ef5079e3579f43f7790696ea29caaa5c56502af8e5a7a8a0835b08329f15b8 SHA512 1b4af80a7faa9d3a81cb107b2bf49ea6853ee04477ec9243dc195ca1e107c67e1b3e711beee29413b2ac682ec82f3d2fd1ae993ce5992a9d0d9619498cfd7beb
 MISC metadata.xml 472 BLAKE2B ab4fea250816bd907dae37e19a85072902dca8dca6a3a5ea20627fce422a54047813f282efd3c5449ac4a2d0a58fe0233fa94ce6c1a3c707d92aad0bad46f61a SHA512 24db5d6bf03a85cf0b7b246bb2e8472486bf457d284e1f5fa716e09d376e72836bacd0fe9041b93889e2f98af6865ed15481973874e1f93386b6fa71eeef8ff5
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
index 87d53bbc8965..b0cb5f6225f3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.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="weatherfax_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${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/seandepagnier/weatherfax_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-weatherfax/opencpn-plugin-weatherfax-9999.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
index 87d53bbc8965..b0cb5f6225f3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-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="weatherfax_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${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/seandepagnier/weatherfax_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