gentoo resync : 28.04.2018

5 files changed, 33 insertions, 76 deletions

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index c2413b258885..984b5baa46d3 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,10 +1,8 @@
-AUX protobuf-python-3.0.0_beta3-link-against-installed-lib.patch 1327 BLAKE2B 0988f266c7eaf97a85f318bd7fbeeb6a95d50f161732a10f041306594906985aec3a71d828b830a76c597e7412a0428d24cb67bb2da2fac0b3c90e38dd7d7ae0 SHA512 0d4d79c403327110ed16f47e64027c10d476a75a1b267f513777064151019074fec772e65ee24db2e93b3e169f343f59dc03fe68bd8a3dc299379b615204fa89
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
+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
 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
-EBUILD protobuf-python-3.1.0.ebuild 1299 BLAKE2B bd2effe2b42ca7613e7b205ba330a5bcd4aa2834486884d481d5c85e81d1d6d119090a5f215a97d5539a4277b8eb6513128a76533de30104c3592d0f3e8c9543 SHA512 762debb1a599e1fd75f61d17cac6afcd3813b56c543cca50c4a6c63b44c962f9aca3cda7a02b94de2bc21a130245eda91a346d2631c508aba15575347e33bfe8
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
 EBUILD protobuf-python-3.5.1.1.ebuild 1243 BLAKE2B f5ede3256ff9071cd86b5a6780c80d5ceec5950a9d315a55eaf6d72c066128f1faacfe98081cbc238a770b5ca45624d8ace5c492ed4c3f70b004bc66b643de15 SHA512 6f489d407300a5a3611dc3ec9e2622c91fb97e3cdec7c790601e9d1c2f2f103eb1919d43c4a50cc2a4e6534146f3c519cfa62d3194922509b4b33b38480ba8d8
-EBUILD protobuf-python-3.5.2.ebuild 1197 BLAKE2B 7a72898429e1047b085f667d27f0606da06e9cce4b73c90a23c1ecc4fb066cdd046eb36cb6a9145d7edf75ebe56a145ff8293c1a47869f910756e7ed31e85e2d SHA512 20710421607f45a9c4fcf3088aab18d55764af2ec7d4bbef181faee1661a77b0d368c086e726130a21e197501907a7cd8539e9d237c44d9a04261b34ac047451
+EBUILD protobuf-python-3.5.2-r1.ebuild 1336 BLAKE2B 893f494e7b3ac77e312b22bdf1e225c7a6e274eccf717acb43d6b964f332344d645410a6d410bdd30408d06b4fb2d288e3118e06d77c16c918d42d1aafb4841b SHA512 0a73954e3eeacfd7e9bd47f833b0c6e40b1c26ad1e5ff0e053f12f4330aed8cec9652173d59b7841b268331bf13d4619ca0fdb3369c94581facdaa52f6ede530
 MISC metadata.xml 647 BLAKE2B a24942cbab04e847c0921371c22ac14ffe05b99c5a75ce99f8413e3c98e0ee5951e03b59faae740bdc0fda56e53ad36ab609fa9e4b19a6975725b4e9bf562d38 SHA512 064197fbb9f4857393236d4b4633aa389df5ebb6ab75c59552adbf80157feb20b3e2b2e5f526002652b12ea5033ea50c9db0ec02804a747fa4305505c715a87e
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
deleted file mode 100644
index c0b7aadcd6f5..000000000000
--- a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur python/setup.py python/setup.py
---- python/setup.py 2015-12-30 22:21:46.000000000 +0100
-+++ python/setup.py 2016-04-18 00:51:49.490809789 +0200
-@@ -190,15 +190,27 @@
-       extra_compile_args.append('-Werror')
-       sys.argv.remove(warnings_as_errors)
- 
-+    inclD = ['.', '../src']
-+    libD = []
-+    try:
-+        subprocess.check_call(['pkg-config', '--exists', 'protobuf'])
-+        inclD += subprocess.check_output(['pkg-config','--variable=includedir','protobuf']).decode().split()
-+        libD = subprocess.check_output(['pkg-config','--variable=libdir','protobuf']).decode().split()
-+    except OSError as osex:
-+        if osex.errno == errno.ENOENT:
-+            info('pkg-config not found')
-+        else:
-+            warn("Running pkg-config failed - %s." % osex)
-+            libD = ['../src/.libs']
-     # C++ implementation extension
-     ext_module_list.extend([
-         Extension(
-             "google.protobuf.pyext._message",
-             glob.glob('google/protobuf/pyext/*.cc'),
--            include_dirs=[".", "../src"],
-+            include_dirs=inclD,
-             libraries=libraries,
-             extra_objects=extra_objects,
--            library_dirs=['../src/.libs'],
-+            library_dirs=libD,
-             extra_compile_args=extra_compile_args,
-         ),
-         Extension(
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
new file mode 100644
index 000000000000..d1e1d745ab7c
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
@@ -0,0 +1,26 @@
+https://github.com/google/protobuf/pull/4365
+
+--- /python/google/protobuf/pyext/message.cc
++++ /python/google/protobuf/pyext/message.cc
+@@ -402,12 +402,6 @@
+   return result.release();
+ }
+ 
+-static PyGetSetDef Getters[] = {
+-  {"_extensions_by_name", (getter)GetExtensionsByName, NULL},
+-  {"_extensions_by_number", (getter)GetExtensionsByNumber, NULL},
+-  {NULL}
+-};
+-
+ }  // namespace message_meta
+ 
+ PyTypeObject CMessageClass_Type = {
+@@ -440,7 +434,7 @@
+   0,                                   // tp_iternext
+   0,                                   // tp_methods
+   0,                                   // tp_members
+-  message_meta::Getters,               // tp_getset
++  0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
diff --git a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
deleted file mode 100644
index c0b3867674b9..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
+++ /dev/null
@@ -1,39 +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 python3_5 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Python bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# In case of using the (linked) cpp implementation we should be fine with the same subslot.
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/protobuf-3[python(-)]"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/protobuf-3
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
-
-S="${WORKDIR}/protobuf-${MY_PV}/python"
-python_test() {
-	distutils_install_for_testing
-	esetup.py test
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
index aaf563b424f3..db40a5b37f8b 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
@@ -25,6 +25,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
+python_prepare_all() {
+	eapply -p2 "${FILESDIR}/${P}-google.protobuf.pyext._message.MessageMeta.patch"
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }