Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/sip/
Date: Tue, 15 Jun 2021 01:57:50
Message-Id: 1623722175.4440598d01031e97414e0f107f3aa2b3a5b607e0.pesa@gentoo
1 commit: 4440598d01031e97414e0f107f3aa2b3a5b607e0
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 23:42:46 2021 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 15 01:56:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4440598d
7
8 dev-python/sip: move 5.5.0 to SLOT=5; add 6.1.0 (masked)
9
10 Drop the subslot because the sip module is no longer
11 provided by this package starting from v5
12
13 Package-Manager: Portage-3.0.20, Repoman-3.0.3
14 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
15
16 dev-python/sip/Manifest | 1 +
17 dev-python/sip/{sip-5.5.0.ebuild => sip-5.5.0-r1.ebuild} | 4 ++--
18 dev-python/sip/{sip-5.5.0.ebuild => sip-6.1.0.ebuild} | 4 ++--
19 profiles/package.mask | 4 ++++
20 4 files changed, 9 insertions(+), 4 deletions(-)
21
22 diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
23 index 31dbfc2b688..f28091691f4 100644
24 --- a/dev-python/sip/Manifest
25 +++ b/dev-python/sip/Manifest
26 @@ -1,2 +1,3 @@
27 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
28 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
29 +DIST sip-6.1.0.tar.gz 1441449 BLAKE2B 07740fd0c5feba2267d6af6acbd1f457b75f1e450558481a19cc3bbb8d9fc072335b61b9def236b2f3039ee5056a09694b5247fd49b5c006ea29029f08c31209 SHA512 6c1e6413020e8099ebf52b75dcb599c46d4e1d1ff8e8e672e76f77c1e421ae93dff66c9cd131b46642c567cfe876047eb9679d59babed11bf51e609b325b9e7c
30
31 diff --git a/dev-python/sip/sip-5.5.0.ebuild b/dev-python/sip/sip-5.5.0-r1.ebuild
32 similarity index 92%
33 copy from dev-python/sip/sip-5.5.0.ebuild
34 copy to dev-python/sip/sip-5.5.0-r1.ebuild
35 index d7fd2fa0c23..26eee4168c3 100644
36 --- a/dev-python/sip/sip-5.5.0.ebuild
37 +++ b/dev-python/sip/sip-5.5.0-r1.ebuild
38 @@ -16,12 +16,12 @@ else
39 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
40 fi
41
42 -# Sub-slot based on ${S}/sipbuild/module/source
43 -SLOT="0/12"
44 +SLOT="5"
45 LICENSE="|| ( GPL-2 GPL-3 SIP )"
46 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
47
48 RDEPEND="
49 + !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
50 dev-python/packaging[${PYTHON_USEDEP}]
51 dev-python/toml[${PYTHON_USEDEP}]
52 "
53
54 diff --git a/dev-python/sip/sip-5.5.0.ebuild b/dev-python/sip/sip-6.1.0.ebuild
55 similarity index 92%
56 rename from dev-python/sip/sip-5.5.0.ebuild
57 rename to dev-python/sip/sip-6.1.0.ebuild
58 index d7fd2fa0c23..26eee4168c3 100644
59 --- a/dev-python/sip/sip-5.5.0.ebuild
60 +++ b/dev-python/sip/sip-6.1.0.ebuild
61 @@ -16,12 +16,12 @@ else
62 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
63 fi
64
65 -# Sub-slot based on ${S}/sipbuild/module/source
66 -SLOT="0/12"
67 +SLOT="5"
68 LICENSE="|| ( GPL-2 GPL-3 SIP )"
69 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
70
71 RDEPEND="
72 + !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
73 dev-python/packaging[${PYTHON_USEDEP}]
74 dev-python/toml[${PYTHON_USEDEP}]
75 "
76
77 diff --git a/profiles/package.mask b/profiles/package.mask
78 index 839caf384b2..2427865ff31 100644
79 --- a/profiles/package.mask
80 +++ b/profiles/package.mask
81 @@ -32,6 +32,10 @@
82
83 #--- END OF EXAMPLES ---
84
85 +# Davide Pesavento <pesa@g.o> (2021-06-15)
86 +# Masked for revdep testing.
87 +>=dev-python/sip-6
88 +
89 # Sam James <sam@g.o> (2021-06-15)
90 # Fails to build with GCC 11. Strange build system that needs more
91 # work to function properly (and integrate better). Several open bugs.