summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-04-04 22:20:23 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-04 22:20:23 +0200
commit2e8c2bbf2f08cd03b8c723c8d13b9b53f2589e73 (patch)
treec75428ee0488df31302709f0d13497245ad0ba96
parentsci-geosciences/opencpn-plugin-ocpndebugger: need-wxwidgets -> setup-wxwidgets (diff)
downloadgentoo-2e8c2bbf2f08cd03b8c723c8d13b9b53f2589e73.tar.gz
gentoo-2e8c2bbf2f08cd03b8c723c8d13b9b53f2589e73.tar.bz2
gentoo-2e8c2bbf2f08cd03b8c723c8d13b9b53f2589e73.zip
sci-geosciences/opencpn-plugin-ocpn_draw: 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-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild27
-rw-r--r--sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild27
2 files changed, 26 insertions, 28 deletions
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
index 8f665fffa34..26a9865b347 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.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="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
- inherit git-r3 cmake-utils wxwidgets
else
- SRC_URI="
- https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz
- "
- inherit cmake-utils wxwidgets
+ SRC_URI="https://github.com/jongough/${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/jongough/ocpn_draw_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-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
index bf8b08e593a..26a9865b347 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-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="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
- inherit git-r3 cmake-utils wxwidgets
else
- SRC_URI="
- https://github.com/jongough/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- inherit cmake-utils wxwidgets
+ SRC_URI="https://github.com/jongough/${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/jongough/ocpn_draw_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
}