gentoo auto-resync : 16:12:2023 - 02:52:59

8 files changed, 82 insertions, 65 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2240fbe7180f..407475be4431 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7e8074ed4f0d..10d8b86c7f1c 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -14,5 +14,5 @@ EBUILD cython-3.0.2-r1.ebuild 2085 BLAKE2B e8a78a6d020acf7755d6cd2ab0c9cb5f9a704
 EBUILD cython-3.0.3.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
 EBUILD cython-3.0.4.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
 EBUILD cython-3.0.5.ebuild 2012 BLAKE2B a51a602274a10537157738608108f412da4d09ad5f7e3273b1c966fc0688ed4bcdbd281988eb4912f83cf77c0e56cf72c351d4a22dd8b730793917f9a00b9be4 SHA512 65c20157d243f0de394b9dc6bb15e20909b695cd6b747a44805074ab3dc88cd420d0781867327c66fbd1e55709589fc3a52f43c8f90e85e540b5751f07e0852a
-EBUILD cython-3.0.6.ebuild 2006 BLAKE2B 5f002cd250dd738767795586867af78e9a138744a34c5a1d4437f293ee8100c5b12ddbfe013b911594033a6448775428451dd73d2c4d9eb832cde2e2f66cbc84 SHA512 67450fd18404c5eec9360851a6fbf1d3eed984ca72e9d4db97715d682aa61fc5cb708cb0386c7a926c5cf059c57741856e6cdcb9361eaed3863b245cec4ebcd9
+EBUILD cython-3.0.6.ebuild 2005 BLAKE2B 474615b009aa5f881ea160223025448af1da749072f2cfcd8d50280609f83cf62325d3f0af8a143cfe57175aa327ae145d0201cf7e41aa8d22c8243c7d54b71b SHA512 0ee201b280d2c37095366fe277d213d64d7540a068915297bf9b61824bb1ae7508c0c0c4644ba30c31db37350a844ae8812423dc9b9adf803a1e6da1953f4da6
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.6.ebuild b/dev-python/cython/cython-3.0.6.ebuild
index 001a1bda5642..2def0f843b56 100644
--- a/dev-python/cython/cython-3.0.6.ebuild
+++ b/dev-python/cython/cython-3.0.6.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
deleted file mode 100644
index 9ce240af677f..000000000000
--- a/dev-python/plyr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-glyr-1.0.6.gh.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
-EBUILD plyr-1.0.6-r1.ebuild 892 BLAKE2B 2a196f88b8ae11038e109b15e2e31e7a2ba9dc6ca73055f37bcadbf7ff0f41cafc4fcf586d0746ced513d87c7f5a917d12cdd8aeef7b6e6e75590c8440180307 SHA512 cf33c1c52e47d5ba6b336aa96abce10f633bfda1c9cec9ad0174de1aaabd33cd33e4504873fb7bfdf8c45cb0fcf9ec0721776da562f0cfb3c6dc552c6c2dc2cf
-MISC metadata.xml 365 BLAKE2B 8a30581cdb4603530b64093b9ba4b374d00de92743eb4548363872381142c23242f09ba32e6bbaead07a06f13d47b1fa5f89e3c5b426f057994c85709f5b49bd SHA512 6e3bb4d6ddf61f54cdd1e490c93c7f0339c58f521719c0c2aac98679c44a1d3e5ca0d064f131a67520ff47fae080e6df3029e2dccb9d158a3128df1341f574ed
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
deleted file mode 100644
index 717f0fb021a8..000000000000
--- a/dev-python/plyr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sahib/python-glyr</remote-id>
-		<remote-id type="pypi">plyr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/plyr/plyr-1.0.6-r1.ebuild b/dev-python/plyr/plyr-1.0.6-r1.ebuild
deleted file mode 100644
index bd405e8ab86d..000000000000
--- a/dev-python/plyr/plyr-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_PN="python-glyr"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A python wrapper for Glyr"
-HOMEPAGE="
-	https://sahib.github.io/python-glyr/intro.html
-	https://github.com/sahib/python-glyr/
-	https://pypi.org/project/plyr/
-"
-SRC_URI="
-	https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-DEPEND="
-	media-libs/glyr:=
-"
-RDEPEND="
-	${DEPEND}
-"
-# <cython-3: https://bugs.gentoo.org/898696
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_misc.py::TestMisc::test_download
-)
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 1e8a6af4021d..bea5210bf453 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,6 +1,8 @@
 AUX protobuf-python-3.20.3-python311.patch 3717 BLAKE2B f3a0b1b06bdbc2222fd3817b87f9b80cf609e9eb410770af31a069396eb68417f37c06603229ac8fc6aca958a9f8c0deec6b5f0812df6d7dac214b3f8622da29 SHA512 dd03b34b06e67aa4dc16281902e4676ee55169343d062b9515195ff9c92fc9cca4aaa24f83309b7f150f67a49356c41e22380bd68231dab7df04ac1c127f096f
+DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
+EBUILD protobuf-python-4.21.12.ebuild 1716 BLAKE2B 97157493bac3e39e408216b5b051d166be80bf09ed9390ec1a24a3700acbe518039cd5a7feab8b075a705134314a09196a6ffcee223f20018972b8694ba89a0c SHA512 ad3cca616816e0ea6182c32caf13078ae67f3a47cd5e944bfbce8c24c026648d737f973bfdc855e0bf53bfb100ad5aad53027e1adbe7657c85fcea0867241f8d
 EBUILD protobuf-python-4.21.9.ebuild 1852 BLAKE2B f3b2977f5a058550d6d3ebe4f421da10e6c0f7dc58e2feee4b6d6198d339e1e6810426271b76fc14d9e2b27ed1ad5ddfe49637ff3cdbacdcdd7f4b26b3a5188b SHA512 844ab88f8d881310e05eaad54805a78834b93296b173947e9c55fc64a4e6ec1489219e1db4ef65da836d1ece782860b8b19d915a2e6da44b2582b9125971768e
 EBUILD protobuf-python-4.23.3.ebuild 1681 BLAKE2B 099119c8de2ab49268795635c29f91b42d06ee6f3c14ac9680295ef305063286b244236f9a597e1a114896c1f9f9c70b66ee7f0fed4a9f1644e151aaad0d9961 SHA512 01dfac68ae987a264c0ce5c634ec5d2cc914c7381155270a518ef78656bae13dc95b04e8ebd30427339056307a85f82b5ace79b2aa85af8d2af30e2380ecab2e
 EBUILD protobuf-python-9999.ebuild 1674 BLAKE2B d658445906ce272fcaaefba477a7b300557f45698aea4874428e9a5dd368bb0485a8b4abd8c95195c71400f6fb610ae6d5bb0788223ab85aa97061b1feec7945 SHA512 ad459f34af37e0a478dcd41f2875481a20433a445e3f7bb41e13434f5c65f2720b630f89f923173e86c6ed239e71600b3893ee1d2c2ac700babe3cac705b8d79
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild b/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild
new file mode 100644
index 000000000000..5bac62a748d7
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/3.${PARENT_PV}.0"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20.3-python311.patch
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}