From b8cb86345e657e7af1fffa5e68508a64748e1503 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 3 Aug 2022 07:44:51 -0400 Subject: [PATCH] dev-python/PyQt6-WebEngine: rename from dev-python/PyQt6_WebEngine Was meant to match to skip MY_P (like dev-python often does), but on second thought it doesn't feel entirely right here given (ignoring pypi tarballs) official website doesn't use underscore (e.g. PyQt-WebEngine). Could probably skip pkgmove (qt6 still masked), but feels messy not to so doing it anyway. Signed-off-by: Ionen Wolkens --- dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/Manifest | 0 .../PyQt6-WebEngine-6.3.1.ebuild} | 4 +++- dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/metadata.xml | 0 profiles/arch/amd64/x32/package.mask | 2 +- profiles/package.mask | 2 +- profiles/updates/3Q-2022 | 1 + www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) rename dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/Manifest (100%) rename dev-python/{PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild => PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild} (94%) rename dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/metadata.xml (100%) diff --git a/dev-python/PyQt6_WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest similarity index 100% rename from dev-python/PyQt6_WebEngine/Manifest rename to dev-python/PyQt6-WebEngine/Manifest diff --git a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild similarity index 94% rename from dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild rename to dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild index f304d9d147f42..eca7e68acd20f 100644 --- a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild +++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild @@ -8,10 +8,12 @@ PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 flag-o-matic multiprocessing qmake-utils QT_PV="6.3:6" # minimum tested qt version +MY_P="${P/-/_}" DESCRIPTION="Python bindings for QtWebEngine" HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/" -SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" diff --git a/dev-python/PyQt6_WebEngine/metadata.xml b/dev-python/PyQt6-WebEngine/metadata.xml similarity index 100% rename from dev-python/PyQt6_WebEngine/metadata.xml rename to dev-python/PyQt6-WebEngine/metadata.xml diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask index 8ddd7647fae5b..5ab09809bb60e 100644 --- a/profiles/arch/amd64/x32/package.mask +++ b/profiles/arch/amd64/x32/package.mask @@ -34,7 +34,7 @@ media-gfx/freecad # reverse-dependencies. dev-qt/qtwebengine dev-qt/qtwebview -dev-python/PyQt6_WebEngine +dev-python/PyQt6-WebEngine dev-python/PyQtWebEngine app-admin/calamares app-doc/zeal diff --git a/profiles/package.mask b/profiles/package.mask index 94171d0fe9cee..ec9b6047b97a8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -37,7 +37,7 @@ # Masked for testing. The split of some packages may still # change. bug #838970. dev-python/PyQt6 -dev-python/PyQt6_WebEngine +dev-python/PyQt6-WebEngine dev-qt/qt5compat:6 dev-qt/qtbase:6 dev-qt/qtdeclarative:6 diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022 index bcc9e74afaad7..0ac639a1c5db5 100644 --- a/profiles/updates/3Q-2022 +++ b/profiles/updates/3Q-2022 @@ -10,3 +10,4 @@ move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf move net-misc/cni-plugins app-containers/cni-plugins move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector move dev-python/PyQt6_sip dev-python/PyQt6-sip +move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild index 50f156d349ff6..baadc7dc34b07 100644 --- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild @@ -39,7 +39,7 @@ RDEPEND=" dev-qt/qtbase:6[icu] $(python_gen_cond_dep ' dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] - dev-python/PyQt6_WebEngine[${PYTHON_USEDEP},widgets]') + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]') ) !qt6? ( dev-qt/qtcore:5[icu]