diff options
Diffstat (limited to 'dev-python/protobuf-python')
| -rw-r--r-- | dev-python/protobuf-python/Manifest | 7 | ||||
| -rw-r--r-- | dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch | 26 | ||||
| -rw-r--r-- | dev-python/protobuf-python/protobuf-python-3.10.1.ebuild (renamed from dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild) | 34 | ||||
| -rw-r--r-- | dev-python/protobuf-python/protobuf-python-9999.ebuild | 4 |
4 files changed, 28 insertions, 43 deletions
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index f58b1ef4f462..e47749a51bd1 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,13 +1,12 @@ -AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 895 BLAKE2B de1850bb816a6776876a50c19200f757f9610cbfe9263ce2ffa05d33d44ed765f00b7510c57e763c008af34a260530dd4fd21ccc12b19ef531859f2195fd4eb2 SHA512 1b22d0df90bc602469a59f5ef82f8bbe96c164b7ad3c53ef1a7ba9ee97d8334b4e5c9fe7d57cfe2b1edad85d58f4a89095c8eeac370d6bd043c0d8561e00149d -DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e +DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec -EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8 +EBUILD protobuf-python-3.10.1.ebuild 1536 BLAKE2B af636a141c5a60deb002c8ec784a9195ca8c524d0035aee87900fb51559da2230a5869d91d1ff666b005aa841727d85aa38e30f113f9fb1a0e379974d5242322 SHA512 05ac228c4eb805a199ee729bde86c96ecf692da550c55b0fa2642c57c018051fe2d36f1bfd5dc690f28ae2c2b1780f354bb1206a8e3c65ae1074062adb6b49a3 EBUILD protobuf-python-3.7.1.ebuild 1581 BLAKE2B 0a1956a1e5168382d5db661b7ccce17f164ac5f34d5746b54f17c94b935d7f6566731440e5d7a560ff4f03314b55f85f65dd9b8b9adb5965cb8799879ccec151 SHA512 6724d4732e02042369ccf2e662964be6493caf34dd166ae58d9afb9dcf5117e425c8f22134357d0b3b72b8e9dfac65837db31f6c317e92eae3517622e3ffb520 EBUILD protobuf-python-3.8.0.ebuild 1525 BLAKE2B 5cf0572a7cd975ef21ff50b0f126a5467d9245301f3d47151c36069062b4f15f4fc74f8a7305798d72eba317804d14926b43d85921fd608e41806afc3260df40 SHA512 0183cf00fbfb384a16b956a709c9b432e2dec7097c8c4ab1e3ddeb0dcdff0a1d8a2ee6c50a0b2d662267f7c8bfdaab22da6ad7dc5c115dcb60e5072de8211d02 EBUILD protobuf-python-3.9.1.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4 EBUILD protobuf-python-3.9.2.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4 -EBUILD protobuf-python-9999.ebuild 1415 BLAKE2B c577cc237dac1c677d71c76092b27bd84fc76a76837a473acae7d28fb654b9a93e7e27b0627f2881261eed98b582fb26f60fb419a56a57a17ab263331f76b4ca SHA512 b9d31f7c5b2ce01d3a019581548de3d19758a9609bc40d8d9d64a5234fdcfd475b80e07f573b21c8aa224c599227153ac8944b91e21cbca6230aa7dafb99c7f7 +EBUILD protobuf-python-9999.ebuild 1419 BLAKE2B 681f5aaa9fc78f2079d01f2a9671eff8d8f5ffa2682c632445af69a4ea16a17103e0fb1e33c80e94cf7ae6b36d2c3a30b4003d4209ac0a82a5e1b7f185b3907c SHA512 119b49010f3957f048da167d7825892d2b334519608ed325d7c68d2dc76fcb955c6247d1e43a6ce85e63f8c104b8452fbbf79198c37972ae158e301707bd58c2 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890 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 deleted file mode 100644 index c29da40ca261..000000000000 --- a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/protocolbuffers/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.6.1.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild index 10d28b57c1b2..a6af9c20ffce 100644 --- a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild @@ -2,33 +2,45 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7}) +PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7,3_8}) 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/21" +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" - distutils-r1_python_prepare_all -} +if [[ "${PV}" == "9999" ]]; then + EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" +fi python_configure_all() { mydistutilsargs=(--cpp_implementation) @@ -46,5 +58,5 @@ python_test() { python_install_all() { distutils-r1_python_install_all - find "${D}" -name "*.pth" -delete || die + find "${D}" -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 ddea99c14f00..9e9d34cbcc8a 100644 --- a/dev-python/protobuf-python/protobuf-python-9999.ebuild +++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7}) +PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7,3_8}) inherit distutils-r1 @@ -22,7 +22,7 @@ else fi LICENSE="BSD" -SLOT="0/21" +SLOT="0/22" KEYWORDS="" IUSE="" |