commit: 09492c79f18d545db8364a103c5f573c7b7fe384
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 22:07:36 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 18 22:25:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09492c79
dev-python/elasticsearch-curator: [QA] Revert "Bump, fix maintainer"
The maintainer change was unwarranted and incomplete.
dev-python/elasticsearch-curator/Manifest | 1 -
.../elasticsearch-curator-5.0.4.ebuild | 121 ---------------------
dev-python/elasticsearch-curator/metadata.xml | 8 +-
3 files changed, 6 insertions(+), 124 deletions(-)
diff --git a/dev-python/elasticsearch-curator/Manifest
b/dev-python/elasticsearch-curator/Manifest
index 987d152f8ed..1c7dfe72de3 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -3,4 +3,3 @@ DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256
74d752f9a8b46898d306ad169b72f328
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-curator-4.2.6.tar.gz 228342 SHA256
bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512
e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64
WHIRLPOOL
63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
-DIST elasticsearch-curator-5.0.4.tar.gz 264754 SHA256
109aa8ba12ed68b5e9121138cbbdbae2f58eef5fd310099e3b8843ca5cc1cfc9 SHA512
79392a91e1bcbac79c40b75f782a1d57f7e24c849e4e7b302a47f5bcc84e9f656b30c64aa6eb51da9f92e6e021862411beb345da88248288b28c95d751d757cf
WHIRLPOOL
0f881013053458804694f1d8e00052566a41af2905d7cddd2b2a2bb4fb6c27cab77e66f85f0c9fa7f6261399b41273072ce1b8d116d706a7bd53bb4b37639fd2
diff --git
a/dev-python/elasticsearch-curator/elasticsearch-curator-5.0.4.ebuild
b/dev-python/elasticsearch-curator/elasticsearch-curator-5.0.4.ebuild
deleted file mode 100644
index 6086be2b80b..00000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.0.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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} )
-
-# Same as elasticsearch-py ...
-RESTRICT="test"
-
-MY_PN="curator"
-ES_VERSION="5.1.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://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
- >=dev-python/elasticsearch-py-5[${PYTHON_USEDEP}]
- >=dev-python/click-6.0[${PYTHON_USEDEP}]
- >=dev-python/certifi-2017.1.23[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.8.3[${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
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/nosexcover[${PYTHON_USEDEP}]
- dev-python/six[${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_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: ${ES_INSTANCE}/g"
\
- "${ES}/config/elasticsearch.yml" || die
-
- # start local instance of elasticsearch
- "${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
-
- local i
- 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
- eend 1
- eerror "Elasticsearch already running"
- die "Cannot start Elasticsearch for tests"
- else
- einfo "Waiting for Elasticsearch"
- eend 1
- sleep 2
- continue
- fi
- done
-
- [[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
- export TEST_ES_SERVER="localhost:${ES_PORT}"
- esetup.py test || die
-
- pkill -F ${PID}
-}
-
-python_prepare_all() {
- # avoid downloading from net
- sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
- # 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
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- cd docs || die
- emake man $(usex doc html "")
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- doman docs/_build/man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- ewarn ""
- ewarn "For Python 3 support information please read:
http://click.pocoo.org/3/python3/";
- ewarn ""
- ewarn "Example usage on Python 3:"
- ewarn "export LC_ALL=en_US.UTF-8"
- ewarn "export LANG=en_US.UTF-8"
- ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/metadata.xml
b/dev-python/elasticsearch-curator/metadata.xml
index da91df96635..32b8b78a91d 100644
--- a/dev-python/elasticsearch-curator/metadata.xml
+++ b/dev-python/elasticsearch-curator/metadata.xml
@@ -2,13 +2,17 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<maintainer type="person">
- <email>gokt...@gentoo.org</email>
- <name>Göktürk Yüksek</name>
+ <email>patr...@gentoo.org</email>
+ <name>Patrick Lauer</name>
</maintainer>
<maintainer type="person">
<email>hydrapo...@gmail.com</email>
<name>Tomáš Mózes</name>
</maintainer>
+ <maintainer type="person">
+ <email>erkifer...@gmail.com</email>
+ <name>Ferenc Erki</name>
+ </maintainer>
<maintainer type="project">
<email>proxy-ma...@gentoo.org</email>
<name>Proxy Maintainers</name>
