From 3d133ef5cbde1a3f1529cf7b864f2db01f87dd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 23 Nov 2024 12:33:38 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20dev-python/{PyQt6=20=E2=86=92=20pyqt6}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-admin/setools/setools-4.5.1.ebuild | 4 ++-- app-admin/setools/setools-9999.ebuild | 2 +- app-backup/backintime/backintime-1.5.1.ebuild | 2 +- app-backup/backintime/backintime-9999.ebuild | 2 +- app-editors/retext/retext-8.0.0.ebuild | 4 ++-- app-editors/retext/retext-8.0.1-r1.ebuild | 6 +++--- app-editors/retext/retext-8.0.1.ebuild | 8 ++++---- app-editors/retext/retext-8.0.2.ebuild | 4 ++-- app-editors/retext/retext-9999.ebuild | 4 ++-- app-misc/anki/anki-24.06.3-r2.ebuild | 8 ++++---- app-text/calibre/calibre-7.16.0.ebuild | 2 +- app-text/calibre/calibre-7.17.0.ebuild | 2 +- app-text/calibre/calibre-7.19.0.ebuild | 4 ++-- app-text/calibre/calibre-7.20.0.ebuild | 4 ++-- app-text/calibre/calibre-7.21.0.ebuild | 4 ++-- app-text/sigil/sigil-2.2.1.ebuild | 2 +- app-text/sigil/sigil-2.3.0.ebuild | 2 +- app-text/sigil/sigil-2.3.1.ebuild | 2 +- .../matplotlib/matplotlib-3.10.0_rc1.ebuild | 2 +- .../pyqt6-webengine-6.7.0.ebuild | 6 +++--- .../pyqt6-webengine-6.8.0_pre2411020930.ebuild | 6 +++--- dev-python/{PyQt6 => pyqt6}/Manifest | 0 dev-python/{PyQt6 => pyqt6}/metadata.xml | 0 .../pyqt6-6.7.1-r1.ebuild} | 0 .../pyqt6-6.8.0_pre2410211537.ebuild} | 0 dev-python/pytest-qt/pytest-qt-4.4.0.ebuild | 2 +- .../qscintilla/qscintilla-2.14.1-r2.ebuild | 2 +- dev-python/qtpy/metadata.xml | 2 +- dev-python/qtpy/qtpy-2.4.1-r2.ebuild | 18 +++++++++--------- dev-python/qtpy/qtpy-2.4.2.ebuild | 18 +++++++++--------- games-emulation/m64py/m64py-0.3.0.ebuild | 2 +- net-analyzer/nagstamon/nagstamon-3.12.0.ebuild | 2 +- .../nagstamon/nagstamon-3.14.0-r1.ebuild | 2 +- net-analyzer/nagstamon/nagstamon-3.16.0.ebuild | 2 +- net-analyzer/nagstamon/nagstamon-3.16.1.ebuild | 2 +- net-analyzer/nagstamon/nagstamon-3.16.2.ebuild | 2 +- .../firewalld/firewalld-2.2.1-r1.ebuild | 2 +- net-firewall/firewalld/firewalld-2.2.3.ebuild | 2 +- .../nanovna-saver-0.6.3-r1.ebuild | 2 +- .../nanovna-saver/nanovna-saver-0.6.4.ebuild | 2 +- .../nanovna-saver/nanovna-saver-9999.ebuild | 2 +- profiles/arch/amd64/package.use.mask | 2 +- profiles/arch/amd64/package.use.stable.mask | 2 +- profiles/arch/arm64/package.use.mask | 2 +- profiles/arch/base/package.use.mask | 2 +- profiles/arch/powerpc/ppc32/package.use.mask | 2 +- profiles/package.mask | 2 +- profiles/targets/desktop/plasma/package.use | 2 +- profiles/updates/4Q-2024 | 1 + sci-geosciences/qgis/qgis-3.38.3.ebuild | 4 ++-- sci-geosciences/qgis/qgis-9999.ebuild | 4 ++-- .../paraview/paraview-5.13.0.ebuild | 4 ++-- .../polychromatic/polychromatic-0.9.2.ebuild | 2 +- .../polychromatic/polychromatic-0.9.3.ebuild | 2 +- .../polychromatic/polychromatic-9999.ebuild | 2 +- .../qutebrowser/qutebrowser-3.3.1.ebuild | 4 ++-- www-client/qutebrowser/qutebrowser-9999.ebuild | 4 ++-- 57 files changed, 93 insertions(+), 92 deletions(-) rename dev-python/{PyQt6 => pyqt6}/Manifest (100%) rename dev-python/{PyQt6 => pyqt6}/metadata.xml (100%) rename dev-python/{PyQt6/PyQt6-6.7.1-r1.ebuild => pyqt6/pyqt6-6.7.1-r1.ebuild} (100%) rename dev-python/{PyQt6/PyQt6-6.8.0_pre2410211537.ebuild => pyqt6/pyqt6-6.8.0_pre2410211537.ebuild} (100%) diff --git a/app-admin/setools/setools-4.5.1.ebuild b/app-admin/setools/setools-4.5.1.ebuild index 0e5f423668994..434f02a834a15 100644 --- a/app-admin/setools/setools-4.5.1.ebuild +++ b/app-admin/setools/setools-4.5.1.ebuild @@ -33,13 +33,13 @@ RDEPEND="${PYTHON_DEPS} >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( - dev-python/PyQt6[gui,testlib,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,testlib,widgets,${PYTHON_USEDEP}] dev-python/pytest-qt[${PYTHON_USEDEP}] sys-apps/checkpolicy )" diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index 0ce34473cb2a5..16398f7136ade 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND="${PYTHON_DEPS} >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" diff --git a/app-backup/backintime/backintime-1.5.1.ebuild b/app-backup/backintime/backintime-1.5.1.ebuild index f0d3b8d77be96..e2f7a375f65b8 100644 --- a/app-backup/backintime/backintime-1.5.1.ebuild +++ b/app-backup/backintime/backintime-1.5.1.ebuild @@ -36,7 +36,7 @@ RDEPEND=" ${DEPEND} virtual/openssh net-misc/rsync[xattr,acl] - gui? ( dev-python/PyQt6[gui,widgets] ) + gui? ( dev-python/pyqt6[gui,widgets] ) " BDEPEND=" sys-devel/gettext diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild index c59ba0236bf8f..ba718aea4e4ea 100644 --- a/app-backup/backintime/backintime-9999.ebuild +++ b/app-backup/backintime/backintime-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND=" ${DEPEND} virtual/openssh net-misc/rsync[xattr,acl] - gui? ( dev-python/PyQt6[gui,widgets] ) + gui? ( dev-python/pyqt6[gui,widgets] ) " BDEPEND=" sys-devel/gettext diff --git a/app-editors/retext/retext-8.0.0.ebuild b/app-editors/retext/retext-8.0.0.ebuild index bb34e6b0999aa..e9eb056b9e565 100644 --- a/app-editors/retext/retext-8.0.0.ebuild +++ b/app-editors/retext/retext-8.0.0.ebuild @@ -34,12 +34,12 @@ RDEPEND=" >=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}] + dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-qt/linguist-tools - test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) + test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) " distutils_enable_tests unittest diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild index 8e3e6c409fc7e..ae105ae1c9619 100644 --- a/app-editors/retext/retext-8.0.1-r1.ebuild +++ b/app-editors/retext/retext-8.0.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYPI_NO_NORMALIZE=1 PYPI_PN="ReText" @@ -32,12 +32,12 @@ RDEPEND=" >=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}] + dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-qt/linguist-tools - test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) + test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) " PATCHES=( diff --git a/app-editors/retext/retext-8.0.1.ebuild b/app-editors/retext/retext-8.0.1.ebuild index 0deb07a931c0d..61f1d402961f7 100644 --- a/app-editors/retext/retext-8.0.1.ebuild +++ b/app-editors/retext/retext-8.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# 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} ) +PYTHON_COMPAT=( python3_{10..11} ) PYPI_NO_NORMALIZE=1 PYPI_PN="ReText" @@ -32,12 +32,12 @@ RDEPEND=" >=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}] + dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-qt/linguist-tools - test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) + test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) " distutils_enable_tests unittest diff --git a/app-editors/retext/retext-8.0.2.ebuild b/app-editors/retext/retext-8.0.2.ebuild index 7a2b130ab55db..e31074aa86185 100644 --- a/app-editors/retext/retext-8.0.2.ebuild +++ b/app-editors/retext/retext-8.0.2.ebuild @@ -32,7 +32,7 @@ RDEPEND=" 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}] + dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] ') " # qmake6 from qtbase is used to find lrelease @@ -42,7 +42,7 @@ BDEPEND=" test? ( ${RDEPEND} $(python_gen_cond_dep ' - dev-python/PyQt6[testlib,${PYTHON_USEDEP}] + dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ') ) " diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild index fdaee8e8569f2..97456098e4e96 100644 --- a/app-editors/retext/retext-9999.ebuild +++ b/app-editors/retext/retext-9999.ebuild @@ -32,7 +32,7 @@ RDEPEND=" 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}] + dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] ') " # qmake6 from qtbase is used to find lrelease @@ -42,7 +42,7 @@ BDEPEND=" test? ( ${RDEPEND} $(python_gen_cond_dep ' - dev-python/PyQt6[testlib,${PYTHON_USEDEP}] + dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ') ) " diff --git a/app-misc/anki/anki-24.06.3-r2.ebuild b/app-misc/anki/anki-24.06.3-r2.ebuild index 1db5bd932acef..347aa6d6d6804 100644 --- a/app-misc/anki/anki-24.06.3-r2.ebuild +++ b/app-misc/anki/anki-24.06.3-r2.ebuild @@ -756,7 +756,7 @@ GUI_RDEPEND=" dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] dev-python/protobuf[${PYTHON_USEDEP}] - >=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] + >=dev-python/pyqt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] >=dev-python/pyqt6-sip-13.6.0[${PYTHON_USEDEP}] >=dev-python/pyqt6-webengine-6.6.0[widgets,${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] @@ -788,7 +788,7 @@ BDEPEND=" >=net-libs/nodejs-20.12.1 sys-apps/yarn $(python_gen_cond_dep ' - dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] ') ) @@ -957,9 +957,9 @@ pkg_postinst() { xdg_pkg_postinst optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng" optfeature "sound support" media-video/mpv media-video/mplayer - optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt6[multimedia]" + optfeature "recording support" "media-sound/lame[frontend] dev-python/pyqt6[multimedia]" optfeature "faster database operations" dev-python/orjson - optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport] + optfeature "compatibility with Qt5-dependent add-ons" dev-python/pyqt6[dbus,printsupport] optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase:6[vulkan] dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]" diff --git a/app-text/calibre/calibre-7.16.0.ebuild b/app-text/calibre/calibre-7.16.0.ebuild index a01bbd1656b6d..0a7727b1acb2d 100644 --- a/app-text/calibre/calibre-7.16.0.ebuild +++ b/app-text/calibre/calibre-7.16.0.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] diff --git a/app-text/calibre/calibre-7.17.0.ebuild b/app-text/calibre/calibre-7.17.0.ebuild index 58fd8aaba569b..632c657e358f6 100644 --- a/app-text/calibre/calibre-7.17.0.ebuild +++ b/app-text/calibre/calibre-7.17.0.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] diff --git a/app-text/calibre/calibre-7.19.0.ebuild b/app-text/calibre/calibre-7.19.0.ebuild index d0271503bb36b..202e9ca6647dd 100644 --- a/app-text/calibre/calibre-7.19.0.ebuild +++ b/app-text/calibre/calibre-7.19.0.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] @@ -99,7 +99,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') - dev-python/PyQt6[multimedia,speech] + dev-python/pyqt6[multimedia,speech] ) system-mathjax? ( >=dev-libs/mathjax-3:= ) udisks? ( virtual/libudev ) diff --git a/app-text/calibre/calibre-7.20.0.ebuild b/app-text/calibre/calibre-7.20.0.ebuild index 6370fd8d72c10..ee9b5df7fbc94 100644 --- a/app-text/calibre/calibre-7.20.0.ebuild +++ b/app-text/calibre/calibre-7.20.0.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] @@ -100,7 +100,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') - dev-python/PyQt6[multimedia,speech] + dev-python/pyqt6[multimedia,speech] ) system-mathjax? ( >=dev-libs/mathjax-3:= ) udisks? ( virtual/libudev ) diff --git a/app-text/calibre/calibre-7.21.0.ebuild b/app-text/calibre/calibre-7.21.0.ebuild index 7098075427540..0282cc63198f0 100644 --- a/app-text/calibre/calibre-7.21.0.ebuild +++ b/app-text/calibre/calibre-7.21.0.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] @@ -100,7 +100,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') - dev-python/PyQt6[multimedia,speech] + dev-python/pyqt6[multimedia,speech] ) system-mathjax? ( >=dev-libs/mathjax-3:= ) udisks? ( virtual/libudev ) diff --git a/app-text/sigil/sigil-2.2.1.ebuild b/app-text/sigil/sigil-2.2.1.ebuild index 38a59c5e36637..884fb0ba01e6d 100644 --- a/app-text/sigil/sigil-2.2.1.ebuild +++ b/app-text/sigil/sigil-2.2.1.ebuild @@ -61,7 +61,7 @@ RDEPEND=" dev-qt/qtwebengine:6[widgets] dev-qt/qtsvg:6 plugins? ( $(python_gen_cond_dep ' - dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP}] dev-python/pyqt6-webengine[${PYTHON_USEDEP}] ') ) ) diff --git a/app-text/sigil/sigil-2.3.0.ebuild b/app-text/sigil/sigil-2.3.0.ebuild index f3bcf56171ff4..7cfa883c892d5 100644 --- a/app-text/sigil/sigil-2.3.0.ebuild +++ b/app-text/sigil/sigil-2.3.0.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-python/html5lib[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] - dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP}] dev-python/pyqt6-webengine[${PYTHON_USEDEP}] ') $(python_gen_impl_dep 'tk') diff --git a/app-text/sigil/sigil-2.3.1.ebuild b/app-text/sigil/sigil-2.3.1.ebuild index f3bcf56171ff4..7cfa883c892d5 100644 --- a/app-text/sigil/sigil-2.3.1.ebuild +++ b/app-text/sigil/sigil-2.3.1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-python/html5lib[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] - dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP}] dev-python/pyqt6-webengine[${PYTHON_USEDEP}] ') $(python_gen_impl_dep 'tk') diff --git a/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild b/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild index c4d37442af3e9..8f1dff9323be6 100644 --- a/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.10.0_rc1.ebuild @@ -77,7 +77,7 @@ RDEPEND=" qt6? ( $(python_gen_cond_dep ' || ( - dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] dev-python/pyside6[gui,widgets,${PYTHON_USEDEP}] ) ' 'python3*') diff --git a/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild b/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild index a1c73ba38449e..bd427b7f32374 100644 --- a/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild +++ b/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild @@ -23,14 +23,14 @@ KEYWORDS="amd64 arm64" IUSE="debug quick +widgets" RDEPEND=" - >=dev-python/PyQt6-${QT_PV%:*}[gui,ssl,${PYTHON_USEDEP}] + >=dev-python/pyqt6-${QT_PV%:*}[gui,ssl,${PYTHON_USEDEP}] >=dev-qt/qtbase-${QT_PV}[gui,widgets?] >=dev-qt/qtwebengine-${QT_PV}[widgets] quick? ( - dev-python/PyQt6[qml] + dev-python/pyqt6[qml] >=dev-qt/qtwebengine-${QT_PV}[qml] ) - widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) + widgets? ( dev-python/pyqt6[network,printsupport,webchannel,widgets] ) " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0_pre2411020930.ebuild b/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0_pre2411020930.ebuild index 49aba03ddff27..12c7bd57a9fc8 100644 --- a/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0_pre2411020930.ebuild +++ b/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0_pre2411020930.ebuild @@ -28,14 +28,14 @@ KEYWORDS="~amd64 ~arm64" IUSE="debug quick +widgets" RDEPEND=" - >=dev-python/PyQt6-${QT_PV%:*}[gui,ssl,${PYTHON_USEDEP}] + >=dev-python/pyqt6-${QT_PV%:*}[gui,ssl,${PYTHON_USEDEP}] >=dev-qt/qtbase-${QT_PV}[gui,widgets?] >=dev-qt/qtwebengine-${QT_PV}[widgets] quick? ( - dev-python/PyQt6[qml] + dev-python/pyqt6[qml] >=dev-qt/qtwebengine-${QT_PV}[qml] ) - widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) + widgets? ( dev-python/pyqt6[network,printsupport,webchannel,widgets] ) " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/dev-python/PyQt6/Manifest b/dev-python/pyqt6/Manifest similarity index 100% rename from dev-python/PyQt6/Manifest rename to dev-python/pyqt6/Manifest diff --git a/dev-python/PyQt6/metadata.xml b/dev-python/pyqt6/metadata.xml similarity index 100% rename from dev-python/PyQt6/metadata.xml rename to dev-python/pyqt6/metadata.xml diff --git a/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild b/dev-python/pyqt6/pyqt6-6.7.1-r1.ebuild similarity index 100% rename from dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild rename to dev-python/pyqt6/pyqt6-6.7.1-r1.ebuild diff --git a/dev-python/PyQt6/PyQt6-6.8.0_pre2410211537.ebuild b/dev-python/pyqt6/pyqt6-6.8.0_pre2410211537.ebuild similarity index 100% rename from dev-python/PyQt6/PyQt6-6.8.0_pre2410211537.ebuild rename to dev-python/pyqt6/pyqt6-6.8.0_pre2410211537.ebuild diff --git a/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild index daaed4d2a09d8..d2289519c423d 100644 --- a/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild +++ b/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild @@ -27,7 +27,7 @@ RDEPEND=" BDEPEND=" test? ( || ( - dev-python/PyQt6[gui,testlib,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,testlib,widgets,${PYTHON_USEDEP}] dev-python/pyqt5[gui,testlib,widgets,${PYTHON_USEDEP}] dev-python/pyside6[gui,testlib,widgets,${PYTHON_USEDEP}] $(python_gen_cond_dep ' diff --git a/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild index f82076263eb3c..0e1a5a97c5f87 100644 --- a/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild +++ b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild @@ -33,7 +33,7 @@ DEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 ) qt6? ( - dev-python/PyQt6[gui,printsupport,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,printsupport,widgets,${PYTHON_USEDEP}] dev-qt/qtbase:6[gui,widgets] ) ~x11-libs/qscintilla-${PV}:=[qt5(+)?,qt6(-)?] diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml index 7ef873d0e1c9c..6d647f05cf630 100644 --- a/dev-python/qtpy/metadata.xml +++ b/dev-python/qtpy/metadata.xml @@ -16,7 +16,7 @@ Use dev-python/pyqt5 as Qt for Python implementation - Use dev-python/PyQt6 as Qt for Python implementation + Use dev-python/pyqt6 as Qt for Python implementation Use dev-python/pyside2 as Qt for Python implementation Use dev-python/pyside6 as Qt for Python implementation Pull in bindings for the QtDesigner module and enable the designer plugin diff --git a/dev-python/qtpy/qtpy-2.4.1-r2.ebuild b/dev-python/qtpy/qtpy-2.4.1-r2.ebuild index f7a3f37eed239..23af9c33307c5 100644 --- a/dev-python/qtpy/qtpy-2.4.1-r2.ebuild +++ b/dev-python/qtpy/qtpy-2.4.1-r2.ebuild @@ -82,10 +82,10 @@ RDEPEND=" webengine? ( dev-python/pyqtwebengine[${PYTHON_USEDEP}] ) ) pyqt6? ( - dev-python/PyQt6[${PYTHON_USEDEP}] - dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] - dev-python/PyQt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/pyqt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] + dev-python/pyqt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] ) ) @@ -123,11 +123,11 @@ BDEPEND=" dev-qt/qtsql:5[sqlite] ) pyqt6? ( - dev-python/PyQt6[${PYTHON_USEDEP}] - dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] - dev-python/PyQt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] - dev-python/PyQt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] - dev-python/PyQt6[websockets,widgets,xml] + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] + dev-python/pyqt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] + dev-python/pyqt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] + dev-python/pyqt6[websockets,widgets,xml] dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets,quick] dev-qt/qtbase:6[sqlite] ) diff --git a/dev-python/qtpy/qtpy-2.4.2.ebuild b/dev-python/qtpy/qtpy-2.4.2.ebuild index ce2bb0742bc02..cc6c93a759a94 100644 --- a/dev-python/qtpy/qtpy-2.4.2.ebuild +++ b/dev-python/qtpy/qtpy-2.4.2.ebuild @@ -81,10 +81,10 @@ RDEPEND=" webengine? ( dev-python/pyqtwebengine[${PYTHON_USEDEP}] ) ) pyqt6? ( - dev-python/PyQt6[${PYTHON_USEDEP}] - dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] - dev-python/PyQt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/pyqt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] + dev-python/pyqt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] ) ) @@ -122,11 +122,11 @@ BDEPEND=" dev-qt/qtsql:5[sqlite] ) pyqt6? ( - dev-python/PyQt6[${PYTHON_USEDEP}] - dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] - dev-python/PyQt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] - dev-python/PyQt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] - dev-python/PyQt6[websockets,widgets,xml] + dev-python/pyqt6[${PYTHON_USEDEP}] + dev-python/pyqt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] + dev-python/pyqt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] + dev-python/pyqt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] + dev-python/pyqt6[websockets,widgets,xml] dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets,quick] dev-qt/qtbase:6[sqlite] ) diff --git a/games-emulation/m64py/m64py-0.3.0.ebuild b/games-emulation/m64py/m64py-0.3.0.ebuild index 3550f746db727..05c615e5a3118 100644 --- a/games-emulation/m64py/m64py-0.3.0.ebuild +++ b/games-emulation/m64py/m64py-0.3.0.ebuild @@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86" IUSE="7z rar" RDEPEND=" - dev-python/PyQt6[gui,opengl,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,opengl,widgets,${PYTHON_USEDEP}] dev-python/pysdl2[${PYTHON_USEDEP}] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 diff --git a/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild index a223f73fff8a8..3233c0426562b 100644 --- a/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] || ( - dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] dev-python/pyqt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) dev-python/pysocks[${PYTHON_USEDEP}] diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild index e9f5679f8a4c9..63ca672cf0890 100644 --- a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] - qt6? ( dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) + qt6? ( dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) !qt6? ( dev-python/pyqt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) dev-python/pysocks[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] diff --git a/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild index 869f0906f57a1..857311185b32e 100644 --- a/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] dev-python/pysocks[${PYTHON_USEDEP}] dev-python/arrow[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] diff --git a/net-analyzer/nagstamon/nagstamon-3.16.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.16.1.ebuild index 869f0906f57a1..857311185b32e 100644 --- a/net-analyzer/nagstamon/nagstamon-3.16.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.16.1.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] dev-python/pysocks[${PYTHON_USEDEP}] dev-python/arrow[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] diff --git a/net-analyzer/nagstamon/nagstamon-3.16.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.16.2.ebuild index 869f0906f57a1..857311185b32e 100644 --- a/net-analyzer/nagstamon/nagstamon-3.16.2.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.16.2.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] dev-python/pysocks[${PYTHON_USEDEP}] dev-python/arrow[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild index 4a115f5bf943e..5b38b6e28baa1 100644 --- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild +++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" >=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}] gui? ( x11-libs/gtk+:3 - dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] ) ') net-firewall/nftables[xtables(+)] diff --git a/net-firewall/firewalld/firewalld-2.2.3.ebuild b/net-firewall/firewalld/firewalld-2.2.3.ebuild index d08a06d0215c0..5ed05ae33d836 100644 --- a/net-firewall/firewalld/firewalld-2.2.3.ebuild +++ b/net-firewall/firewalld/firewalld-2.2.3.ebuild @@ -28,7 +28,7 @@ RDEPEND=" >=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}] gui? ( x11-libs/gtk+:3 - dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] ) ') net-firewall/nftables[xtables(+)] diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild index c645d20d3f4c3..caa8b29873f57 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild @@ -23,7 +23,7 @@ fi RDEPEND="${DEPEND} dev-python/cython[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] + dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets] dev-python/pyqt6-sip[${PYTHON_USEDEP}] dev-python/sip[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild index be6ca23152fc0..1cae85c8b5a6c 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild @@ -23,7 +23,7 @@ fi RDEPEND="${DEPEND} dev-python/cython[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] + dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets] dev-python/pyqt6-sip[${PYTHON_USEDEP}] dev-python/sip[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild index be6ca23152fc0..1cae85c8b5a6c 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild @@ -23,7 +23,7 @@ fi RDEPEND="${DEPEND} dev-python/cython[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] + dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets] dev-python/pyqt6-sip[${PYTHON_USEDEP}] dev-python/sip[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 742af1c7aa8c8..0aa493afbd7ed 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -117,7 +117,7 @@ sys-kernel/gentoo-kernel-bin -generic-uki # Ionen Wolkens (2023-12-02) # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 are keyworded here. -dev-python/PyQt6 -pdfium -remoteobjects +dev-python/pyqt6 -pdfium -remoteobjects # Jimi Huotari (2023-11-22) # Unmask on amd64. diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index e7863a5e76a2a..e51faa8535fb1 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -19,7 +19,7 @@ # Ionen Wolkens (2024-09-27) # dev-qt/qtremoteobjects:6 has not been stabilized yet. -dev-python/PyQt6 remoteobjects +dev-python/pyqt6 remoteobjects # Nowa Ammerlaan (2024-07-24) # No stable versions of ROCm at the moment diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 99bacb2f64a44..dcfc80695b9cd 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -82,7 +82,7 @@ sys-kernel/gentoo-kernel-bin -generic-uki # Ionen Wolkens (2023-12-02) # dev-qt/qtwebengine:6 is keyworded here. -dev-python/PyQt6 -pdfium +dev-python/pyqt6 -pdfium # Takuya Wakazono (2023-11-21) # app-crypt/rpm-sequoia is keyworded here. diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 058af94660e07..a78c1a31f6f63 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -99,7 +99,7 @@ sys-kernel/gentoo-kernel-bin generic-uki # Ionen Wolkens (2023-12-02) # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 have few keywords. -dev-python/PyQt6 pdfium remoteobjects +dev-python/pyqt6 pdfium remoteobjects # Jimi Huotari (2023-11-22) # media-libs/libvpl is only keyworded for amd64 at this time. diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask index 131fe2e62a1b5..d7e7bb3f72c36 100644 --- a/profiles/arch/powerpc/ppc32/package.use.mask +++ b/profiles/arch/powerpc/ppc32/package.use.mask @@ -29,7 +29,7 @@ x11-misc/xdg-utils plasma # Ionen Wolkens (2024-07-02) # Needs dev-qt/qtquick3d:6 which itself needs media-libs/assimp that # is no longer keyworded here and currently fails tests (bug #935313). -dev-python/PyQt6 quick3d +dev-python/pyqt6 quick3d dev-qt/qtmultimedia:6 qml # Sam James (2024-05-19) diff --git a/profiles/package.mask b/profiles/package.mask index b8f2ead7f6904..76f4c27fea7d6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -377,7 +377,7 @@ app-i18n/kcm-fcitx # Masked for testing, and odds are (at this point) that 6.8.0 will # never be unmasked and will skip to 6.8.1 instead given the large # amount of regressions there's been.. -=dev-python/PyQt6-6.8.0_pre* +=dev-python/pyqt6-6.8.0_pre* =dev-python/pyqt6-webengine-6.8.0_pre* =dev-python/pyside6-6.8.0* =dev-python/pyside6-tools-6.8.0* diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 47695fff68dd1..365fff9126529 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -16,7 +16,7 @@ dev-libs/libjcat gpg pkcs7 # qtwebchannel package is fairly small, and python bindings are # required by some popular desktop packages such as calibre, # qutebrowser, and freecad (or indirectly through PyQt*WebEngine). -dev-python/PyQt6 webchannel +dev-python/pyqt6 webchannel dev-python/pyside6 webchannel # Required by sys-apps/flatpak, a dependency of kde-plasma/discover diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024 index 6080b301c072f..e580022ababf0 100644 --- a/profiles/updates/4Q-2024 +++ b/profiles/updates/4Q-2024 @@ -61,3 +61,4 @@ move dev-python/PyQtWebEngine dev-python/pyqtwebengine move dev-python/PyQ5-sip dev-python/pyq5-sip move dev-python/PyQt5-sip dev-python/pyqt5-sip move dev-python/PyQt5 dev-python/pyqt5 +move dev-python/PyQt6 dev-python/pyqt6 diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild index bc460c790b5e7..f882c81156e00 100644 --- a/sci-geosciences/qgis/qgis-3.38.3.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild @@ -88,7 +88,7 @@ COMMON_DEPEND=" 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/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] >=dev-python/qscintilla-2.10.1[qt6] ') ) @@ -114,7 +114,7 @@ BDEPEND="${PYTHON_DEPS} test? ( python? ( $(python_gen_cond_dep ' - dev-python/PyQt6[${PYTHON_USEDEP},testlib] + dev-python/pyqt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 46fc70e8479cf..e3db08636738e 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -88,7 +88,7 @@ COMMON_DEPEND=" 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/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] >=dev-python/qscintilla-2.10.1[qt6] ') ) @@ -114,7 +114,7 @@ BDEPEND="${PYTHON_DEPS} test? ( python? ( $(python_gen_cond_dep ' - dev-python/PyQt6[${PYTHON_USEDEP},testlib] + dev-python/pyqt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') diff --git a/sci-visualization/paraview/paraview-5.13.0.ebuild b/sci-visualization/paraview/paraview-5.13.0.ebuild index 783e7e442b777..ab6b661d4c4d5 100644 --- a/sci-visualization/paraview/paraview-5.13.0.ebuild +++ b/sci-visualization/paraview/paraview-5.13.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="doxygen" inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg @@ -72,7 +72,7 @@ RDEPEND=" dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] mpi? ( dev-python/mpi4py ) - qt6? ( dev-python/PyQt6[opengl,${PYTHON_USEDEP}] ) + qt6? ( dev-python/pyqt6[opengl,${PYTHON_USEDEP}] ) ') ) qt6? ( diff --git a/sys-apps/polychromatic/polychromatic-0.9.2.ebuild b/sys-apps/polychromatic/polychromatic-0.9.2.ebuild index 666d762de9736..96e5f7edc4460 100644 --- a/sys-apps/polychromatic/polychromatic-0.9.2.ebuild +++ b/sys-apps/polychromatic/polychromatic-0.9.2.ebuild @@ -31,7 +31,7 @@ RDEPEND=" >=x11-libs/gtk+-3.20:3[introspection] $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP}] - dev-python/PyQt6[svg,${PYTHON_USEDEP}] + dev-python/pyqt6[svg,${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] dev-python/colour[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] diff --git a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild index 49055cb68501c..91d9700be1e5a 100644 --- a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild +++ b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild @@ -31,7 +31,7 @@ RDEPEND=" >=x11-libs/gtk+-3.20:3[introspection] $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP}] - dev-python/PyQt6[svg,${PYTHON_USEDEP}] + dev-python/pyqt6[svg,${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] dev-python/colour[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] diff --git a/sys-apps/polychromatic/polychromatic-9999.ebuild b/sys-apps/polychromatic/polychromatic-9999.ebuild index 0c736a1764445..449c26cafaebf 100644 --- a/sys-apps/polychromatic/polychromatic-9999.ebuild +++ b/sys-apps/polychromatic/polychromatic-9999.ebuild @@ -31,7 +31,7 @@ RDEPEND=" >=x11-libs/gtk+-3.20:3[introspection] $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP}] - dev-python/PyQt6[svg,${PYTHON_USEDEP}] + dev-python/pyqt6[svg,${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] dev-python/colour[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] diff --git a/www-client/qutebrowser/qutebrowser-3.3.1.ebuild b/www-client/qutebrowser/qutebrowser-3.3.1.ebuild index f2a39cb456d64..d38ed30059cb1 100644 --- a/www-client/qutebrowser/qutebrowser-3.3.1.ebuild +++ b/www-client/qutebrowser/qutebrowser-3.3.1.ebuild @@ -31,7 +31,7 @@ IUSE="+adblock pdf widevine" RDEPEND=" $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] - dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] + dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/colorama[${PYTHON_USEDEP}] dev-python/jinja2[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] @@ -48,7 +48,7 @@ RDEPEND=" BDEPEND=" $(python_gen_cond_dep ' test? ( - dev-python/PyQt6[testlib] + dev-python/pyqt6[testlib] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cheroot[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 6ee7e2c7560be..e8048f80d9232 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -31,7 +31,7 @@ IUSE="+adblock pdf widevine" RDEPEND=" $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] - dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] + dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/colorama[${PYTHON_USEDEP}] dev-python/jinja2[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] @@ -48,7 +48,7 @@ RDEPEND=" BDEPEND=" $(python_gen_cond_dep ' test? ( - dev-python/PyQt6[testlib] + dev-python/pyqt6[testlib] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cheroot[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}]