commit: 31a3d0e95b2a30b5ae835867c855db65899cd788 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Apr 4 20:20:05 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Apr 4 20:20:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a3d0e9
sci-geosciences/opencpn-plugin-gxradar: 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 <AT> gentoo.org> .../opencpn-plugin-gxradar-1.1.ebuild | 27 ++++++++++---------- .../opencpn-plugin-gxradar-9999.ebuild | 29 +++++++++++----------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild index a80898d9615..ed4046ca4fd 100644 --- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild +++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.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="gxradar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git"; - inherit git-r3 cmake-utils wxwidgets else - SRC_URI=" - https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-v.${PV}" fi @@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_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-gxradar/opencpn-plugin-gxradar-9999.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild index 2a3f79bf634..ed4046ca4fd 100644 --- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild @@ -1,20 +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="gxradar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git"; - inherit git-r3 cmake-utils wxwidgets else - SRC_URI=" - https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" + S="${WORKDIR}/${MY_PN}-v.${PV}" fi DESCRIPTION="Garmin xHD Radar Plugin for OpenCPN" @@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_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 }
