summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-04-04 22:20:14 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-04 22:20:14 +0200
commit154fea40ee02def523cae16dd987bc403428dafd (patch)
tree3a41b54f952bd99b267ffdfb50f60e11040004cf
parentsci-geosciences/opencpn-plugin-launcher: need-wxwidgets -> setup-wxwidgets (diff)
downloadgentoo-154fea40ee02def523cae16dd987bc403428dafd.tar.gz
gentoo-154fea40ee02def523cae16dd987bc403428dafd.tar.bz2
gentoo-154fea40ee02def523cae16dd987bc403428dafd.zip
sci-geosciences/opencpn-plugin-logbookkonni: need-wxwidgets -> setup-wxwidgets
Bug: https://bugs.gentoo.org/770622 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild42
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild42
2 files changed, 42 insertions, 42 deletions
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 7f63c653a7e..88643bb432b 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
+ cmake_src_install
+
cd "${WORKDIR}" || die
- zip -r "${D}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || 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 7f63c653a7e..88643bb432b 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
+ cmake_src_install
+
cd "${WORKDIR}" || die
- zip -r "${D}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || 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
}