From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1267398-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E608213835C
for <garchives@archives.gentoo.org>; Sun, 4 Apr 2021 20:21:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2DBF1E0858;
Sun, 4 Apr 2021 20:21:26 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0B20AE0858
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Apr 2021 20:21:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1612B33BF11
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Apr 2021 20:21:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 10AE0645
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Apr 2021 20:21:22 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1617567617.6624939999b2e9b3d683b51d8bcbbbd8d8ed9a48.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn-plugin-objsearch/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
X-VCS-Directories: sci-geosciences/opencpn-plugin-objsearch/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 6624939999b2e9b3d683b51d8bcbbbd8d8ed9a48
X-VCS-Branch: master
Date: Sun, 4 Apr 2021 20:21:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9771e6a9-655d-4491-a778-ab30d974baca
X-Archives-Hash: 14830d6766fec17b612494db8e38090f
commit: 6624939999b2e9b3d683b51d8bcbbbd8d8ed9a48
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 20:20:17 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 20:20:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66249399
sci-geosciences/opencpn-plugin-objsearch: 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-objsearch-0.7.ebuild | 27 +++++++++++-----------
.../opencpn-plugin-objsearch-9999.ebuild | 27 +++++++++++-----------
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild
index 7f8662fc637..d8a4f05a0de 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.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="objsearch_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
- inherit git-r3 cmake-utils wxwidgets
else
- SRC_URI="
- https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- "
- inherit cmake-utils wxwidgets
+ SRC_URI="https://github.com/nohal/${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/nohal/objsearch_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-objsearch/opencpn-plugin-objsearch-9999.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
index 7f8662fc637..d8a4f05a0de 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-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="objsearch_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
- inherit git-r3 cmake-utils wxwidgets
else
- SRC_URI="
- https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- "
- inherit cmake-utils wxwidgets
+ SRC_URI="https://github.com/nohal/${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/nohal/objsearch_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
}