commit: 57880eb96c4bda39dc9740e9a110bbb71073929c Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Wed Aug 10 05:15:22 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Aug 16 17:59:21 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57880eb9
dev-python/elasticsearch-curator: add missing '|| die's, drop old. Closes: https://github.com/gentoo/gentoo/pull/2056 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> dev-python/elasticsearch-curator/Manifest | 3 +- .../elasticsearch-curator-4.0.1.ebuild | 112 --------------------- .../elasticsearch-curator-4.0.5.ebuild | 9 +- 3 files changed, 6 insertions(+), 118 deletions(-) diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest index 75b34aa..b589209 100644 --- a/dev-python/elasticsearch-curator/Manifest +++ b/dev-python/elasticsearch-curator/Manifest @@ -1,5 +1,4 @@ DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210 -DIST elasticsearch-2.3.3.tar.gz 27542289 SHA256 5fe0a6887432bb8a8d3de2e79c9b81c83cfa241e6440f0f0379a686657789165 SHA512 d3899d2f45128d218693ed2a0f9210ec6ce5fe4101d543b46edaaadceeb6768fe3cf04bf161ad09b38629bada74368133727dd735ef11132fffe81aabe0ef88b WHIRLPOOL 5f51b0c1a913a60073c212c9ee06b024b0ca50bbf7857f2ce1883ab51bbb8295c51c1c2d4e7fd98b5dc9db65cd753fd282a0eccf7568fad6608b3529f5e9ea36 +DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095 DIST elasticsearch-curator-3.5.1.tar.gz 93121 SHA256 3b578c1d8a88da22501a79346792288478f3191d75058e4c43d05fc261c9b874 SHA512 59ddc5feb575f626afcbce9c80b113827d9752bb4ba1bc8f7e7f110f8be661314dbf0421310cb07ce1b15c9d6dba2f181718befb5cfa93803ad5e63226ac9556 WHIRLPOOL 8b0529116cf735cb45872073a7668bdb94e0e61306bcbd6d3609a73616f75f74747847cbf8a860d5727fe3f475ab59c66f1382a04d543cdb3c22de4edfd068e2 -DIST elasticsearch-curator-4.0.1.tar.gz 107792 SHA256 a7aa6a48f93a35d005f174a87ee05115230bc0b84994367e01c21873aedd519f SHA512 d948d38b3b17e046a139f3bea1c9a9a927bef2621477689b897e0845211bcb3c35507c7661a0801361933a72b01868553fb84ecc9aefa5e5fc363a4f516e63cb WHIRLPOOL 44edb992ec6e8194b4696c18c6d4d5ac4cc3a0d9fe488a15ee6d693a6fc4f32585411e74a46e64864baba57327dd8ed60da8ea30deb2666c9feaf2f5efcf7ed0 DIST elasticsearch-curator-4.0.5.tar.gz 110573 SHA256 84f9df5fb19e59e734b224cba35d7c48c6dbdbe6317d8274276f5ad81cfbfd12 SHA512 08270cd53510e4356e1f01bb27c9202dcf2ac7d66c9852c2bc5d93de7c701802f67bf0b0117d4a155b9a930a4842d021a08f85436007654a812e47a0de8d870d WHIRLPOOL a80fdbdd30d82d1b189eba97e07779a6c632f58a5d242aef8fc3a450be0c93c64ec02651793fea8475936934f6ea8ed227d18c22f32e9a9d7d5e8506e9c2679e diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.1.ebuild deleted file mode 100644 index 688fdb5..0000000 --- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -MY_PN="curator" -ES_VERSION="2.3.3" - -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 )" - -LICENSE="Apache-2.0" -SLOT="0" -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}]" -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 ) - 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}" - -python_test() { - ES="${WORKDIR}/elasticsearch-${ES_VERSION}" - ES_PORT="25123" - ES_LOG="${ES}/logs/elasticsearch.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 - - # 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" - fi - - # start local instance of elasticsearch - ${ES}/bin/elasticsearch -d -p ${PID} - - for i in {1..10}; do - grep -q "started" ${ES_LOG} 2> /dev/null - if [ $? -eq 0 ]; then - einfo "Elasticsearch started" - 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 - - export TEST_ES_SERVER="localhost:${ES_PORT}" - esetup.py test - - pkill -F ${PID} -} - -python_prepare_all() { - # avoid downloading from net - sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.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/elasticsearch-curator-4.0.5.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild index 688fdb5..184e627 100644 --- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild +++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.0.5.ebuild @@ -7,7 +7,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5} ) MY_PN="curator" -ES_VERSION="2.3.3" +ES_VERSION="2.3.5" inherit distutils-r1 @@ -49,17 +49,18 @@ python_test() { # 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 + ${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" + echo "path.repo: /" >> "${ES}/config/elasticsearch.yml" || die fi # start local instance of elasticsearch - ${ES}/bin/elasticsearch -d -p ${PID} + ${ES}/bin/elasticsearch -d -p ${PID} || die + local i for i in {1..10}; do grep -q "started" ${ES_LOG} 2> /dev/null if [ $? -eq 0 ]; then
