| 1 |
commit: b8cb86345e657e7af1fffa5e68508a64748e1503 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 3 11:44:51 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 12:26:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cb8634 |
| 7 |
|
| 8 |
dev-python/PyQt6-WebEngine: rename from dev-python/PyQt6_WebEngine |
| 9 |
|
| 10 |
Was meant to match to skip MY_P (like dev-python often does), but |
| 11 |
on second thought it doesn't feel entirely right here given |
| 12 |
(ignoring pypi tarballs) official website doesn't use underscore |
| 13 |
(e.g. PyQt-WebEngine). |
| 14 |
|
| 15 |
Could probably skip pkgmove (qt6 still masked), but feels messy |
| 16 |
not to so doing it anyway. |
| 17 |
|
| 18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 19 |
|
| 20 |
dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/Manifest | 0 |
| 21 |
.../PyQt6-WebEngine-6.3.1.ebuild} | 4 +++- |
| 22 |
dev-python/{PyQt6_WebEngine => PyQt6-WebEngine}/metadata.xml | 0 |
| 23 |
profiles/arch/amd64/x32/package.mask | 2 +- |
| 24 |
profiles/package.mask | 2 +- |
| 25 |
profiles/updates/3Q-2022 | 1 + |
| 26 |
www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild | 2 +- |
| 27 |
7 files changed, 7 insertions(+), 4 deletions(-) |
| 28 |
|
| 29 |
diff --git a/dev-python/PyQt6_WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest |
| 30 |
similarity index 100% |
| 31 |
rename from dev-python/PyQt6_WebEngine/Manifest |
| 32 |
rename to dev-python/PyQt6-WebEngine/Manifest |
| 33 |
|
| 34 |
diff --git a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild |
| 35 |
similarity index 94% |
| 36 |
rename from dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild |
| 37 |
rename to dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild |
| 38 |
index f304d9d147f4..eca7e68acd20 100644 |
| 39 |
--- a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild |
| 40 |
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild |
| 41 |
@@ -8,10 +8,12 @@ PYTHON_COMPAT=( python3_{8..11} ) |
| 42 |
inherit distutils-r1 flag-o-matic multiprocessing qmake-utils |
| 43 |
|
| 44 |
QT_PV="6.3:6" # minimum tested qt version |
| 45 |
+MY_P="${P/-/_}" |
| 46 |
|
| 47 |
DESCRIPTION="Python bindings for QtWebEngine" |
| 48 |
HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/" |
| 49 |
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" |
| 50 |
+SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz" |
| 51 |
+S="${WORKDIR}/${MY_P}" |
| 52 |
|
| 53 |
LICENSE="GPL-3" |
| 54 |
SLOT="0" |
| 55 |
|
| 56 |
diff --git a/dev-python/PyQt6_WebEngine/metadata.xml b/dev-python/PyQt6-WebEngine/metadata.xml |
| 57 |
similarity index 100% |
| 58 |
rename from dev-python/PyQt6_WebEngine/metadata.xml |
| 59 |
rename to dev-python/PyQt6-WebEngine/metadata.xml |
| 60 |
|
| 61 |
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask |
| 62 |
index 8ddd7647fae5..5ab09809bb60 100644 |
| 63 |
--- a/profiles/arch/amd64/x32/package.mask |
| 64 |
+++ b/profiles/arch/amd64/x32/package.mask |
| 65 |
@@ -34,7 +34,7 @@ media-gfx/freecad |
| 66 |
# reverse-dependencies. |
| 67 |
dev-qt/qtwebengine |
| 68 |
dev-qt/qtwebview |
| 69 |
-dev-python/PyQt6_WebEngine |
| 70 |
+dev-python/PyQt6-WebEngine |
| 71 |
dev-python/PyQtWebEngine |
| 72 |
app-admin/calamares |
| 73 |
app-doc/zeal |
| 74 |
|
| 75 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 76 |
index 94171d0fe9ce..ec9b6047b97a 100644 |
| 77 |
--- a/profiles/package.mask |
| 78 |
+++ b/profiles/package.mask |
| 79 |
@@ -37,7 +37,7 @@ |
| 80 |
# Masked for testing. The split of some packages may still |
| 81 |
# change. bug #838970. |
| 82 |
dev-python/PyQt6 |
| 83 |
-dev-python/PyQt6_WebEngine |
| 84 |
+dev-python/PyQt6-WebEngine |
| 85 |
dev-qt/qt5compat:6 |
| 86 |
dev-qt/qtbase:6 |
| 87 |
dev-qt/qtdeclarative:6 |
| 88 |
|
| 89 |
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022 |
| 90 |
index bcc9e74afaad..0ac639a1c5db 100644 |
| 91 |
--- a/profiles/updates/3Q-2022 |
| 92 |
+++ b/profiles/updates/3Q-2022 |
| 93 |
@@ -10,3 +10,4 @@ move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf |
| 94 |
move net-misc/cni-plugins app-containers/cni-plugins |
| 95 |
move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector |
| 96 |
move dev-python/PyQt6_sip dev-python/PyQt6-sip |
| 97 |
+move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine |
| 98 |
|
| 99 |
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild |
| 100 |
index 50f156d349ff..baadc7dc34b0 100644 |
| 101 |
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild |
| 102 |
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild |
| 103 |
@@ -39,7 +39,7 @@ RDEPEND=" |
| 104 |
dev-qt/qtbase:6[icu] |
| 105 |
$(python_gen_cond_dep ' |
| 106 |
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] |
| 107 |
- dev-python/PyQt6_WebEngine[${PYTHON_USEDEP},widgets]') |
| 108 |
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]') |
| 109 |
) |
| 110 |
!qt6? ( |
| 111 |
dev-qt/qtcore:5[icu] |
Archives