gentoo resync : 28.04.2021

3 files changed, 46 insertions, 46 deletions

diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
index 3f84f504cadc..cc67aef05feb 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -1,5 +1,5 @@
 DIST opencpn-plugin-logbookkonni-1.3002.tar.gz 3810133 BLAKE2B e22d4fe15e54ce914d97bfb0c660210dddec26ba7e6867708489f042e18b04f2e4832275a7a96a31e5a4f1bc25faca1f8343ce66114751d1c37b525e749f8d15 SHA512 a539e8d01f9e81f859826477c1abbdafeacc1bd0a1e734777698eb471ddf0a1356bcd321b4b3aa27f9593e0d412e52fb8791248a0dfbc20daa7c9214152e8030
 DIST opencpn-plugin-logbookkonni-1.3002_Layouts.zip 1722887 BLAKE2B ba2b966def65930f544aabe1a617c5cc3aac69f578ffb3360388724c78d4c793719d50e577b0571933168f7f5cc55a27dcbb2e5616b90c17d0257052fd052d9f SHA512 f493d9af822a960f3b9a5d557d46b73e89c8179bfbc4d260d133c972e22d4ce5753e64b2d8ced321589a11a0a32efe1c34b574ed850af0673768896cdbb3d9c5
-EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B e236fe3ee40155234c408658292d67534455799e488bba8d315c7018bbcbadc3aed7b775740a5cf046cdfd9d0a0db30ef8cc52478081f766a3c2b814aeae60a2 SHA512 319dc5c38ce6e5ca29d0c685df9b3ba10ccc0b10c7d685edfe4da3192dfaca92ecb4651ae1d3dc795f28db965e0e3cdcde1fd484a58feb4f036225e580955e8c
-EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B e236fe3ee40155234c408658292d67534455799e488bba8d315c7018bbcbadc3aed7b775740a5cf046cdfd9d0a0db30ef8cc52478081f766a3c2b814aeae60a2 SHA512 319dc5c38ce6e5ca29d0c685df9b3ba10ccc0b10c7d685edfe4da3192dfaca92ecb4651ae1d3dc795f28db965e0e3cdcde1fd484a58feb4f036225e580955e8c
+EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
+EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
 MISC metadata.xml 472 BLAKE2B b79d5d4322925eadb22f29139af36e610836888e745a64ebf7005d1ca06e54f9ca4b119162a902d5a3301ce0751e06fde1cdc3fb3b7b6ce363b327bc3e53c17f SHA512 6a2770dd9706b34e4615e3f87b1f393bd0a8ce1be5aa2060e0c5718c11238368320d872418452545591cb0d2464d6b49f27750381e9e30001588948e32e1cddd
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
index 8a0124d6bf0e..88643bb432bf 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
@@ -1,19 +1,20 @@
 # 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="LogbookKonni-1.2"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
 	SRC_URI="
 		https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip
-	"
-	inherit cmake-utils wxwidgets
+		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -23,38 +24,37 @@ HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/zip
-	${RDEPEND}
-"
+	sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
 
 src_install() {
 	# install layouts as zip
-	cmake-utils_src_install
-	cd "$WORKDIR"
-	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
+	cmake_src_install
+
+	cd "${WORKDIR}" || die
+	zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
 }
 
 pkg_postinst() {
 	elog "Installation of logbook layouts"
 	elog "*******************************"
-	elog ""
+	elog
 	elog "The default layouts zip file has been installed to:"
-	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
-	elog ""
+	elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+	elog
 	elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
 	elog "click the install button and choose the above mentioned zip file"
-	elog ""
+	elog
 }
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
index 8a0124d6bf0e..88643bb432bf 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
@@ -1,19 +1,20 @@
 # 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="LogbookKonni-1.2"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
 	SRC_URI="
 		https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip
-	"
-	inherit cmake-utils wxwidgets
+		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -23,38 +24,37 @@ HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/zip
-	${RDEPEND}
-"
+	sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
 
 src_install() {
 	# install layouts as zip
-	cmake-utils_src_install
-	cd "$WORKDIR"
-	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
+	cmake_src_install
+
+	cd "${WORKDIR}" || die
+	zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
 }
 
 pkg_postinst() {
 	elog "Installation of logbook layouts"
 	elog "*******************************"
-	elog ""
+	elog
 	elog "The default layouts zip file has been installed to:"
-	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
-	elog ""
+	elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+	elog
 	elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
 	elog "click the install button and choose the above mentioned zip file"
-	elog ""
+	elog
 }