gentoo resync : 13.11.2021

3 files changed, 77 insertions, 0 deletions

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index c3f39e41a39f..e4a6f91b53bf 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,15 +1,18 @@
 AUX protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 888 BLAKE2B 25d486e8ccd60753f372fb708bb66ef2dd6358cf088f84ea58d4fe6889bc31276930bb5d8fb5538b5a25d621959cf197ce9cd9d27299df05109432197c32c2ff SHA512 4ed96d0608146e268d717709d7d00272b306ce78dc91d715d35d0901a545dd58873ff40f903b42d46362deeef6bdeb0c2a34225f7c3fb4798d352e54fdf8c344
+AUX protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch 883 BLAKE2B 94a9a2b41aca33be4439d7f1ad951d66126c42b04a36da0bcba40032377573ff6fc6cff6dd222b6921357ef1a4dffeee8131d124b3ce7f6322b6a8579eeeba97 SHA512 2641531a4c57f5a9f12f536a4a9418776f791062bab6802b19ab212c0dcc6dec3276ed94cbdbf73c2893fbcd4082df4740e09620a7e0db5f79ef4535dde88fb7
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
 DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 EBUILD protobuf-python-3.15.8.ebuild 1583 BLAKE2B 36534a314b41f1c7b78b7acd31d87ffb6bb070de1a6781b672fd810ffd4adf683819953ba042ce602875e1559fbb43ab707af32487efe81926b81b0bdb6e7bd0 SHA512 9f11bfbf328981faee297524d06c13233f59184919960f996627b9a668b8c2d9d12bfeb0091c848c8a77d80ee48483f61fd90b1e5c3b47aef9432c4b4907a405
 EBUILD protobuf-python-3.16.0.ebuild 1588 BLAKE2B f76b36f7e0fa22da7cd828502983f321c088dddd513004ca17b15984ebdba47745d079a727ece997881dbaaf072746e80adadbc594ae813ef52fe9e4610df085 SHA512 6377c4b561b6b7f3f74f4358c6f02509bfa5bac1be0092e4556f54a6309a9d7358b43f76cd6373c79ade95a45ee92abb5d29ff426955e607d57a516a3c79f076
 EBUILD protobuf-python-3.17.0.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
 EBUILD protobuf-python-3.17.1.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
 EBUILD protobuf-python-3.17.2.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
 EBUILD protobuf-python-3.17.3.ebuild 1590 BLAKE2B da38acf037037e66d3cf3617a7f0d1d0e1b098d687af56c0f5895b5652ac1b7de7f9f6d96c75badb55ce39836f2a269bcd347bd0f0070deaf14a412528507873 SHA512 be48b980da93dc834fdc965285ef8c6c3960f42ded9f3dc1eba3bedb0ac545d82f526a13dcb8cf4c1fd85bce5e405701cf039009094c7ffde4ce788c2f90bbda
+EBUILD protobuf-python-3.19.1.ebuild 1322 BLAKE2B 1448f242feecf4054c82e972c7aed5e752d0c744031b947ca221f5639f5455c38095a41c5fa4b7ec15e9e40426c5d9358270fd636af358672b2dff5fa7ef2d49 SHA512 81569aecb420a7077ed33b049637ea0cd8002b2543fa7328705812f2bb7ddf0b3018142b64765ee8c6f143b908fe194cbc8e03c7886b5c4c9e00f531a6f5d818
 EBUILD protobuf-python-9999.ebuild 1486 BLAKE2B b00aa33b34d853d471aebdd7309e0a5dd1ddc41bba146ae635ee1e04f3796e33bb3d7e8f0fc47d8b6ee9f09a3d4188cd8f694321d7dfcb161141de6ac9dbeba9 SHA512 73be848bb8795fd20785c4c4b08b41831dd892c34a76f58d5fad0fc42895486cbf76a9e2addebd78af6e303a15f70cebb8642f10745f97930480f1922a580715
 MISC metadata.xml 554 BLAKE2B 4925e8ba9bd7e444a719fbd4b126ba72f714ee3df0c51ede4791c95ef9bba32e8b1f5bca816adfe48c83cdc46f5c7f750737a16a74110c0e5d2eb345eb01effd SHA512 09182eaebbb02f7cb440ff6caeaf2bf273abd8feef6318184580be2b3c4e272d6de48d1316af2c9362376737b59e7e9131ef595284e1b2369caee5124ae56b15
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
new file mode 100644
index 000000000000..a03ad98b4550
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..17947082fe8d
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2008-2021 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
+}