dev-python/elasticsearch-curator: bump to 4.3.1/5.0.4, drop old

Closes: https://github.com/gentoo/gentoo/pull/4748

3 files changed, 34 insertions, 33 deletions

diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 1c7dfe72de3a..1985c43e9b07 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,5 +1,5 @@
-DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
 DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
-DIST elasticsearch-curator-4.1.2.tar.gz 130194 SHA256 f4ccc0d49790e0f9390982cc2f0c69ad385361e7840050b6ecba4ef70fa64a0d SHA512 4a465c03baea6b708ce38bbaea8c94a288f91db39fba253a3123af68bce94b1253d22f0d9214fc449a97d55ad468f7f78bf14993c0f5cf18fcf91ebbe1ec57cb WHIRLPOOL 73f8b59f08a6746468336aaac9217a4e37ee15e0deeaf9711d7af79585dfe4e18402d6dceb3feafbafec3e2609dbcc7df983555529640e046336e0bb7421f0d3
-DIST elasticsearch-curator-4.2.5.tar.gz 227607 SHA256 1a4869fcdbae062dd9777fece8265d5a493dc0e617f152b118955001604de7b8 SHA512 c43b45174098a33e68fedfd298c8377bf7541dafe4d6293311775325fd8ac3152f43fa0ea5beb1f8b459a3d0998167b2232564b2e11df6e1cff28afe0abc3dfc WHIRLPOOL f5176bfab80a8e7f05daf8634a6be984dcf4420615be773d58c74aa3060cb4b7c8052376653c28be7c2c6276251cc296929c35d4537aac46d600d7a0574a10c0
+DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a
 DIST elasticsearch-curator-4.2.6.tar.gz 228342 SHA256 bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512 e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64 WHIRLPOOL 63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
+DIST elasticsearch-curator-4.3.1.tar.gz 232546 SHA256 93601c39ec9acf05b9dca1ba58357af32c468d7429ea2f7be37d1b4045eb3b08 SHA512 24bfbcff4a5f3b7f2dbbda147eee79e74eec29187e4bb4d97475bca1a25e127570323ae00e03511ee6c1ea797973fc11b3bee25ffd2089fa0c7ae626f66a6153 WHIRLPOOL c3a548de20903139f10e51f0c273f4c028d7e54e862db442be65025d7d8b623ba93b6a575b3f5eeb174e8a1aa06c4269f24cf3bad7f134b506b00ba2fdf2d766
+DIST elasticsearch-curator-5.0.4.tar.gz 264754 SHA256 109aa8ba12ed68b5e9121138cbbdbae2f58eef5fd310099e3b8843ca5cc1cfc9 SHA512 79392a91e1bcbac79c40b75f782a1d57f7e24c849e4e7b302a47f5bcc84e9f656b30c64aa6eb51da9f92e6e021862411beb345da88248288b28c95d751d757cf WHIRLPOOL 0f881013053458804694f1d8e00052566a41af2905d7cddd2b2a2bb4fb6c27cab77e66f85f0c9fa7f6261399b41273072ce1b8d116d706a7bd53bb4b37639fd2
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.5.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.3.1.ebuild
index ad1dbd6898fc..558a65155b86 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.5.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.3.1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 MY_PN="curator"
-ES_VERSION="5.1.2"
+ES_VERSION="5.3.2"
 
 inherit distutils-r1
 
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/elasticsearch-py-2.4.0[${PYTHON_USEDEP}]
 	<dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -92,7 +92,7 @@ python_prepare_all() {
 	# remove test TestCLIFixFor687 as it is only to be run on older versions
 	# and the call to curator.get_version(global_client) sometimes
 	# fails with Connection refused
-	sed -e '122,205d' -i test/integration/test_delete_indices.py || die
+	sed -e '137,255d' -i test/integration/test_delete_indices.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.0.4.ebuild
index 97429d6d7b94..6c17f27fdd40 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.0.4.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 MY_PN="curator"
-ES_VERSION="2.4.0"
+ES_VERSION="5.3.2"
 
 inherit distutils-r1
 
 DESCRIPTION="Tending time-series indices in Elasticsearch"
 HOMEPAGE="https://github.com/elasticsearch/curator"
 SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,17 +21,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/elasticsearch-py-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	dev-python/voluptuous[${PYTHON_USEDEP}]"
+	>=dev-python/elasticsearch-py-5.3.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
-		|| ( virtual/jre:1.8 virtual/jre:1.7 )
+		virtual/jre:1.8
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -40,31 +40,29 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
 	ES_PORT="25123"
-	ES_LOG="${ES}/logs/elasticsearch.log"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
 	PID="${ES}/elasticsearch.pid"
 
 	# run Elasticsearch instance on custom port
-	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 || die
-
-	# Elasticsearch 1.6+ needs to set path.repo
-	grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
-	if [ $? -ne 0 ]; then
-		echo "path.repo: /" >> "${ES}/config/elasticsearch.yml" || die
-	fi
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
 
 	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID} || die
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
 
 	local i
-	for i in {1..10}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [ $? -eq 0 ]; then
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
+			es_started=1
 			eend 0
 			break
 		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
@@ -79,8 +77,10 @@ python_test() {
 		fi
 	done
 
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test
+	esetup.py test || die
 
 	pkill -F ${PID}
 }
@@ -88,6 +88,7 @@ python_test() {
 python_prepare_all() {
 	# avoid downloading from net
 	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
 	distutils-r1_python_prepare_all
 }