diff options
| author |   David Seifert <soap@gentoo.org> | 2021-04-04 22:20:38 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2021-04-04 22:20:38 +0200 |
| commit | 6ef8a0699e9740c78dcf98d17374e2e689b6535f (patch) | |
| tree | a1b4be40c741a6c9085829e025ae484baecbdbdf /sci-geosciences | |
| parent | sci-geosciences/opencpn-plugin-radar: need-wxwidgets -> setup-wxwidgets (diff) | |
| download | gentoo-6ef8a0699e9740c78dcf98d17374e2e689b6535f.tar.gz gentoo-6ef8a0699e9740c78dcf98d17374e2e689b6535f.tar.bz2 gentoo-6ef8a0699e9740c78dcf98d17374e2e689b6535f.zip | |
sci-geosciences/opencpn-plugin-route: 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>
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild | 27 | ||||
| -rw-r--r-- | sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild | 27 |
2 files changed, 26 insertions, 28 deletions
diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild index 7318cf9e6c91..a2b93f3991c2 100644 --- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild +++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.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="route_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets else - SRC_URI=" - https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/SaltyPaws/${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/SaltyPaws/route_pi" LICENSE="GPL-2+" 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-route/opencpn-plugin-route-9999.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild index 7318cf9e6c91..a2b93f3991c2 100644 --- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-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="route_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets else - SRC_URI=" - https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/SaltyPaws/${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/SaltyPaws/route_pi" LICENSE="GPL-2+" 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 } |