gentoo resync : 28.04.2021

3 files changed, 42 insertions, 44 deletions

diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest
index f3bdb7d12368..cc766c3a5d45 100644
--- a/sci-geosciences/opencpn-plugin-climatology/Manifest
+++ b/sci-geosciences/opencpn-plugin-climatology/Manifest
@@ -1,5 +1,5 @@
 DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 BLAKE2B 57e781f4d86ec17456e786629ec5b82c9aba872c2f8c26ec628e4ab5314b0a3c6933cc0c7a36616830038add1f95a52b8acd7c6f03cb702c611be255a3b91f1a SHA512 5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3
 DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505 SHA512 cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f
-EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1055 BLAKE2B 832493e351251b92f170513553bb44fdefa416c8b5c8b25ca8e4139a1bed6ce69fcf6146c363cf50a7459bcfed2eb15e40be443bb289efb38d51937005dbfc02 SHA512 a05269e205cc18175de56727fcc6bd98cf6e615e7ca08c6265dd1d532201a5902123a0219edd15bfb40cd0a1ce508019d2b47bbc5c6423c67c29645a129b9680
-EBUILD opencpn-plugin-climatology-9999.ebuild 1055 BLAKE2B 832493e351251b92f170513553bb44fdefa416c8b5c8b25ca8e4139a1bed6ce69fcf6146c363cf50a7459bcfed2eb15e40be443bb289efb38d51937005dbfc02 SHA512 a05269e205cc18175de56727fcc6bd98cf6e615e7ca08c6265dd1d532201a5902123a0219edd15bfb40cd0a1ce508019d2b47bbc5c6423c67c29645a129b9680
+EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
+EBUILD opencpn-plugin-climatology-9999.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
 MISC metadata.xml 532 BLAKE2B 3916a4f03c5b5f8237a5715f1d0f9e4d665f0fdbe6e8c68005a2f73d6aaf094cb153b263f102e5c3b08f78722fcc075e58ce9873a5aceae61c3672459e15bd4d SHA512 12135b8d8c1d890b7462e1defff7573b7da01949d7cbf4b687b18de40ad46c4cb6dd5b494c5e1aaa49549cba2841d7c6a8b2129f03c5ea25c5dd176054c3dd7a
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
index ddf574555659..521e36f33927 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
@@ -1,46 +1,45 @@
 # 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="climatology_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
-SRC_URI="
-	$SRC_URI
-	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
-"
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
 HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+SRC_URI="
+	${SRC_URI}
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
 
 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}"
+BDEPEND="sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
+
 src_install() {
-	cmake-utils_src_install
-	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
-	doins "${S}"/{,../}data/*
+	cmake_src_install
+
+	insinto /usr/share/opencpn/plugins/${MY_PN}/data/
+	doins -r {,../}data/.
 }
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
index ddf574555659..521e36f33927 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
@@ -1,46 +1,45 @@
 # 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="climatology_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
-SRC_URI="
-	$SRC_URI
-	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
-"
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
 HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+SRC_URI="
+	${SRC_URI}
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
 
 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}"
+BDEPEND="sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
+
 src_install() {
-	cmake-utils_src_install
-	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
-	doins "${S}"/{,../}data/*
+	cmake_src_install
+
+	insinto /usr/share/opencpn/plugins/${MY_PN}/data/
+	doins -r {,../}data/.
 }