From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-python/protobuf-python/Manifest | 8 +-- ...protobuf.pyext._message.PyUnknownFieldRef.patch | 22 ------- .../protobuf-python/protobuf-python-3.19.1.ebuild | 52 ---------------- .../protobuf-python-3.19.3-r1.ebuild | 67 --------------------- .../protobuf-python-3.19.3-r2.ebuild | 70 ++++++++++++++++++++++ .../protobuf-python/protobuf-python-3.19.3.ebuild | 64 -------------------- .../protobuf-python/protobuf-python-9999.ebuild | 5 +- 7 files changed, 76 insertions(+), 212 deletions(-) delete mode 100644 dev-python/protobuf-python/files/protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch delete mode 100644 dev-python/protobuf-python/protobuf-python-3.19.1.ebuild delete mode 100644 dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild create mode 100644 dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild delete mode 100644 dev-python/protobuf-python/protobuf-python-3.19.3.ebuild (limited to 'dev-python/protobuf-python') diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index edba0f614a01..ead7c93bc62d 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,9 +1,5 @@ AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 1743 BLAKE2B c21d80a6cd218068d2a910ccd12c314810bd2eb679b59f79ba8d4d694948841d0fd8a56e921fed6f347ae9235f33903d79a038e8ae8659ea65bb59dbf7d7d9ea SHA512 7822b826d62585c48acebf04083546a3ebf8f6570854da8bddac3cc40554e71eaf57e9579c314ada33cf5bd0837cae23a3ef1057e44f6234d1d4a591c8036678 -AUX protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch 883 BLAKE2B 94a9a2b41aca33be4439d7f1ad951d66126c42b04a36da0bcba40032377573ff6fc6cff6dd222b6921357ef1a4dffeee8131d124b3ce7f6322b6a8579eeeba97 SHA512 2641531a4c57f5a9f12f536a4a9418776f791062bab6802b19ab212c0dcc6dec3276ed94cbdbf73c2893fbcd4082df4740e09620a7e0db5f79ef4535dde88fb7 -DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6 -EBUILD protobuf-python-3.19.1.ebuild 1316 BLAKE2B bbe5716cf480132506b3764849c1f89b00e5fe55c20ee526068989d35b581e1897eb3d67807fd6502590baff044e341630d6e185c630a7622616bdcda5687486 SHA512 47c81eda428c26a326618082aafe22b86e2f9efe8a81efbf78a03bfd874bcc4ed6d53c75332d4b82b82d14440d533143f6ca95a1e98f2bdb032a60eff0a6e806 -EBUILD protobuf-python-3.19.3-r1.ebuild 1494 BLAKE2B 2323f619de22a834601af6b848f7aaaeaecf8be44382e6c07b0002cf586d2933175ef1c37904a9c8e8a77c44ec1cf56cf1e8374e3fe30a41eab660d26a2dc5cc SHA512 4ee32a5df565b3252f12bd67cf198850001d9d770ed32c58298f22f08e63595091a3f1ba46501b7392ad53a58d3408c6b44a2cff68b0384f164bd8ff518cd5b7 -EBUILD protobuf-python-3.19.3.ebuild 1558 BLAKE2B c518816f05766547a6a6d51d8e63998316bd8a1b06168e2174526b7068fa0c8d77f86fadad614917ea451c93038428f2a85fa6b3fb2148c19cd357216f682bae SHA512 29a8e3b48a88578af46c3fcfd2e9402100ca04b30c5e850e986ff14e924619a3f865fa84c17d44536389979328b1299e28bd3a605481fa88ba534cd6586b64f8 -EBUILD protobuf-python-9999.ebuild 1295 BLAKE2B e65e4dd49f95055d23b41d2dfca4875cd832fd403299bcd0b8119145403cd9dca2d6de33b3f7ced611e71423558637cd2f346bb9970ae005f9b86cc5d3ba6bf2 SHA512 ddaa6bbbe2804cfba415bc5e93cf62733895b19b435d04d8c9102264b96c0533afe7567df199676b1a1b923c77de28d055400a1bd95af3884e2316edd65859cc +EBUILD protobuf-python-3.19.3-r2.ebuild 1521 BLAKE2B fa114bf35d495311e22ba3c14c5ddb7786b0841f490eea785e7f9d74b3106e9163d7f257a7807f02322391d467bedac1553b677ff6f6902d72731246bf6a8c8a SHA512 c018c87e6c104d9c30fa6aa8088bf67d241580dab165b3a7da1443ee715d372a2371e76741863310e85cb225cf23f42b468b1b1c46cae3c3d60409012d9702ff +EBUILD protobuf-python-9999.ebuild 1328 BLAKE2B ed33dc72c2a488ab9184411b77bfecdc654bd5ad455f0c615f9f02f32f05a742cdd1c2e57f4b9eb914f0c5571387ab321992aae2e7b4023488fb28f3efe8b9ea SHA512 d8b129bcc4226fc4afb1bb5242b16e5b31e5e519ce0bf786d1dd657e75eda47e7838b332017befb6da8fad59ce3d297380f6f072361a12855281b678fa92d463 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b 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-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild deleted file mode 100644 index e29ffa1c55e7..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild +++ /dev/null @@ -1,67 +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}" - -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-r2.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild new file mode 100644 index 000000000000..4fb279abd7d0 --- /dev/null +++ b/dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild @@ -0,0 +1,70 @@ +# 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.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 -} diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild index 34d32b251ad3..9347d6babd62 100644 --- a/dev-python/protobuf-python/protobuf-python-9999.ebuild +++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild @@ -40,7 +40,10 @@ DEPEND=" ${PYTHON_DEPS} ~dev-libs/protobuf-${PV} " -RDEPEND="${BDEPEND}" +RDEPEND=" + ${BDEPEND} + !dev-python/namespace-google +" if [[ "${PV}" == "9999" ]]; then EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" -- cgit v1.2.3