commit: 8b3353e6b9d7a6dc7d478da2ddfaebbde626d141
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 21:31:00 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
