[gentoo-commits] repo/gentoo:master commit in: dev-python/elasticsearch-curator/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     a336030c103bf663ecd519f01cd240162f1dbab2
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Feb 15 06:12:54 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 06:12:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a336030c

dev-python/elasticsearch-curator: version bump to 3.4.1

Package-Manager: portage-2.2.27

 dev-python/elasticsearch-curator/Manifest                 |  2 ++
 .../elasticsearch-curator-3.4.0.ebuild                    |  2 +-
 ...or-3.4.0.ebuild => elasticsearch-curator-3.4.1.ebuild} | 15 +++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index a6f3537..ed38cc8 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,2 +1,4 @@
 DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
+DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
 DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
+DIST elasticsearch-curator-3.4.1.tar.gz 91420 SHA256 38d3c576c1a714d3e4defd78c43d898908ac563aa93018afd47702b5ae1e01c1 SHA512 63cee7e7778cf9cc5484a5e2a5a7cb379c8ba84f194d44758bf6e7a468492c27f41dbf5df42d964c060761e61166d3eba056c59b4d44e0df6a75052c5f9b42d8 WHIRLPOOL 2aa54a725b5cf1b5db0e3a8b069bd9d0f6d791f7750311676d25bcb7fba233316d38980c68e2ad2bfd7ae7ea82cc69ccbc7746e40f95e6ce19562ed577e32228

diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
index 9d58368..9dbbb26 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
similarity index 86%
copy from dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
copy to dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
index 9d58368..3c1d8ab 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 MY_PN="curator"
-ES_VERSION="1.7.3"
+ES_VERSION="2.2.0"
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/elasticsearch-py-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-2.1.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/click-3.3[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]"
@@ -46,12 +46,15 @@ python_test() {
 	PID="${ES}/elasticsearch.pid"
 
 	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: elasticsearch/cluster.name: gentoo-es-curator-test/g" \
+	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/# cluster.name: my-application/cluster.name: gentoo-es-curator-test/g" \
 		${ES}/config/elasticsearch.yml
 
 	# Elasticsearch 1.6+ needs to set path.repo
-	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
+	grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
+	if [ $? -ne 0 ]; then
+		echo "path.repo: /" >> "${ES}/config/elasticsearch.yml"
+	fi
 
 	# start local instance of elasticsearch
 	${ES}/bin/elasticsearch -d -p ${PID}