gentoo auto-resync : 27:04:2024 - 23:59:42

3 files changed, 96 insertions, 37 deletions

diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 89cd33d6a0a3..df84609a8aaa 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -2,9 +2,11 @@ AUX retext-8.0.1-fix-set-desktop-entry.patch 517 BLAKE2B e9f6c821e8925f912916604
 DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
 DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c
 DIST ReText-8.0.1.tar.gz 538968 BLAKE2B 6ee18b4becf47ed3edae9e1d3ea8167a5db2685ae55b206be1ffca78bb765a559f53575da8aa105eae5d1b1fb87419723cdfd02cfff2eb422de9722589a0b97a SHA512 a2a03a821ac06e0408cd036189e9fce18f4b693085aaa15e0d95f2a80157f6ab09b0bcecd9574673ce57fc9cde937457e8d62971f1553cbc26c681039401178a
+DIST ReText-8.0.2.tar.gz 546236 BLAKE2B 3ef28366e5884234d77b2155c3f01d7881206383aa19ccb010255eb40ea14aa2ab298fe212d2b4d0e7d65246075b426c93a8ae518b8fb5f0887f1694064e309a SHA512 c7b543d91290c007c820751f39c009c1e5fb86eb59590d0c13610c9c7f13b6023ffee3d6aebc4665addacbefad0d17937a29e8201d08457cc1641a6d5c0019b0
 EBUILD retext-7.2.3.ebuild 1983 BLAKE2B d406bcef6bc9bf2a545862329231fad68d6711e7ca711e1d80fc88ffa4077de808fbbd055e26ad53032f3232d7f399ae79564446b72868f18c8f543c629224e3 SHA512 8b52132d60dc5fdc0a506706e97aff082b070ae36d2a0a7a28356bb704e355199e48e2aa97aa90301cd169ba7ac5e284fb904c7fc7362c953561c573a73c607f
 EBUILD retext-8.0.0.ebuild 1931 BLAKE2B e81a28006291152c19dd45b2b90a667080e0f7ba7643f43aa829992a90025ecdd96df30dc018e42d41bb03754cdeb40a93fe8a47cad4ae9dc1bb488e2bc5fccb SHA512 7bf10821c6c512252ce0d0fcf4bd8d9f9de1bdf7693d8845382889e3f6e7b540240ae8c6f7b080d9b5badf99f69c3a0e34ce35e4fdb02604972eaf9897fdf1ae
 EBUILD retext-8.0.1-r1.ebuild 2059 BLAKE2B 184bb00aa4d0b9af0978280254ab4bf8a3c20c52b33d5db8ca4d3b44b0ed261ba7ae057354cb3430404f9acdffad7cb062e445473ed13fc0fbe192bf2d4416da SHA512 25558ccaa0c0b147f70062bbbd7924499aaf31a32f105d196efd362082c926d0e99f68390389095cef1c109650a9ae1c8d25b4870d5de0c6848c5f8c11f41e9c
 EBUILD retext-8.0.1.ebuild 1853 BLAKE2B d80ecac1de7c4d3c04483e17ffdbfb0fd1d3d9ed59daff3e18b5af6f687594bbbd358990bcd6983fe9015449111174b104166cb59f334d6125b5ba645a33ac31 SHA512 2b83182d3435dd86072b3e944c1146a7dfe4f588d0f05bde484dc236b5209f3425be993f1ca6e8c1a552cff043d32f421afcd97cd2cd5389760e7ccf918a499d
