commit: 9d0d812f46fe450e20eb74f5af20e1419fcbb2c5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Apr 22 06:54:52 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Apr 22 07:08:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0d812f
dev-python/protobuf-python: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/protobuf-python/Manifest | 1 - ...protobuf.pyext._message.PyUnknownFieldRef.patch | 22 -------- .../protobuf-python/protobuf-python-3.19.1.ebuild | 52 ------------------ .../protobuf-python/protobuf-python-3.19.3.ebuild | 64 ---------------------- 4 files changed, 139 deletions(-) diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index 4bcae58108da..445bb0b6652e 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,2 +1 @@ -DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6 diff --git a/dev-python/protobuf-python/files/protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch deleted file mode 100644 index a03ad98b4550..000000000000 --- a/dev-python/protobuf-python/files/protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/protocolbuffers/protobuf/issues/6205 -https://github.com/protocolbuffers/protobuf/pull/7016 - ---- a/google/protobuf/pyext/unknown_fields.cc -+++ b/google/protobuf/pyext/unknown_fields.cc -@@ -274,13 +274,13 @@ - 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_FromUnsignedLongLong(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(), diff --git a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild deleted file mode 100644 index 3e158f4d10aa..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"; - EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" - EGIT_SUBMODULES=() -else - SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" -fi -S="${WORKDIR}/protobuf-${PV}/python" - -DESCRIPTION="Google's Protocol Buffers - Python bindings" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"; - -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/namespace-google[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${PYTHON_DEPS} - ~dev-libs/protobuf-${PV}" -RDEPEND="${BDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch" -) - -distutils_enable_tests setup.py - -python_configure_all() { - mydistutilsargs=( - --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.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild deleted file mode 100644 index 01d4fc29d612..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -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="" -else - SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/30" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} - dev-python/namespace-google[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${PYTHON_DEPS} - ~dev-libs/protobuf-${PV}" -RDEPEND="${BDEPEND}" - -S="${WORKDIR}/protobuf-${PV}/python" - -if [[ "${PV}" == "9999" ]]; then - EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" -fi - -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 -} - -python_configure_all() { - mydistutilsargs=(--cpp_implementation) -} - -python_test() { - esetup.py test -} - -python_install_all() { - distutils-r1_python_install_all - - find "${ED}" -name "*.pth" -type f -delete || die -}
