diff options
| author |   David Seifert <soap@gentoo.org> | 2021-04-04 22:20:54 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2021-04-04 22:20:54 +0200 |
| commit | 3d8fd9f6200d46764b31301ae3ac175708e4a26f (patch) | |
| tree | d802233a1224392279364128dc1248911c0ccc1b | |
| parent | sci-geosciences/opencpn-plugin-weatherfax: need-wxwidgets -> setup-wxwidgets (diff) | |
| download | gentoo-3d8fd9f6200d46764b31301ae3ac175708e4a26f.tar.gz gentoo-3d8fd9f6200d46764b31301ae3ac175708e4a26f.tar.bz2 gentoo-3d8fd9f6200d46764b31301ae3ac175708e4a26f.zip | |
sci-geosciences/opencpn-plugin-weather_routing: need-wxwidgets -> setup-wxwidgets
Closes: https://bugs.gentoo.org/770622
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
2 files changed, 26 insertions, 28 deletions
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild index bb68887e62a0..826df2e8f0ba 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild +++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.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="weather_routing_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/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/seandepagnier/${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/weather_routing_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-weather_routing/opencpn-plugin-weather_routing-9999.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild index bb68887e62a0..826df2e8f0ba 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-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="weather_routing_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/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/seandepagnier/${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/weather_routing_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 } |