gentoo auto-resync : 30:01:2023 - 14:58:12

3 files changed, 66 insertions, 19 deletions

diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index b11ca55afff9..d48b5cda0421 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,9 +1,10 @@
 AUX gpsbabel-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754ff5f1f5c7f346001a7f0533c9d66744b11d8a748de57783a01ec970e246823f97342283f429a0707939e7ddfd4de429ead6b212de0 SHA512 e73e28becd2c9953501f552a30540511422265647a6d9798499d6558927a5b4d36d019f6c4fd1901d2338ea897ea5fc831e827af4c8a18ffdc7bb38d161b50ad
 AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965
+AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86ef51db7e2962cbd05a33e1b5e5bc5b57845bb3e9e885b85b7ec81cef7c26e424ff3aed81818edb5c749c0b1fc0d1275f545962f1373 SHA512 4b82fdaea637d2bec322b085b3df33e7c493aeec93e145a3f6b1493884c3dd891e0252f9d4a5ec4f75b482178a65de050062fa18f078523426aee60cae002efd
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
 DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
 EBUILD gpsbabel-1.7.0-r1.ebuild 1769 BLAKE2B 9807d1fedb74f998b87b71b9fef86e8e2b32fa3d517aa9ae0935e2ef5813e326039cc1f662c5d6645306f25e0c0e834225489d658e9e94b1ba66ae1e91654c12 SHA512 60a3988906575b57e7992a086f421de995e32849eb1f457c537ba8a17c9de4c6fbb7ac66b64ea1d4443010a5ecbe201bf44f30665765ebadcbde6e2c419fab04
-EBUILD gpsbabel-1.8.0.ebuild 2013 BLAKE2B 0efa67a029126d3446fa5ff0ad62b775a4ff9307375be1c6d4e35d9e1d32370db909aa06d6e24c81dfaec6aad440c421da58a015a4517eaf496ef54862361301 SHA512 dc806399ac54ad6f7a1aec8fdabaa3b12a1f36bd7385feac84d5661b846891fa12be9b44b9e48e636dfb75a11e8a419d2cab9da4a69e30c726553943c318e332
+EBUILD gpsbabel-1.8.0-r1.ebuild 2192 BLAKE2B afd4fa6f9c9042ce43645b1bf37060b2c94b14e4f9ca31207ffdd1f4d6940c73c1cdd07aebf596096f19c5dff7ba26a07e08ce6408e51abb5a31aeb4edbd9474 SHA512 56df45e4ed2b1ada5c8c590891c22d76aa8feda4bd65e5ac24ced75c33113243c8e40f8c45454bc0975cef2d2a0e5824ec5e3fd56839ad9ccaf67f6aa79497f5
 EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch
new file mode 100644
index 000000000000..47a1a37e1ba3
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a7d805..65bd4db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,11 @@ set(CMAKE_AUTORCC ON)
+ add_executable(gpsbabel)
+ 
+ # Find the QtCore library
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++if(USE_QT6)
++  find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
++else()
++  find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
++endif()
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+ list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
+ if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12)
+diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+index 4c839c2..ac329dd 100644
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -23,7 +23,11 @@ endif()
+ add_executable(${TARGET} WIN32 MACOSX_BUNDLE)
+ 
+ # Find the QtCore library
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++if(USE_QT6)
++  find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
++else()
++  find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
++endif()
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Network SerialPort Widgets Xml REQUIRED)
+ list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Xml)
+ if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12)
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
index 47952f41dd2f..cfe639e603e8 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc gui"
+IUSE="doc qt6"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -32,29 +32,42 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
-	gui? ( dev-qt/linguist-tools:5 )
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
 "
-# Even with gui disabled, still links with qtcore
+
 RDEPEND="
 	dev-libs/expat
 	sci-libs/shapelib:=
 	sys-libs/zlib:=[minizip]
 	virtual/libusb:1
-	dev-qt/qtcore:5
-	gui? (
+	!qt6? (
+		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
-		dev-qt/qttranslations: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,mapconverter,md} gui/README.{contrib,gui} )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -63,13 +76,14 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DGPSBABEL_WITH_LIBUSB=pkgconfig
 		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
 		-DGPSBABEL_WITH_ZLIB=pkgconfig
-		-DGPSBABEL_MAPPREVIEW=$(usex gui)
-		-DGPSBABEL_EMBED_MAP=$(usex gui)
-		-DGPSBABEL_EMBED_TRANSLATIONS=$(usex gui)
+		-DGPSBABEL_MAPPREVIEW=ON
+		-DGPSBABEL_EMBED_MAP=ON
+		-DGPSBABEL_EMBED_TRANSLATIONS=ON
+		-DUSE_QT6="$(usex qt6)"
 	)
 
 	cmake_src_configure
@@ -77,7 +91,7 @@ src_configure() {
 
 cmake_src_compile() {
 	cmake_build gpsbabel
-	use gui && cmake_build gpsbabelfe
+	cmake_build gpsbabelfe
 	use doc && cmake_build gpsbabel.html
 }
 
@@ -86,11 +100,9 @@ src_install() {
 	einstalldocs
 
 	dobin gpsbabel
-	if use gui; then
-		dobin gui/GPSBabelFE/gpsbabelfe
-		insinto /usr/share/${PN}/translations/
-		doins gui/gpsbabel*_*.qm
-		newicon gui/images/appicon.png ${PN}.png
-		domenu gui/gpsbabel.desktop
-	fi
+	dobin gui/GPSBabelFE/gpsbabelfe
+	insinto /usr/share/${PN}/translations/
+	doins gui/gpsbabel*_*.qm
+	newicon gui/images/appicon.png ${PN}.png
+	domenu gui/gpsbabel.desktop
 }