1 |
commit: 71599fbe47a9edd613229fe087088a71193ec60b |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 12 06:35:00 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 29 20:37:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71599fbe |
7 |
|
8 |
dev-python/elasticsearch-curator: bump to 4.0.6, drop old. |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2310 |
12 |
|
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
|
15 |
dev-python/elasticsearch-curator/Manifest | 6 +- |
16 |
.../elasticsearch-curator-3.5.1.ebuild | 105 --------------------- |
17 |
...5.ebuild => elasticsearch-curator-4.0.6.ebuild} | 2 +- |
18 |
3 files changed, 3 insertions(+), 110 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest |
21 |
index b589209..9255d64 100644 |
22 |
--- a/dev-python/elasticsearch-curator/Manifest |
23 |
+++ b/dev-python/elasticsearch-curator/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210 |
26 |
-DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095 |
27 |
-DIST elasticsearch-curator-3.5.1.tar.gz 93121 SHA256 3b578c1d8a88da22501a79346792288478f3191d75058e4c43d05fc261c9b874 SHA512 59ddc5feb575f626afcbce9c80b113827d9752bb4ba1bc8f7e7f110f8be661314dbf0421310cb07ce1b15c9d6dba2f181718befb5cfa93803ad5e63226ac9556 WHIRLPOOL 8b0529116cf735cb45872073a7668bdb94e0e61306bcbd6d3609a73616f75f74747847cbf8a860d5727fe3f475ab59c66f1382a04d543cdb3c22de4edfd068e2 |
28 |
-DIST elasticsearch-curator-4.0.5.tar.gz 110573 SHA256 84f9df5fb19e59e734b224cba35d7c48c6dbdbe6317d8274276f5ad81cfbfd12 SHA512 08270cd53510e4356e1f01bb27c9202dcf2ac7d66c9852c2bc5d93de7c701802f67bf0b0117d4a155b9a930a4842d021a08f85436007654a812e47a0de8d870d WHIRLPOOL a80fdbdd30d82d1b189eba97e07779a6c632f58a5d242aef8fc3a450be0c93c64ec02651793fea8475936934f6ea8ed227d18c22f32e9a9d7d5e8506e9c2679e |
29 |
+DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47 |
30 |
+DIST elasticsearch-curator-4.0.6.tar.gz 110804 SHA256 e60f671dfa003f45f68320599cb15cee38cc61cb25899d903c2b29f2e3892e09 SHA512 b52af17d7d58bb9599095a00d03e5fda6bc7d9b401d100379f2a6969e5f995367192f33c045251518345abd86f2b143b1b086aab2c165d7e66efccb02dab8698 WHIRLPOOL 7621d883d59202882f455393ca7a87b39292667890dd2c5e3841ffb8a62e823d775794173a0205b02da24b7016509759c302bfabee5fc77a8000c961f853466f |
31 |
|
32 |
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.5.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.5.1.ebuild |
33 |
deleted file mode 100644 |
34 |
index 13d4cb2..00000000 |
35 |
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.5.1.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,105 +0,0 @@ |
38 |
-# Copyright 1999-2016 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Id$ |
41 |
- |
42 |
-EAPI=6 |
43 |
- |
44 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
45 |
- |
46 |
-MY_PN="curator" |
47 |
-ES_VERSION="2.2.1" |
48 |
- |
49 |
-inherit distutils-r1 |
50 |
- |
51 |
-DESCRIPTION="Tending time-series indices in Elasticsearch" |
52 |
-HOMEPAGE="https://github.com/elasticsearch/curator" |
53 |
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
54 |
- test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )" |
55 |
- |
56 |
-LICENSE="Apache-2.0" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~amd64 ~x86" |
59 |
-IUSE="doc test" |
60 |
- |
61 |
-RDEPEND=" |
62 |
- >=dev-python/elasticsearch-py-2.3.0[${PYTHON_USEDEP}] |
63 |
- <dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}] |
64 |
- >=dev-python/click-3.3[${PYTHON_USEDEP}] |
65 |
- dev-python/certifi[${PYTHON_USEDEP}] |
66 |
- >=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]" |
67 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
68 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
69 |
- test? ( ${RDEPEND} |
70 |
- || ( virtual/jre:1.8 virtual/jre:1.7 ) |
71 |
- ~dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
72 |
- dev-python/nose[${PYTHON_USEDEP}] |
73 |
- dev-python/coverage[${PYTHON_USEDEP}] |
74 |
- dev-python/nosexcover[${PYTHON_USEDEP}] |
75 |
- dev-python/six[${PYTHON_USEDEP}] )" |
76 |
- |
77 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
78 |
- |
79 |
-python_test() { |
80 |
- ES="${WORKDIR}/elasticsearch-${ES_VERSION}" |
81 |
- ES_PORT="25123" |
82 |
- ES_LOG="${ES}/logs/elasticsearch.log" |
83 |
- PID="${ES}/elasticsearch.pid" |
84 |
- |
85 |
- # run Elasticsearch instance on custom port |
86 |
- sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \ |
87 |
- s/# cluster.name: my-application/cluster.name: gentoo-es-curator-test/g" \ |
88 |
- ${ES}/config/elasticsearch.yml |
89 |
- |
90 |
- # Elasticsearch 1.6+ needs to set path.repo |
91 |
- grep -q "^path.repo" "${ES}/config/elasticsearch.yml" |
92 |
- if [ $? -ne 0 ]; then |
93 |
- echo "path.repo: /" >> "${ES}/config/elasticsearch.yml" |
94 |
- fi |
95 |
- |
96 |
- # start local instance of elasticsearch |
97 |
- ${ES}/bin/elasticsearch -d -p ${PID} |
98 |
- |
99 |
- for i in {1..10}; do |
100 |
- grep -q "started" ${ES_LOG} 2> /dev/null |
101 |
- if [ $? -eq 0 ]; then |
102 |
- einfo "Elasticsearch started" |
103 |
- eend 0 |
104 |
- break |
105 |
- elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then |
106 |
- eend 1 |
107 |
- eerror "Elasticsearch already running" |
108 |
- die "Cannot start Elasticsearch for tests" |
109 |
- else |
110 |
- einfo "Waiting for Elasticsearch" |
111 |
- eend 1 |
112 |
- sleep 2 |
113 |
- continue |
114 |
- fi |
115 |
- done |
116 |
- |
117 |
- export TEST_ES_SERVER="localhost:${ES_PORT}" |
118 |
- esetup.py test |
119 |
- |
120 |
- pkill -F ${PID} |
121 |
-} |
122 |
- |
123 |
-python_compile_all() { |
124 |
- cd docs || die |
125 |
- emake man $(usex doc html "") |
126 |
-} |
127 |
- |
128 |
-python_install_all() { |
129 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
130 |
- doman docs/_build/man/* |
131 |
- distutils-r1_python_install_all |
132 |
-} |
133 |
- |
134 |
-pkg_postinst() { |
135 |
- ewarn "" |
136 |
- ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/" |
137 |
- ewarn "" |
138 |
- ewarn "Example usage on Python 3:" |
139 |
- ewarn "export LC_ALL=en_US.UTF-8" |
140 |
- ewarn "export LANG=en_US.UTF-8" |
141 |
- ewarn "curator ..." |
142 |
-} |
143 |
|
144 |
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.6.ebuild |
145 |
similarity index 99% |
146 |
rename from dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild |
147 |
rename to dev-python/elasticsearch-curator/elasticsearch-curator-4.0.6.ebuild |
148 |
index 184e627..4f9ddae 100644 |
149 |
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild |
150 |
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.6.ebuild |
151 |
@@ -7,7 +7,7 @@ EAPI=6 |
152 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
153 |
|
154 |
MY_PN="curator" |
155 |
-ES_VERSION="2.3.5" |
156 |
+ES_VERSION="2.4.0" |
157 |
|
158 |
inherit distutils-r1 |