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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C09BD158083 for ; Mon, 2 Sep 2024 09:10:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C911F2BC028; Mon, 2 Sep 2024 09:10:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE0BA2BC028 for ; Mon, 2 Sep 2024 09:10:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E401C342FAB for ; Mon, 2 Sep 2024 09:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C5741EC4 for ; Mon, 2 Sep 2024 09:10:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1725268198.8b3353e6b9d7a6dc7d478da2ddfaebbde626d141.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsbabel/gpsbabel-9999.ebuild X-VCS-Directories: sci-geosciences/gpsbabel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8b3353e6b9d7a6dc7d478da2ddfaebbde626d141 X-VCS-Branch: master Date: Mon, 2 Sep 2024 09:10:12 +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: 715b6b03-5f8b-4982-ba86-d0837c5ef8bb X-Archives-Hash: 4480cfa5c5d218876c758af1f2216c62 commit: 8b3353e6b9d7a6dc7d478da2ddfaebbde626d141 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 1 21:31:00 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 2 09:09:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3353e6 sci-geosciences/gpsbabel: Drop IUSE qt6, ~x86 from 9999 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 39 ++++++++------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index 5b61f9f33ebe..8f8e29366683 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -12,61 +12,44 @@ MY_P="${PN}_${MY_PV}" DESCRIPTION="GPS waypoints, tracks and routes converter" HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -if [[ ${PV} == 9999 ]] ; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi LICENSE="GPL-2" SLOT="0" -IUSE="doc qt6" +IUSE="doc" BDEPEND=" + dev-qt/qttools:6[linguist] virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " - RDEPEND=" dev-libs/expat + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtserialport:6 + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6[widgets] sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) " - DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui ) -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" ) src_prepare() { cmake_src_prepare @@ -83,7 +66,7 @@ src_configure() { -DGPSBABEL_MAPPREVIEW=ON -DGPSBABEL_EMBED_MAP=ON -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" + -DUSE_QT6=ON ) cmake_src_configure