From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B56C21382C5 for ; Sun, 4 Apr 2021 20:21:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11E83E0878; Sun, 4 Apr 2021 20:21:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EBEB3E0880 for ; Sun, 4 Apr 2021 20:21:27 +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 758FB33DE47 for ; Sun, 4 Apr 2021 20:21:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95FB564C for ; Sun, 4 Apr 2021 20:21:22 +0000 (UTC) From: "David Seifert" 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" Message-ID: <1617567638.6ef8a0699e9740c78dcf98d17374e2e689b6535f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn-plugin-route/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild X-VCS-Directories: sci-geosciences/opencpn-plugin-route/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6ef8a0699e9740c78dcf98d17374e2e689b6535f X-VCS-Branch: master Date: Sun, 4 Apr 2021 20:21:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07e9fb67-4dfd-44e4-88bf-62c411a08ff7 X-Archives-Hash: f8095e721046d8ac0fe526597152c38e commit: 6ef8a0699e9740c78dcf98d17374e2e689b6535f Author: David Seifert gentoo org> AuthorDate: Sun Apr 4 20:20:38 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 4 20:20:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef8a069 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 gentoo.org> .../opencpn-plugin-route-1.2.ebuild | 27 +++++++++++----------- .../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 7318cf9e6c9..a2b93f3991c 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 7318cf9e6c9..a2b93f3991c 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 }