5 files changed, 106 insertions, 48 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index f6ffd3639a6a..e8046dc9384f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest
index 6853db41127b..741b933eb503 100644
--- a/sci-visualization/xyscan/Manifest
+++ b/sci-visualization/xyscan/Manifest
@@ -1,3 +1,4 @@
-DIST xyscan-4.30-src.tgz 2700346 BLAKE2B 553e751a8d8320aca0bdfcf9facb528463d4b9179f134c0d2739837af8756760e8831f868737658f21c109c76f87a0c7284c65138b5585481e8201f664f3653e SHA512 f520f9d54893e738e8c93c7f0f4c5940b17e25d2a8dcd42632993b92460cecd388e6bfaa69f3905bdb9e77ea2ec876f3b93d82079d3383d6edc4cc8baec512b6
-EBUILD xyscan-4.3.0.ebuild 1064 BLAKE2B 92525fb4539e44cce5aef09950a2d8b9fb49f3c94750195316ea29100e6a6b59acb93f5960e599957c5bc3554d80f333c3354842dd7784c1f86f0fcb82b116ca SHA512 06160815b7d23bc80494f6d91c52265d0062097d53c953df20e9a4cd15423373e739c849ed5000ce00f445439c3858f47424e95cddac10f5bd2879d664c26c35
+AUX xyscan-4.6.6-qt6.patch 1594 BLAKE2B cbeb4d41db4bd23c589893ee0b7b362ea151252626665eade5e3c8b72e98ab0f1d46745d81c1fbb70258ebb0bd7745060b46a84710ca28a2a64303afedebd5f5 SHA512 368bf1651405ebf63e81ab26494f5282d6a282e417e4c1ce293f4f2068d36a455440403592e8334041c3659eedb88fbb6e5dc5025ede2e3f2fc3306177605381
+DIST xyscan-4.66-src.tgz 7370446 BLAKE2B c52ab2a50a3655f9e224cc8f462d5f94e8bb6e948b1ea1670c981e394d921d20e0c21a0e6b340ed175a57673aacec87ea9fc9c452e475d1767538d9560ca27e0 SHA512 3c7e39ce80f1c67d13687c8982e73a9f8880dcbbc137ec5c65edcf4945a7de7e330c5ff1856d7792b486d2bcc2e4f34e6d6c2284e2e2a0d1e55b8afbc7b79e5e
+EBUILD xyscan-4.6.6.ebuild 1122 BLAKE2B c954c3c17d31f2082d016fb5125d20fdfd375ccff3f657475f3b6bcd30f77c5c079e68a7826050cc53a2d724ee3b2169562d6ba547eb1547928a0c4d353553d9 SHA512 5beab802a8ce9819ab6ff18a9db603e4a4369f363ce12f958e80e613333b4e125d89086295844f4fa8598cf95d3b3adf6399eef383f9358f7ce7f0ac8f397983
 MISC metadata.xml 576 BLAKE2B 5172dfa745d21417e1767d6268a2618175ca2908ea42d7e5353b78031fe761f9ca4d8df36d58a2483f8a38b52d9e74ae4eace9068d2a6ebb26f4ead59899a40e SHA512 ab4bbc4a2dcb432742574a30c33c12bb5f79576dc55d658f110de5c11c6a2ebcbeacf4fbc6d671528f44f074ab7e70cbed6ee685b7b64884fa5f6833ebbd5cb6
diff --git a/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch b/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch
new file mode 100644
index 000000000000..4188a0b5b402
--- /dev/null
+++ b/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch
@@ -0,0 +1,55 @@
+From fd16e64fc8ca5e7f847001050abeef6d6822c061 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 29 Jan 2025 19:25:48 +0100
+Subject: [PATCH] Fix Qt6 build for non-Mac
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/xyscanWindow.cpp |  2 --
+ xyscan.pro           | 10 ++--------
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/xyscanWindow.cpp b/src/xyscanWindow.cpp
+index 03e0267..41d554d 100644
+--- a/src/xyscanWindow.cpp
++++ b/src/xyscanWindow.cpp
+@@ -51,8 +51,6 @@
+ 
+ #if defined(USE_QTPDF)
+ #include <QPdfDocument>
+-#elif defined(USE_POPPLER) && !defined(Q_OS_MAC)
+-#include <poppler-qt5.h>
+ #elif defined(USE_POPPLER)
+ #include <poppler-qt6.h>
+ #endif
+diff --git a/xyscan.pro b/xyscan.pro
+index b792ac7..765fe1e 100644
+--- a/xyscan.pro
++++ b/xyscan.pro
+@@ -24,7 +24,7 @@
+ VERSION = 4.6.6
+ TEMPLATE = app
+ CONFIG  += qt warn_on release c++14 lrelease
+-CONFIG  += sdk_no_version_check
++CONFIG  += sdk_no_version_check link_pkgconfig
+ QT += network xml widgets printsupport multimedia charts
+ QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+ 
+@@ -55,13 +55,7 @@ macx {
+ #
+ unix {
+     !macx {
+-        INCLUDEPATH += /usr/include/poppler/qt5/
+-        INCLUDEPATH += /usr/include/poppler
+-        INCLUDEPATH += /usr/local/include/poppler/qt5/
+-        INCLUDEPATH += /usr/local/include/poppler
+-        INCLUDEPATH += /opt/local/include/poppler/qt5/
+-        INCLUDEPATH += /opt/local/include/poppler
+-        LIBS += -L/usr/local/lib/ -L/usr/lib/ -lpoppler -lpoppler-qt5
++        PKGCONFIG+=poppler-qt6
+     }
+ }
+ 
+-- 
+2.48.1
+
diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
deleted file mode 100644
index 571e6042a598..000000000000
--- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_rs 2 '')
-inherit desktop qmake-utils
-
-DESCRIPTION="Tool for extracting data points from graphs"
-HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/"
-SRC_URI="http://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/poppler[qt5]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:qApp->applicationDirPath() + \"/../docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \
-		src/xyscanWindow.cpp || die "Failed to fix docs path"
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin xyscan
-	local HTML_DOCS=( docs/. )
-	einstalldocs
-	newicon images/xyscanIcon.png xyscan.png
-	make_desktop_entry xyscan "xyscan data point extractor"
-}
diff --git a/sci-visualization/xyscan/xyscan-4.6.6.ebuild b/sci-visualization/xyscan/xyscan-4.6.6.ebuild
new file mode 100644
index 000000000000..1a1e97ef8a7a
--- /dev/null
+++ b/sci-visualization/xyscan/xyscan-4.6.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 2 '')
+inherit desktop qmake-utils
+
+DESCRIPTION="Tool for extracting data points from graphs"
+HOMEPAGE="https://rhig.physics.yale.edu/~ullrich/software/xyscan"
+SRC_URI="https://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/poppler[qt6]
+	dev-qt/qtcharts:6
+	dev-qt/qtbase:6[gui,network,ssl,widgets]
+	dev-qt/qtmultimedia:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt6.patch" )
+
+src_prepare() {
+	default
+	sed -e "/path = /s:\"/usr/share/doc/xyscan/docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \
+		-i src/xyscanBaseWindow.cpp || die "Failed to fix docs path"
+}
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	dobin xyscan
+	local HTML_DOCS=( docs/. )
+	einstalldocs
+	newicon images/xyscanIcon.png xyscan.png
+	make_desktop_entry xyscan "xyscan data point extractor"
+}