gentoo auto-resync : 30:11:2023 - 23:09:52

4 files changed, 22 insertions, 16 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9e3327dace6b..b24b30d1c50d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,6 @@
+AUX sip-6.8.0-typo-fix.patch 534 BLAKE2B b20b4f6a0cb3e00742e52bfbef1aef3901d1510e9ac62a20b775ba5418a3e737fe1a392d46012302af90041312b5e1763a96758be9f31cd454654eb31c34591e SHA512 bf590b958dbfac116090d438b957613c98722d121a37a2d48f9094065a82fabcb9f4867237089720f85c1875086b796c51aa68d9c50a9687f2a32f0d01e88c54
 DIST sip-6.7.12.tar.gz 1169656 BLAKE2B 07ae682e783da5bc6fc3109c62c7bff245faab795cc28f135758b1211fae1dfae79668e7e7c0de8b3bae5c8b10534d153cdd47969b34149c8f5598867d19f17c SHA512 885c32a051e882b82b59bf1365050933f8fc1c619b19f4bc03235edc5741a5e14aae8edf90479ad0283f74ba5c5233a2589c151ec865b130199a6db9800a2294
-DIST sip-6.8.0.dev2310230931.tar.gz 1126109 BLAKE2B 53efdb9722888645b9772c6080f34459b89c745a02cfb9842f7924870afa81d4ba06ec6ac730ee1d254f5252c1c495a4b4dfd51157d759d7334d2980145214f8 SHA512 8bac33c9ae87dc11669837e2b07d5016a7e16e743439dbf763c13a118476431058d2a6c4b0c29e4ce7a7f5f86602bb1c9f27ccf0d3f6c1a298b06256f820ceaa
+DIST sip-6.8.0.tar.gz 985563 BLAKE2B 676636882a5bb39b226e7b25ae60cec43bf8ccfe9af085e14d9ff627af5ee579cc3ba01dbc5c2e75490575888fabdbd469895dbd964ea741d9e86748bebc1097 SHA512 09e25e3937339b6dbaa0b693bf0b99e5c225751ca79e0a307387c331f2b84e4e5a276897b471a123d24715e5d9cb85e84d244cf07960ff6f53f75859bbb2f901
 EBUILD sip-6.7.12.ebuild 708 BLAKE2B f963789cddf6ea326e66d141f357b33d08c257586cd87d6ab4b778b5fbf3d5bee37dedc1c3d83faf7b5e79587a58302af255284e76af990bc801f0b621f93b3f SHA512 ceb1061feed26598e2bef6bf35b1e3cf7f55b435c9ccc5375a36ccc14d3c76dc8420f5d6268f284fb2daa0e970bc463e45fd0f3e32e22e8020877cac1f69f747
-EBUILD sip-6.8.0_pre2310230931.ebuild 955 BLAKE2B c982e93d3e553242eb5e7c2dcbfba182ab60c3d25fe17079ce66e813370562e3527021b5bd793968208febab2778dd758d6756c6b6d788043c862dd30fdc4fce SHA512 c0e497875410478f6a82edd800ed66da4a21bc3955f6ebbcbccc75b78e5b5732fba0492a0a4ce6833b1d0fad3b4a0b647905a67258810d28f054606e1926c16f
-MISC metadata.xml 772 BLAKE2B 50e2f336bc0fbf4bef20665900d77ce10930ff51b2581f093e8687fba13abb504e068dedd3591d40102ff8ed71c733f01cea080ec56fe6dac77a372562d038f2 SHA512 d6fafc7dcae6416ca1e4b6f66c019606ff1adcf5b1aec241401f774a82697a5a44746f20f5b2c225c40805636d917b9021fdd75f0a9ffe5349e445855660742d
+EBUILD sip-6.8.0.ebuild 707 BLAKE2B 8ddaa8674e5861a8993ee56d6e777b4ebbe8d361ea113beeff7829bbeea8d559a3fe56682b85c757a3ebee89d2ede42ecfe899f1b3b32b6c5facdc24e9db72b5 SHA512 31f82f72ce8a98216a184311487a7a6f3491aeba5c0cbb3c04e45b0fb9395dee4043057abebaf0e577e158ff34b1d4948f655ea2b0cf16da46853de148832f22
+MISC metadata.xml 663 BLAKE2B df97b2104f63a42ffb6406bd577cefce51adc7e924aea96490e2cf60fad6975d3a9a3c3000f44dc49d193123559bc78efe3221c649642ff3f1d0a195b7102338 SHA512 7db390ee64b7e0d2b5d2dc85f3ba74714894978d85f9ac3b4cf4217827024b2129ca6f9f2e7c1d54301866690b926808b28d80b376247b9092c42198c7bff32b
diff --git a/dev-python/sip/files/sip-6.8.0-typo-fix.patch b/dev-python/sip/files/sip-6.8.0-typo-fix.patch
new file mode 100644
index 000000000000..637d416d403e
--- /dev/null
+++ b/dev-python/sip/files/sip-6.8.0-typo-fix.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/916261
+https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045607.html
+--- a/sipbuild/generator/outputs/code.py
++++ b/sipbuild/generator/outputs/code.py
+@@ -8409,5 +8409,5 @@
+         is_first = True
+ 
+-    if klass.docstring is None or klass.docstring.signature is not SocstringSignature.DISCARDED:
++    if klass.docstring is None or klass.docstring.signature is not DocstringSignature.DISCARDED:
+         for ctor in klass.ctors:
+             if ctor.access_specifier is AccessSpecifier.PRIVATE:
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index b7f5e4308ad2..300ab09f3263 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -5,10 +5,7 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<!--
-		TODO: mark stabilize-allarches after sip-6.8.0 is released
-		and 6.7.12 stabilization is done (6.8 becomes pure python)
-	-->
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="active">
 			<email>phil@riverbankcomputing.com</email>
diff --git a/dev-python/sip/sip-6.8.0_pre2310230931.ebuild b/dev-python/sip/sip-6.8.0.ebuild
index d27245e8eff1..67ecebb1da3e 100644
--- a/dev-python/sip/sip-6.8.0_pre2310230931.ebuild
+++ b/dev-python/sip/sip-6.8.0.ebuild
@@ -5,21 +5,14 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 #pypi
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
 
-# drop this temporary block on bump, re-add pypi inherit, and restore keywords
-# (see also metadata.xml comment)
-SIP_P=sip-$(ver_cut 1-3).dev$(ver_cut 5)
-SRC_URI="https://www.riverbankcomputing.com/pypi/packages/sip/${SIP_P}.tar.gz"
-S=${WORKDIR}/${SIP_P}
-
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-# unkeyworded pre-release for testing
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -28,3 +21,7 @@ RDEPEND="
 "
 
 distutils_enable_sphinx doc --no-autodoc
+
+PATCHES=(
+	"${FILESDIR}"/${P}-typo-fix.patch
+)