[gentoo-commits] repo/gentoo:master commit in: app-editors/retext/

["Sam James" <sam@gentoo.org>]

commit:     75a0c76e46b055884379160d1adf1e087ef0ad26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 08:26:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 08:26:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a0c76e

app-editors/retext: add 7.2.3

Closes: https://bugs.gentoo.org/848999
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/retext/Manifest                        |  1 +
 .../{retext-9999.ebuild => retext-7.2.3.ebuild}    | 26 +++++++++++++---------
 app-editors/retext/retext-9999.ebuild              | 26 +++++++++++++---------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 613d0808a019..170590d8d240 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1 +1,2 @@
 DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
+DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da

diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-7.2.3.ebuild
similarity index 85%
copy from app-editors/retext/retext-9999.ebuild
copy to app-editors/retext/retext-7.2.3.ebuild
index ac4f08fb2467..214372f2d90a 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-7.2.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please don't add pypy support before testing if it's actually supported. The
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit distutils-r1 optfeature virtualx xdg-utils
+inherit distutils-r1 optfeature qmake-utils virtualx xdg
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -40,19 +40,28 @@ RDEPEND="
 	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-qt/linguist-tools
+	test? ( dev-python/PyQt5[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() {
-	esetup.py test
+	eunittest || die
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	optfeature "dictionary support" dev-python/pyenchant
 	# See https://bugs.gentoo.org/772197.
@@ -63,8 +72,3 @@ pkg_postinst() {
 	einfo "For more details take a look at:"
 	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index ac4f08fb2467..214372f2d90a 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please don't add pypy support before testing if it's actually supported. The
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit distutils-r1 optfeature virtualx xdg-utils
+inherit distutils-r1 optfeature qmake-utils virtualx xdg
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -40,19 +40,28 @@ RDEPEND="
 	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-qt/linguist-tools
+	test? ( dev-python/PyQt5[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() {
-	esetup.py test
+	eunittest || die
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	optfeature "dictionary support" dev-python/pyenchant
 	# See https://bugs.gentoo.org/772197.
@@ -63,8 +72,3 @@ pkg_postinst() {
 	einfo "For more details take a look at:"
 	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}