commit: d72194230e2ee03d5c1e6ee0be41ac12e6966e42 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jan 5 11:08:42 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 11:08:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7219423
dev-python/protobuf-python: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/protobuf-python/Manifest | 3 - ...protobuf.pyext._message.PyUnknownFieldRef.patch | 42 ------------ .../protobuf-python-3.19.3-r2.ebuild | 70 ------------------- .../protobuf-python-3.19.3-r3.ebuild | 72 -------------------- .../protobuf-python/protobuf-python-3.19.6.ebuild | 79 ---------------------- .../protobuf-python/protobuf-python-4.21.8.ebuild | 79 ---------------------- 6 files changed, 345 deletions(-) diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index 5dd5ef74895c..a24cffb5f6fd 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,6 +1,3 @@ -DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1 -DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6 -DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0 DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c diff --git a/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch deleted file mode 100644 index a9e23feea148..000000000000 --- a/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 387c9e58987c54b72e66c14b34c98297086cd812 Mon Sep 17 00:00:00 2001 -From: Arfrever Frehtes Taifersar Arahesis <[email protected]> -Date: Fri, 28 Jan 2022 15:32:43 +0800 -Subject: [PATCH] protobuf-python-3.19.0: - google.protobuf.pyext._message.PyUnknownFieldRef - -Prevent integer overflow for unknown fields. - -https://github.com/protocolbuffers/protobuf/issues/6205 -https://github.com/protocolbuffers/protobuf/pull/7016 -https://github.com/protocolbuffers/protobuf/commit/5100be2b7746391c2724e2793e1428c36b63c98b - -Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[email protected]> -Signed-off-by: Yixun Lan <[email protected]> ---- - python/google/protobuf/pyext/unknown_fields.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/google/protobuf/pyext/unknown_fields.cc b/python/google/protobuf/pyext/unknown_fields.cc -index 6d919b3..37e6eae 100644 ---- a/python/google/protobuf/pyext/unknown_fields.cc -+++ b/python/google/protobuf/pyext/unknown_fields.cc -@@ -275,13 +275,13 @@ static PyObject* GetData(PyUnknownFieldRef* self, void *closure) { - PyObject* data = NULL; - switch (field->type()) { - case UnknownField::TYPE_VARINT: -- data = PyLong_FromLong(field->varint()); -+ data = PyLong_FromUnsignedLongLong(field->varint()); - break; - case UnknownField::TYPE_FIXED32: -- data = PyLong_FromLong(field->fixed32()); -+ data = PyLong_FromUnsignedLong(field->fixed32()); - break; - case UnknownField::TYPE_FIXED64: -- data = PyLong_FromLong(field->fixed64()); -+ data = PyLong_FromUnsignedLongLong(field->fixed64()); - break; - case UnknownField::TYPE_LENGTH_DELIMITED: - data = PyBytes_FromStringAndSize(field->length_delimited().data(), --- -2.34.1 - diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild deleted file mode 100644 index 4fb279abd7d0..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"; - EGIT_SUBMODULES=() -fi - -DESCRIPTION="Google's Protocol Buffers - Python bindings" -HOMEPAGE=" - https://developers.google.com/protocol-buffers/ - https://github.com/protocolbuffers/protobuf/ -" -if [[ "${PV}" != "9999" ]]; then - SRC_URI=" - https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz - -> protobuf-${PV}.tar.gz - " -fi -S="${WORKDIR}/protobuf-${PV}/python" - -LICENSE="BSD" -SLOT="0/30" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -BDEPEND=" - ${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} - dev-python/six[${PYTHON_USEDEP}] -" -DEPEND=" - ${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} -" -RDEPEND=" - ${BDEPEND} - !dev-python/namespace-google -" - -if [[ "${PV}" == "9999" ]]; then - EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" -fi - -distutils_enable_tests setup.py - -python_prepare_all() { - pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die - eapply "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} - -src_configure() { - DISTUTILS_ARGS=(--cpp_implementation) -} - -python_install_all() { - distutils-r1_python_install_all - find "${ED}" -name "*.pth" -type f -delete || die -} diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild deleted file mode 100644 index 3976006190c8..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"; - EGIT_SUBMODULES=() -fi - -DESCRIPTION="Google's Protocol Buffers - Python bindings" -HOMEPAGE=" - https://developers.google.com/protocol-buffers/ - https://github.com/protocolbuffers/protobuf/ - https://pypi.org/project/protobuf/ -" -if [[ "${PV}" != "9999" ]]; then - SRC_URI=" - https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz - -> protobuf-${PV}.tar.gz - " -fi -S="${WORKDIR}/protobuf-${PV}/python" - -LICENSE="BSD" -SLOT="0/30" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" - -BDEPEND=" - ${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} - dev-python/six[${PYTHON_USEDEP}] -" -DEPEND=" - ${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} -" -RDEPEND=" - ${BDEPEND} - !dev-python/namespace-google -" - -if [[ "${PV}" == "9999" ]]; then - EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" -fi - -distutils_enable_tests setup.py - -python_prepare_all() { - pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die - eapply "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" - 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 -} diff --git a/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild deleted file mode 100644 index dc9a76ba6458..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -PARENT_PN="${PN/-python/}" -PARENT_PV="${PV}" -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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~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/30" - -S="${WORKDIR}/${PARENT_P}/python" - -BDEPEND=" -" -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=( - "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" -) - -# Here for patches within "python/" subdirectory. -PATCHES=( -) - -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 -} diff --git a/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild b/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild deleted file mode 100644 index 884546edf04c..000000000000 --- a/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~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/32" - -S="${WORKDIR}/${PARENT_P}/python" - -BDEPEND=" -" -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 -}
