From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- dev-python/protobuf-python/Manifest | 15 +++-- ...oogle.protobuf.pyext._message.MessageMeta.patch | 2 +- .../files/protobuf-python-3.6.1-python-3.7.patch | 67 ++++++++++++++++++++++ dev-python/protobuf-python/metadata.xml | 2 +- .../protobuf-python/protobuf-python-3.4.1.ebuild | 46 --------------- .../protobuf-python/protobuf-python-3.5.1.1.ebuild | 6 +- .../protobuf-python-3.5.2-r1.ebuild | 6 +- .../protobuf-python/protobuf-python-3.6.0.1.ebuild | 6 +- .../protobuf-python/protobuf-python-3.6.1.ebuild | 9 +-- 9 files changed, 90 insertions(+), 69 deletions(-) create mode 100644 dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch delete mode 100644 dev-python/protobuf-python/protobuf-python-3.4.1.ebuild (limited to 'dev-python/protobuf-python') diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index 42a905ace56d..af262dfe9bb1 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,12 +1,11 @@ -AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 886 BLAKE2B 6b629df5af163ad7e5e835ac7d8ea66401d73297e1ffcf1372b6bdc7285efc1e36cde551381e7b3869a4efb0ec1c07a1a019e86cd477dbf24a25e06545dc401e SHA512 da18027859541cca833a8eed311d4da143be5663544bbf64d24a66fc5ba2db06fedb7110e3bd925736029bfe449e170a4aa904ecdc98eb1b7e269d9f5fd4ef04 -DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 +AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 895 BLAKE2B de1850bb816a6776876a50c19200f757f9610cbfe9263ce2ffa05d33d44ed765f00b7510c57e763c008af34a260530dd4fd21ccc12b19ef531859f2195fd4eb2 SHA512 1b22d0df90bc602469a59f5ef82f8bbe96c164b7ad3c53ef1a7ba9ee97d8334b4e5c9fe7d57cfe2b1edad85d58f4a89095c8eeac370d6bd043c0d8561e00149d +AUX protobuf-python-3.6.1-python-3.7.patch 2737 BLAKE2B 46feb8144761db8a089ad2e32ed0a906a4151cad62d13c0a541fc321a3affd70f672c61a32b84d4118e1a9ff7ea5562368b17d89d7681d72a24ce5cb97745949 SHA512 8fe0770f11f20b9cde72b5f862ab77ebcdc0f337886ba458fbc2543896ce6b3f659b68e2550040da246260638c5eb918ade535bf7a1b6db61a6da39232cb4de7 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 -EBUILD protobuf-python-3.4.1.ebuild 1239 BLAKE2B 409fb45bd792c7c47b17388b2dc7315863c8545da671d73acb84de9c1188f12627eab1fb2c90989bd53a939792ee2b787c2088553e979ecc2f3a855f0d01f991 SHA512 039c747447eee20a1eb47a1383838086f911622036372bf051a806ed5ea55c3d5c5f58c97f1d2dc8b91c0929f56725c8942ca18274cec1a5fb7e11212a23211a -EBUILD protobuf-python-3.5.1.1.ebuild 1232 BLAKE2B 09e1116ab940cf48856c8f86b2a67c8b827c39048641f9cb8a574e945b6b0b13d4db4fee9d65235d474e268750a2b29dfced129067043f0cba35310a40a96127 SHA512 16abc5f227c8456e06ec5452b66d09d6e7f2e119fe73da5827c60a30c0430b69521305db230b0343d11fcace74b4b6cf070a385cbf4bb5700324db27c7fb1d5d -EBUILD protobuf-python-3.5.2-r1.ebuild 1318 BLAKE2B 0c7e8e8d5be76455a8fadb435c29c0685c83ce3e21a29b4c3f25ecf2045b0c6815ba0098051bc470b51c3c2f9b30cdbdd09c0d8f90d6461727a2272011b28242 SHA512 ac44356bef6a3f3faf84ba334a4c07672a8331a7c68edf42fbc44f016a07215b9aabbd1a273d12f58eeee57a01940eb8f96fba4f0327a9dc4134530a7ccfd466 -EBUILD protobuf-python-3.6.0.1.ebuild 1330 BLAKE2B 740647b8311b43aacb89129795fd9a6250c4eeb6c26d6958f8660c78eabc37c9c6b7622eb2a67dfa20043704eba0369934cd26bb7f592020f09bdbd78b126c13 SHA512 d14066231992885cf95aca6c7270d18bcb39f22b7eea31bab9fee19ddca620e91cb8d65459a055e85022376ee44c9800371338bf5ba7fc78eeddc1e62aa8e08e -EBUILD protobuf-python-3.6.1.ebuild 1330 BLAKE2B f344dfa24be2f4ac134101f3b99a0b89dbf7ec2bf0d4b1b4fa3ff37af70c0526583b102cde86d997a7608dc855909c9636357dbf2655571027da2b43e9200f20 SHA512 ec52fe01e28bcfd5b052251687df8bf98706133469eddf7d920026fd10449889a8551c787856cc3c630d8041e4aa5e08ccaf90d9e847d4409ddccbc4cc06e4c9 -MISC metadata.xml 647 BLAKE2B a24942cbab04e847c0921371c22ac14ffe05b99c5a75ce99f8413e3c98e0ee5951e03b59faae740bdc0fda56e53ad36ab609fa9e4b19a6975725b4e9bf562d38 SHA512 064197fbb9f4857393236d4b4633aa389df5ebb6ab75c59552adbf80157feb20b3e2b2e5f526002652b12ea5033ea50c9db0ec02804a747fa4305505c715a87e +EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B f7566fc24019d971eb0895f5f5dab2f86688e868d86fea4acb211d5d5f48b843b995dbae96c1eba17044db12c83b50ea402b546351a991960f383f79cc4a1153 SHA512 6d96b5827e4a569d60506570bcfa38796b7e240c85db8aaae215f79841968d13df63eebfed451f1aea8f9412267ea491eca64b776034044a64711951deb4b390 +EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac251f54c53d410682e94369b3a2ab62d084bdf6d1a8627c11096dbedcea565d157d96d428f447035766105b7affa1bc5e23a46 SHA512 b84fca10588e8faac8c4bc95e50d7a39a67e919e0c4a28c751f8dba9a7b421435a0b2df77d5989862d4d63441a4625af3b75b6ef59814f3d41d5da2906ea6eb4 +EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281 +EBUILD protobuf-python-3.6.1.ebuild 1404 BLAKE2B 4a860891db48d64b9527a508ee07341e75611d6b61b8a6f2fa6d0d77271eb60937796d9bbac8183a0b25b1e416b2498ea71d52a31e793d7c5f76890167ac50fc SHA512 3f66a54d7a3454cfcb0ea891f0b3def6497d7bf1f3bf620be53ed3f52d1110857c6cb0a2d25be6a62a37e67194e7b9b65232352abdbf9b1ce71b51e8a0b7dd65 +MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd diff --git a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch index d1e1d745ab7c..c29da40ca261 100644 --- a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch +++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch @@ -1,4 +1,4 @@ -https://github.com/google/protobuf/pull/4365 +https://github.com/protocolbuffers/protobuf/pull/4365 --- /python/google/protobuf/pyext/message.cc +++ /python/google/protobuf/pyext/message.cc diff --git a/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch new file mode 100644 index 000000000000..bd4ce9d7fcaf --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch @@ -0,0 +1,67 @@ +https://github.com/protocolbuffers/protobuf/pull/4862 +https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7 + +--- /python/google/protobuf/pyext/descriptor.cc ++++ /python/google/protobuf/pyext/descriptor.cc +@@ -56,7 +56,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/descriptor_containers.cc ++++ /python/google/protobuf/pyext/descriptor_containers.cc +@@ -66,7 +66,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/descriptor_pool.cc ++++ /python/google/protobuf/pyext/descriptor_pool.cc +@@ -48,7 +48,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/extension_dict.cc ++++ /python/google/protobuf/pyext/extension_dict.cc +@@ -53,7 +53,7 @@ + #endif + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + +--- /python/google/protobuf/pyext/message.cc ++++ /python/google/protobuf/pyext/message.cc +@@ -79,7 +79,7 @@ + (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob)) + #define PyString_AsStringAndSize(ob, charpp, sizep) \ + (PyUnicode_Check(ob)? \ +- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ ++ ((*(charpp) = const_cast(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ + PyBytes_AsStringAndSize(ob, (charpp), (sizep))) + #endif + #endif +@@ -1529,7 +1529,7 @@ + return NULL; + } + #else +- field_name = PyUnicode_AsUTF8AndSize(arg, &size); ++ field_name = const_cast(PyUnicode_AsUTF8AndSize(arg, &size)); + if (!field_name) { + return NULL; + } diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml index 51258826e2f9..0b20fcb3732e 100644 --- a/dev-python/protobuf-python/metadata.xml +++ b/dev-python/protobuf-python/metadata.xml @@ -17,6 +17,6 @@ Soname version number of Protobuf - google/protobuf + protocolbuffers/protobuf diff --git a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild deleted file mode 100644 index 53518134445d..000000000000 --- a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -# pypy fails tests; pypy3 fails even running tests -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Google's Protocol Buffers - Python bindings" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf" -SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/14" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -DEPEND="${PYTHON_DEPS} - ~dev-libs/protobuf-${PV} - dev-python/namespace-google[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - !