Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/, dev-python/PyQt6-sip/, profiles/updates/, ...
Date: Wed, 03 Aug 2022 13:51:16
Message-Id: 1659528695.f251005a19167828b25cd87dd83e9dad492a31a0.ionen@gentoo
1 commit: f251005a19167828b25cd87dd83e9dad492a31a0
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 11:51:33 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 12:11:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f251005a
7
8 dev-python/PyQt6-sip: rename from dev-python/PyQt6_sip
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 and old PyQt5-sip didn't either.
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_sip => PyQt6-sip}/Manifest | 0
21 .../PyQt6_sip-13.4.0.ebuild => PyQt6-sip/PyQt6-sip-13.4.0.ebuild} | 5 ++++-
22 dev-python/{PyQt6_sip => PyQt6-sip}/metadata.xml | 0
23 dev-python/PyQt6/PyQt6-6.3.1.ebuild | 2 +-
24 profiles/updates/3Q-2022 | 1 +
25 5 files changed, 6 insertions(+), 2 deletions(-)
26
27 diff --git a/dev-python/PyQt6_sip/Manifest b/dev-python/PyQt6-sip/Manifest
28 similarity index 100%
29 rename from dev-python/PyQt6_sip/Manifest
30 rename to dev-python/PyQt6-sip/Manifest
31
32 diff --git a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
33 similarity index 79%
34 rename from dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
35 rename to dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
36 index c0e19cedab8a..fca26761e4a1 100644
37 --- a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
38 +++ b/dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
39 @@ -7,9 +7,12 @@ DISTUTILS_USE_PEP517=setuptools
40 PYTHON_COMPAT=( python3_{8..11} )
41 inherit distutils-r1
42
43 +MY_P="${P/-/_}"
44 +
45 DESCRIPTION="sip module support for PyQt6"
46 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
47 -SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
48 +SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz"
49 +S="${WORKDIR}/${MY_P}"
50
51 LICENSE="|| ( GPL-2 GPL-3 SIP )"
52 SLOT="0"
53
54 diff --git a/dev-python/PyQt6_sip/metadata.xml b/dev-python/PyQt6-sip/metadata.xml
55 similarity index 100%
56 rename from dev-python/PyQt6_sip/metadata.xml
57 rename to dev-python/PyQt6-sip/metadata.xml
58
59 diff --git a/dev-python/PyQt6/PyQt6-6.3.1.ebuild b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
60 index 4eee1c118cf4..b4e6e39ee113 100644
61 --- a/dev-python/PyQt6/PyQt6-6.3.1.ebuild
62 +++ b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
63 @@ -59,7 +59,7 @@ DEPEND="
64 websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )"
65 RDEPEND="
66 ${DEPEND}
67 - >=dev-python/PyQt6_sip-13.4[${PYTHON_USEDEP}]"
68 + >=dev-python/PyQt6-sip-13.4[${PYTHON_USEDEP}]"
69 BDEPEND="
70 >=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
71 >=dev-qt/qtbase-${QT_PV}
72
73 diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
74 index d0aa69694857..bcc9e74afaad 100644
75 --- a/profiles/updates/3Q-2022
76 +++ b/profiles/updates/3Q-2022
77 @@ -9,3 +9,4 @@ move kde-apps/kdesdk-kioslaves dev-util/kio-perldoc
78 move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf
79 move net-misc/cni-plugins app-containers/cni-plugins
80 move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
81 +move dev-python/PyQt6_sip dev-python/PyQt6-sip