summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-04-04 22:19:56 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-04 22:19:56 +0200
commitab2c35b09c92eb9b7f154020806e8e88c5888896 (patch)
treeb853a049d22d53f49a78546ccf0ec4e121353b06
parentsci-geosciences/opencpn-plugin-br24radar: need-wxwidgets -> setup-wxwidgets (diff)
downloadgentoo-ab2c35b09c92eb9b7f154020806e8e88c5888896.tar.gz
gentoo-ab2c35b09c92eb9b7f154020806e8e88c5888896.tar.bz2
gentoo-ab2c35b09c92eb9b7f154020806e8e88c5888896.zip
sci-geosciences/opencpn-plugin-climatology: 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-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild41
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild41
2 files changed, 40 insertions, 42 deletions
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 c31fad831c7..521e36f3392 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 c31fad831c7..521e36f3392 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/.
}