7 files changed, 114 insertions, 182 deletions
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index eefbc10c4021..a5b724486bf8 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,2 +1 @@
-DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
-DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1
+DIST texworks-0.6.8.tar.gz 12486607 BLAKE2B a7de78adc0746c57b721a400a704d3912574933604e01124a99f5a60ba377ba66ce8d57f5f0a87e336de715d981146db6b8ae61a78c744b385c698fcdad2f7fe SHA512 23164f9ab2f611a705b533f4c435891f1279d1e0e0de2d7f947864f8919a6513cb696881dc1dcf93345471599f113d264ced57cbd2dceae343b9dde46ee80482
diff --git a/app-editors/texworks/files/qt5.15-support.patch b/app-editors/texworks/files/qt5.15-support.patch
deleted file mode 100644
index 9c77c157e463..000000000000
--- a/app-editors/texworks/files/qt5.15-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
-Date: Fri, 1 May 2020 08:05:46 +0200
-Subject: [PATCH] <QtPDF> Fix compilation with Qt 5.15
-
----
- modules/QtPDF/src/PDFBackend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp
-index 0305d87a..500d20aa 100644
---- a/modules/QtPDF/src/PDFBackend.cpp
-+++ b/modules/QtPDF/src/PDFBackend.cpp
-@@ -14,6 +14,7 @@
- 
- #include <PDFBackend.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- 
- namespace QtPDF {
diff --git a/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch b/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch
new file mode 100644
index 000000000000..460c4f4f7e2d
--- /dev/null
+++ b/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch
@@ -0,0 +1,25 @@
+It doesn't work like that.
+
+--- a/CMakeLists.txt	2023-02-18 11:42:11.000000000 +0100
++++ b/CMakeLists.txt	2023-10-21 20:00:29.144638825 +0200
+@@ -281,9 +281,11 @@
+ 	set(QT_VERSION_PATCH "${Qt6_VERSION_PATCH}")
+ else ()
+ 	# Check for Qt5
+-	find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml OPTIONAL_COMPONENTS Script ScriptTools)
++	find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml)
+ 	set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui Qt5::UiTools Qt5::Concurrent Qt5::Xml Qt5::Qml)
+ 
++	find_package(Qt5Script)
++	find_package(Qt5ScriptTools)
+ 	if (Qt5Script_FOUND AND Qt5ScriptTools_FOUND)
+ 		list(APPEND QT_LIBRARIES Qt5::ScriptTools Qt5::Script)
+ 		set(WITH_QTSCRIPT ON)
+@@ -311,7 +313,6 @@
+ 	set(QT_VERSION_MAJOR "${Qt5_VERSION_MAJOR}")
+ 	set(QT_VERSION_MINOR "${Qt5_VERSION_MINOR}")
+ 	set(QT_VERSION_PATCH "${Qt5_VERSION_PATCH}")
+-	set(WITH_QTSCRIPT ON)
+ endif ()
+ 
+ # Expose the major version number of Qt to the preprocessor. This is necessary
diff --git a/app-editors/texworks/metadata.xml b/app-editors/texworks/metadata.xml
index 48d3ded01150..d88999c90d1a 100644
--- a/app-editors/texworks/metadata.xml
+++ b/app-editors/texworks/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
-</maintainer>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">TeXworks/texworks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild
deleted file mode 100644
index 39f076553e6a..000000000000
--- a/app-editors/texworks/texworks-0.6.5-r100.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_REMOVE_MODULES_LIST="FindLua"
-inherit lua-single python-single-r1 cmake virtualx xdg-utils
-
-DESCRIPTION="A simple interface for working with TeX documents"
-HOMEPAGE="http://tug.org/texworks/"
-SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua python"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-text/hunspell:=
-	app-text/poppler[qt5]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5[scripttools]
-	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} ) "
-
-DEPEND="dev-qt/linguist-tools:5
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/qt5.15-support.patch
-	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DPREFER_BUNDLED_SYNCTEX=ON
-		-DWITH_LUA=$(usex lua ON OFF)
-		-DWITH_PYTHON=$(usex python ON OFF)
-		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
-		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
-		-DQTPDF_VIEWER=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_SHARED_PLUGINS=ON
-	)
-	use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
-	cmake_src_configure
-}
-
-src_test() {
-	virtx default_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/texworks/texworks-0.6.6.ebuild b/app-editors/texworks/texworks-0.6.6.ebuild
deleted file mode 100644
index e8ad1634456a..000000000000
--- a/app-editors/texworks/texworks-0.6.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_REMOVE_MODULES_LIST="FindLua"
-inherit lua-single python-single-r1 cmake virtualx xdg-utils
-
-DESCRIPTION="A simple interface for working with TeX documents"
-HOMEPAGE="http://tug.org/texworks/"
-SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua python"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-text/hunspell:=
-	app-text/poppler[qt5]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5[scripttools]
-	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} ) "
-
-DEPEND="dev-qt/linguist-tools:5
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DPREFER_BUNDLED_SYNCTEX=ON
-		-DWITH_LUA=$(usex lua ON OFF)
-		-DWITH_PYTHON=$(usex python ON OFF)
-		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
-		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
-		-DQTPDF_VIEWER=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_SHARED_PLUGINS=ON
-	)
-	use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
-	cmake_src_configure
-}
-
-src_test() {
-	virtx default_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/texworks/texworks-0.6.8.ebuild b/app-editors/texworks/texworks-0.6.8.ebuild
new file mode 100644
index 000000000000..65ac3d6842d0
--- /dev/null
+++ b/app-editors/texworks/texworks-0.6.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{9..12} )
+CMAKE_REMOVE_MODULES_LIST=( FindLua )
+inherit lua-single python-single-r1 cmake xdg
+
+DESCRIPTION="Simple interface for working with TeX documents"
+HOMEPAGE="https://tug.org/texworks/"
+SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-release-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="lua python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	lua? ( ${LUA_DEPS} )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
+	"${FILESDIR}"/${P}-optional-qtscript.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=ON
+		-DPREFER_BUNDLED_SYNCTEX=ON
+		-DWITH_LUA=$(usex lua)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_TESTS=$(usex test)
+		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
+		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
+		-DQTPDF_VIEWER=ON
+		-DBUILD_SHARED_PLUGINS=ON
+	)
+
+	use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+	cmake_src_test
+}