commit: 3ca592af5fc1bb8953d9a2e2c5908ea0ef93f512
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 19:51:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 08:55:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca592af
dev-vcs/tortoisehg: Switch to Qt6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{tortoisehg-9999.ebuild => tortoisehg-6.6.3-r1.ebuild} | 14 +++++++-------
dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
b/dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild
similarity index 89%
copy from dev-vcs/tortoisehg/tortoisehg-9999.ebuild
copy to dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild
index 6b4973f60df5..a18ccd3822a5 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild
@@ -5,7 +5,6 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
-
inherit desktop distutils-r1 optfeature xdg-utils
if [[ ${PV} != *9999* ]]; then
@@ -30,15 +29,14 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-RDEPEND="
- ${HG_DEPEND}
+RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyqt5[network,svg,${PYTHON_USEDEP}]
- >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}]
+ dev-python/pyqt6[network,svg,${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-2.14.1-r1[qt6(+),${PYTHON_USEDEP}]
"
+DEPEND="${RDEPEND}"
BDEPEND="
- ${RDEPEND}
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
@@ -52,6 +50,7 @@ python_prepare_all() {
rm "${S}"/hgext3rd/__init__.py || die "can't remove
/hgext3rd/__init__.py"
sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+ export THG_QT_API=PyQt6
distutils-r1_python_prepare_all
}
@@ -61,6 +60,7 @@ python_test() {
}
python_install_all() {
+ export THG_QT_API=PyQt6
distutils-r1_python_install_all
dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
@@ -70,7 +70,7 @@ python_install_all() {
pkg_postinst() {
xdg_icon_cache_update
elog "When startup of ${PN} fails with an API version mismatch error"
- elog "between dev-python/sip and dev-python/pyqt5 please rebuild"
+ elog "between dev-python/sip and dev-python/pyqt6 please rebuild"
elog "dev-python/qscintilla."
optfeature "the core git extension support" dev-python/pygit2
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 6b4973f60df5..a18ccd3822a5 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -5,7 +5,6 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
-
inherit desktop distutils-r1 optfeature xdg-utils
if [[ ${PV} != *9999* ]]; then
@@ -30,15 +29,14 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-RDEPEND="
- ${HG_DEPEND}
+RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyqt5[network,svg,${PYTHON_USEDEP}]
- >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}]
+ dev-python/pyqt6[network,svg,${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-2.14.1-r1[qt6(+),${PYTHON_USEDEP}]
"
+DEPEND="${RDEPEND}"
BDEPEND="
- ${RDEPEND}
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
@@ -52,6 +50,7 @@ python_prepare_all() {
rm "${S}"/hgext3rd/__init__.py || die "can't remove
/hgext3rd/__init__.py"
sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+ export THG_QT_API=PyQt6
distutils-r1_python_prepare_all
}
@@ -61,6 +60,7 @@ python_test() {
}
python_install_all() {
+ export THG_QT_API=PyQt6
distutils-r1_python_install_all
dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
@@ -70,7 +70,7 @@ python_install_all() {
pkg_postinst() {
xdg_icon_cache_update
elog "When startup of ${PN} fails with an API version mismatch error"
- elog "between dev-python/sip and dev-python/pyqt5 please rebuild"
+ elog "between dev-python/sip and dev-python/pyqt6 please rebuild"
elog "dev-python/qscintilla."
optfeature "the core git extension support" dev-python/pygit2
