gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'github/pr/857'.

Browse Source
This commit is contained in:
Patrice Clement
2016-02-15 13:05:31 +00:00
parent 01edaaa3a0 a336030c10
commit 17b06b864b
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-python/elasticsearch-curator/Manifest
+2 -2
View File
@@ -1,4 +1,4 @@
DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
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
dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
+1 -1
View File
@@ -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$
dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild → dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
+11 -8
View File
@@ -1,13 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
MY_PN="curator"
ES_VERSION="1.7.1"
ES_VERSION="2.2.0"
inherit distutils-r1
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="
>=dev-python/elasticsearch-py-1.6.0[${PYTHON_USEDEP}]
<dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]
>=dev-python/elasticsearch-py-1.8.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}