diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla/Manifest similarity index 100% rename from dev-python/qscintilla-python/Manifest rename to dev-python/qscintilla/Manifest diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla/metadata.xml similarity index 100% rename from dev-python/qscintilla-python/metadata.xml rename to dev-python/qscintilla/metadata.xml diff --git a/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild similarity index 100% rename from dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild rename to dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild diff --git a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild index 04c4dc09091da..275f985c283dc 100644 --- a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild @@ -35,7 +35,7 @@ RDEPEND=" dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.11.6[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} @@ -71,7 +71,7 @@ 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 "dev-python/qscintilla-python." + elog "dev-python/qscintilla." optfeature "the core git extension support" dev-python/pygit2 } diff --git a/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild index 1e055fca3a93d..5b6bc7eb0d3c8 100644 --- a/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild @@ -35,7 +35,7 @@ RDEPEND=" dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.11.6[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} @@ -71,7 +71,7 @@ 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 "dev-python/qscintilla-python." + 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 51dfb4c89ae7f..eb848b46b6413 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild @@ -35,7 +35,7 @@ RDEPEND=" dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.11.6[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} @@ -71,7 +71,7 @@ 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 "dev-python/qscintilla-python." + elog "dev-python/qscintilla." optfeature "the core git extension support" dev-python/pygit2 } diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024 index 0b6efdfd442ca..06258afde0c6a 100644 --- a/profiles/updates/4Q-2024 +++ b/profiles/updates/4Q-2024 @@ -8,3 +8,4 @@ move dev-python/tlsh dev-python/python-tlsh move dev-python/tappy dev-python/tap-py move dev-python/subunit dev-python/python-subunit move dev-python/rpy dev-python/rpy2 +move dev-python/qscintilla-python dev-python/qscintilla diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild index 51768d2f53061..bc460c790b5e7 100644 --- a/sci-geosciences/qgis/qgis-3.38.3.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild @@ -84,12 +84,12 @@ COMMON_DEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] + >=dev-python/qscintilla-2.10.1[qt6] ') ) qml? ( dev-qt/qtdeclarative:6 ) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index a2557bdfe226d..46fc70e8479cf 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -84,12 +84,12 @@ COMMON_DEPEND=" dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] + >=dev-python/qscintilla-2.10.1[qt6] ') ) qml? ( dev-qt/qtdeclarative:6 )