-EBUILD retext-9999.ebuild 1998 BLAKE2B d5b427f7fe0aa376b1c4687a9332249c756feb979c22048639730e8f09dda4d7f906b4d547c67eede911eccbe52bec3a9a3c6e562d7a88e30cb8754fbae4d6c4 SHA512 1e8adcae6fb0de3749ebc14d3813709d5f53e755b6181770590f813766e7497a1628fb30496ce6070c163d37633268b36690c3741fca4ec9b209e57c3fd515b2
+EBUILD retext-8.0.2.ebuild 1624 BLAKE2B 63533f24c389f327ecde40867df812fa9cc601cfb8cc263f29903cb5702eff064990df41690a7c9aba1cfc408322f1d9a1f7cb195fa89ad41a6862bb8974b883 SHA512 7de00127374ad66450f4916c58b3a263e748c12524a5c20c1ae8bf2f40b22977defd726027a3f09dd6dd9994758af363bffdb51b92b6efc787241633f9dc12e9
+EBUILD retext-9999.ebuild 1624 BLAKE2B 63533f24c389f327ecde40867df812fa9cc601cfb8cc263f29903cb5702eff064990df41690a7c9aba1cfc408322f1d9a1f7cb195fa89ad41a6862bb8974b883 SHA512 7de00127374ad66450f4916c58b3a263e748c12524a5c20c1ae8bf2f40b22977defd726027a3f09dd6dd9994758af363bffdb51b92b6efc787241633f9dc12e9
 MISC metadata.xml 535 BLAKE2B 94fbf92941c956601e9ec037a78919fcbddb572baa20f74c0daae31e438e44d214b57926cfa6d31eb176b8be72d2078e44686bada4a4794e130956c7d91b5865 SHA512 5ed97d1ed19c618b1246375d02860f96ce7f58aa759c467ae69e35d6b003cdac44f5c59f166ae6970e9a082e783550381b34540ad1ba03d661a3f3fde7d26dec
diff --git a/app-editors/retext/retext-8.0.2.ebuild b/app-editors/retext/retext-8.0.2.ebuild
new file mode 100644
index 000000000000..0ad582a951db
--- /dev/null
+++ b/app-editors/retext/retext-8.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_SINGLE_IMPL=1
+PYPI_NO_NORMALIZE=1
+PYPI_PN="ReText"
+
+inherit desktop distutils-r1 optfeature virtualx xdg
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+else
+	inherit pypi
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+	')
+"
+# qmake6 from qtbase is used to find lrelease
+BDEPEND="
+	dev-qt/qtbase:6
+	dev-qt/qttools:6[linguist]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/PyQt6[testlib,${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests unittest
+
+src_test() {
+	QT_QPA_PLATFORM=minimal virtx distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	domenu data/me.mitya57.ReText.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "a local copy of the MathJax JavaScript library" dev-libs/mathjax
+	optfeature "encoding detection" dev-python/chardet
+	optfeature "dictionary support" dev-python/pyenchant
+	optfeature "JavaScript support in preview" dev-python/PyQt6-WebEngine
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 38c1165fb129..0ad582a951db 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
 PYPI_NO_NORMALIZE=1
 PYPI_PN="ReText"
 
-inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg
+inherit desktop distutils-r1 optfeature virtualx xdg
 
 DESCRIPTION="Simple editor for Markdown and reStructuredText"
 HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
@@ -26,56 +27,43 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+	')
 "
-DEPEND="${RDEPEND}"
+# qmake6 from qtbase is used to find lrelease
 BDEPEND="
-	dev-qt/linguist-tools
-	test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] )
+	dev-qt/qtbase:6
+	dev-qt/qttools:6[linguist]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/PyQt6[testlib,${PYTHON_USEDEP}]
+		')
+	)
 "
 
 distutils_enable_tests unittest
 
-pkg_setup() {
-	# Needed for lrelease
-	export PATH="$(qt5_get_bindir):${PATH}"
-}
-
 src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	virtx eunittest
+	QT_QPA_PLATFORM=minimal virtx distutils-r1_src_test
 }
 
 src_install() {
 	distutils-r1_src_install
 
-	newicon data/retext-kde5.png retext.png
-
-	# Fixme: The application actually provides a desktop file which theoretically
-	# could be used, so far though I could not make it install properly.
-	make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor"
+	domenu data/me.mitya57.ReText.desktop
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
+	optfeature "a local copy of the MathJax JavaScript library" dev-libs/mathjax
+	optfeature "encoding detection" dev-python/chardet
 	optfeature "dictionary support" dev-python/pyenchant
-
-	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
-	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
-	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+	optfeature "JavaScript support in preview" dev-python/PyQt6-WebEngine
 }