gentoo resync : 28.04.2019

9 files changed, 50 insertions, 301 deletions

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 11209f95b684..39b423d24a8a 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,17 +1,7 @@
 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.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
-DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-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.1.ebuild 1404 BLAKE2B eef41482d661ba0138c8f018d4f7842c2e3af4d6828eb5d2bdff239d1f4a6c0059ee0fc389ee7b31b0d111afbb9772e5f3e88a990545d480780018e4e7530d48 SHA512 4634e1f3d5245f074072060b49138317bba1921d6bd3605cd2cb28cecde99a4eb200da73a7d0045693551863b5265761ffeea825c5475028530fd9db95e02f79
-EBUILD protobuf-python-3.6.1.2.ebuild 1349 BLAKE2B 9b958bd64c4fe14ba9966fc05aac9febf4d10a24e0961df49309bbf9c92fb763a2a0d56ca57e965793f40c8058e7ac8697157e67563af0544666044bc31dce9d SHA512 d1bae7a3ea3b4571d06d4071e2179a2dc47ab32c9d2f24c6abbd029d4b83c5eb310f7b5c7da19b12c71beb9f63f667d0fb078634a9264b28e696e4e90c4ced56
-EBUILD protobuf-python-3.6.1.3.ebuild 1342 BLAKE2B 6873ba7a8413806b41cbad820f2afbc98b1367c9ab9270ac18184e645000409db0d17aab187e5b8823229140fc25d8ae7050b3d7434704a2750cf41292d6fbf7 SHA512 58597b5ef71b48b513cec7f661a7cdb0c43e01b073dbb6c7d883a817438e5a77f7e71aa4c8192f2e4308003293e759af396a328deb7c40233fd6931da49127af
-EBUILD protobuf-python-3.6.1.ebuild 1397 BLAKE2B b620084c9edb501efde568755fa561c14a50485c628228dbf8541e9302471c6acafa77e69f9c7e12e8bb3d00e3f93eb0ab8a23bad7dbae9546ae22676cdad5b9 SHA512 958f35f2291a205375f2b4070efa392b9c632b3cee158f3dbb677dfcffdca540052714a221fb17e0ba6201a2e78b1242278c69fe32b5cd38bd7a2dcd8c3cda97
+DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
+EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
+EBUILD protobuf-python-3.7.1.ebuild 1556 BLAKE2B cc11df35d664fc462ff7a2ae69cc866c1986a436a052980854728a4ea64d6ae56c236759ac2ba32706e6a87365907817073d7fce6293880cc25b1952cf5823a7 SHA512 d72b4b109e9f0efe5c9db30ecf12ef9f513d12dd79d1d88562c0d62f6b20d26396659c41d1dafaec6a66553957a0e2a33d29a70abf34759f92d3f87660355954
+EBUILD protobuf-python-9999.ebuild 1439 BLAKE2B 9b9830628b43c2f3b3bfd4fca0b355d73cc422d98d3a76f3b2bdd3fcec227b788ac395522a336522bbae8e3a3355ec97f22871a90adc078e01cc490524b1a359 SHA512 2ffe9263ce8d05fbf291622627030f40c0799dc724f53a0e466e832cbe61d6513903ddbb0a14157f4c4dd2ccb6947caac5fa3aeec75eda29d54bb6b3c8efa572
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
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
deleted file mode 100644
index bd4ce9d7fcaf..000000000000
--- a/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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<char*>(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<char*>(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<char*>(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<char*>(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<char*>(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<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
-   if (!field_name) {
-     return NULL;
-   }
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
deleted file mode 100644
index 4dfa6381d438..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-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}]
-	!<dev-libs/protobuf-3[python(-)]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
deleted file mode 100644
index 7a1fc1c5c3cc..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-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}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-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)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
deleted file mode 100644
index d625650122cb..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-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}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_prepare_all() {
-	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
index 505c7345a6b4..10d28b57c1b2 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 inherit distutils-r1
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
deleted file mode 100644
index 0bc1554dbcba..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-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}]"
-RDEPEND="${DEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_prepare_all() {
-	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
-	eapply -p2 "${FILESDIR}/${PN}-3.6.1-python-3.7.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
index 519a54dffe30..7b3d970ead20 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
@@ -1,35 +1,46 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 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"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+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/17"
+SLOT="0/18"
 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}
+BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
 	!<dev-libs/protobuf-3[python(-)]"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
-python_prepare_all() {
-	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
-	eapply -p2 "${FILESDIR}/${PN}-3.6.1-python-3.7.patch"
-	distutils-r1_python_prepare_all
-}
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
 
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.2.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index e6f11fbf5349..5eed49d3f29a 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -1,34 +1,46 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 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"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+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/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/18"
+KEYWORDS=""
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
 	!<dev-libs/protobuf-3[python(-)]"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
-python_prepare_all() {
-	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
-	distutils-r1_python_prepare_all
-}
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
 
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)