commit:     7fb1874fe2cd8ee139132a5a883be5b9042dea8b
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Feb 14 13:27:47 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 21:54:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb1874f

dev-python/elasticsearch-py: improve ebuild

Bug: https://bugs.gentoo.org/643684
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-python/elasticsearch-py/Manifest               |  2 +-
 .../elasticsearch-py/elasticsearch-py-6.0.0.ebuild | 27 +++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dev-python/elasticsearch-py/Manifest 
b/dev-python/elasticsearch-py/Manifest
index bf5879f47fe..149a10b7517 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,6 +1,6 @@
 DIST elasticsearch-5.3.2.tar.gz 33704368 BLAKE2B 
861ca6b37ee71b2a7d3b988287df88620fc88ec6961267c440d1083feadadcf036832f41446135ecb1066c51c3ddd259934562de53b2dad69220a1e4962c3e7c
 SHA512 
430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00
 DIST elasticsearch-5.6.4.tar.gz 33776770 BLAKE2B 
c74df8a496c30be315abfd7d1a71f7f8eb75de1a64a7ddd22ff742bd547ec38d417c1ce4002ed6c90b2716837ee0425cf87c910d9f810999e837d118268dcd66
 SHA512 
37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47
-DIST elasticsearch-6.0.0.tar.gz 28017602 BLAKE2B 
cea47a17109eb5d46b1d94c3763f19923d97392c4a39a8dffb157b8ce60cf959e4680c2a54c5a9d204db64393f3f22dc52c0de94888753e817d808575ff352fd
 SHA512 
25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
+DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B 
a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2
 SHA512 
b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
 DIST elasticsearch-py-5.4.0.tar.gz 81286 BLAKE2B 
d15ef79ee9720b4ed67c5538c66301aba2c7a4baf9a48faef0153b76dbf780749975d664c8e9d52599077738e543d6c5113bde3748e86f239f1b92a272ea934f
 SHA512 
9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae
 DIST elasticsearch-py-5.5.1.tar.gz 83543 BLAKE2B 
067fbc15db359c7b58ee9b2a850ac6418415b90cd1847020a5f2379030e87e20bfdc7f90c6c062bf91fe89fa72b81385133dd03bed531fc3b03e4f7bb5ad9f97
 SHA512 
ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd
 DIST elasticsearch-py-6.0.0.tar.gz 83197 BLAKE2B 
5ca16c9b881fe6f8c4944e8eec69be0532fe472564b12dbaa40225b29b8a2b88974e35ed2ab733722023da3ed877a2934bb545387ffdcf307d519950a8971880
 SHA512 
1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild 
b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
index 3010af4f0e2..db922834ad2 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
@@ -4,17 +4,11 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="6.0.0"
+ES_VERSION="6.0.1"
 
 inherit distutils-r1
 
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
 MY_PN=${PN/-py/}
-
 DESCRIPTION="official Python low-level client for Elasticsearch"
 HOMEPAGE="https://github.com/elastic/elasticsearch-py";
 SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz
@@ -25,6 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
 RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
        <dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
 
@@ -40,6 +38,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                dev-python/nosexcover[${PYTHON_USEDEP}]
                virtual/jre:1.8 )"
 
+python_prepare_all() {
+       # 643684
+       sed -i -e /urllib3/d setup.py || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       emake -C docs -j1 man $(usex doc html "")
+}
+
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
 python_test() {
        ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
@@ -85,10 +94,6 @@ python_test() {
        pkill -F ${PID}
 }
 
-python_compile_all() {
-       emake -C docs -j1 man $(usex doc html "")
-}
-
 python_install_all() {
        use doc && HTML_DOCS=( docs/_build/html/. )
        use examples && dodoc -r example

Reply via email to