* [gentoo-commits] repo/gentoo:master commit in: app-editors/retext/files/, app-editors/retext/
@ 2024-03-18 20:04 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-03-18 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 68989ea42eac5131c0d66f6790cf0ff2e0f3b9b8
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 12 19:48:42 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 20:02:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68989ea4
app-editors/retext: fix desktop file issues
Move desktop file installation from python_install()
to src_install(). Also, patch __main__.py to use the
name "retext" for the desktop file (improves desktop
environment compatibility).
Closes: https://bugs.gentoo.org/925726
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/retext-8.0.1-fix-set-desktop-entry.patch | 15 ++++
app-editors/retext/retext-8.0.1-r1.ebuild | 85 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
new file mode 100644
index 000000000000..0ff685b89152
--- /dev/null
+++ b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
@@ -0,0 +1,15 @@
+# Set desktop file name to correspond to the one installed by
+# the ebuild ("retext.desktop").
+# Bug: https://bugs.gentoo.org/925726
+
+--- a/ReText/__main__.py
++++ b/ReText/__main__.py
+@@ -65,7 +65,7 @@ def main():
+ app.setApplicationDisplayName("ReText")
+ app.setApplicationVersion(app_version)
+ app.setOrganizationDomain('mitya57.me')
+- app.setDesktopFileName('me.mitya57.ReText.desktop')
++ app.setDesktopFileName('retext')
+ QNetworkProxyFactory.setUseSystemConfiguration(True)
+
+ RtTranslator = QTranslator()
diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..8e3e6c409fc7
--- /dev/null
+++ b/app-editors/retext/retext-8.0.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9..11} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="ReText"
+
+inherit desktop distutils-r1 optfeature qmake-utils 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="
+ 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}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-qt/linguist-tools
+ test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-set-desktop-entry.patch
+)
+
+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
+}
+
+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"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/retext/files/, app-editors/retext/
@ 2024-11-25 15:32 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-11-25 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 896be0fae83b0f230faba58abfdf6134fbf68056
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 22:18:33 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:30:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896be0fa
app-editors/retext: drop 7.2.3, 8.0.0, 8.0.1, 8.0.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/retext/Manifest | 3 -
.../files/retext-8.0.1-fix-set-desktop-entry.patch | 15 ----
app-editors/retext/retext-7.2.3.ebuild | 74 -------------------
app-editors/retext/retext-8.0.0.ebuild | 71 ------------------
app-editors/retext/retext-8.0.1-r1.ebuild | 85 ----------------------
app-editors/retext/retext-8.0.1.ebuild | 78 --------------------
6 files changed, 326 deletions(-)
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 0cfa460a7a21..acc06294e2d8 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,4 +1 @@
-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
diff --git a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
deleted file mode 100644
index 0ff685b89152..000000000000
--- a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set desktop file name to correspond to the one installed by
-# the ebuild ("retext.desktop").
-# Bug: https://bugs.gentoo.org/925726
-
---- a/ReText/__main__.py
-+++ b/ReText/__main__.py
-@@ -65,7 +65,7 @@ def main():
- app.setApplicationDisplayName("ReText")
- app.setApplicationVersion(app_version)
- app.setOrganizationDomain('mitya57.me')
-- app.setDesktopFileName('me.mitya57.ReText.desktop')
-+ app.setDesktopFileName('retext')
- QNetworkProxyFactory.setUseSystemConfiguration(True)
-
- RtTranslator = QTranslator()
diff --git a/app-editors/retext/retext-7.2.3.ebuild b/app-editors/retext/retext-7.2.3.ebuild
deleted file mode 100644
index 4db42681b7e3..000000000000
--- a/app-editors/retext/retext-7.2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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_10 )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="ReText"
-
-inherit distutils-r1 optfeature qmake-utils virtualx xdg
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-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 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2+"
-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/pyqt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-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() {
- eunittest || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "dictionary support" dev-python/pyenchant
- # See https://bugs.gentoo.org/772197.
- optfeature "rendering with webengine" dev-python/pyqtwebengine
-
- 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"
-}
diff --git a/app-editors/retext/retext-8.0.0.ebuild b/app-editors/retext/retext-8.0.0.ebuild
deleted file mode 100644
index e9eb056b9e56..000000000000
--- a/app-editors/retext/retext-8.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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_{10..11} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="ReText"
-
-inherit distutils-r1 optfeature qmake-utils 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="
- 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}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools
- test? ( 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
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "dictionary support" dev-python/pyenchant
- # See https://bugs.gentoo.org/772197.
- optfeature "rendering with webengine" dev-python/pyqt6-webengine
-
- 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"
-}
diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild
deleted file mode 100644
index ae105ae1c961..000000000000
--- a/app-editors/retext/retext-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..11} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="ReText"
-
-inherit desktop distutils-r1 optfeature qmake-utils 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="
- 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}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools
- test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-set-desktop-entry.patch
-)
-
-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
-}
-
-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"
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- 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
-}
diff --git a/app-editors/retext/retext-8.0.1.ebuild b/app-editors/retext/retext-8.0.1.ebuild
deleted file mode 100644
index 61f1d402961f..000000000000
--- a/app-editors/retext/retext-8.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..11} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="ReText"
-
-inherit desktop distutils-r1 optfeature qmake-utils 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="
- 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}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools
- test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-pkg_setup() {
- # Needed for lrelease
- export PATH="$(qt5_get_bindir):${PATH}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- newicon data/retext-kde5.png retext.png
- make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor"
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- virtx eunittest
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-25 15:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-25 15:32 [gentoo-commits] repo/gentoo:master commit in: app-editors/retext/files/, app-editors/retext/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-18 20:04 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox