[gentoo-commits] repo/gentoo:master commit in: dev-python/elasticsearch-py/

[David Seifert]

commit:     cf52399254b5a18ab1560e2328d04c796ca4aff1
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Aug 18 05:42:39 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:59:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf523992

dev-python/elasticsearch-py: drop old

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2102

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-python/elasticsearch-py/Manifest               |  9 --
 .../elasticsearch-py/elasticsearch-py-1.5.0.ebuild | 54 ------------
 .../elasticsearch-py/elasticsearch-py-1.6.0.ebuild | 57 -------------
 .../elasticsearch-py/elasticsearch-py-1.8.0.ebuild | 98 ----------------------
 .../elasticsearch-py/elasticsearch-py-1.9.0.ebuild | 98 ----------------------
 .../elasticsearch-py/elasticsearch-py-2.1.0.ebuild | 95 ---------------------
 .../elasticsearch-py/elasticsearch-py-2.2.0.ebuild | 86 -------------------
 7 files changed, 497 deletions(-)

diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 6a9a09c..0319148 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,12 +1,3 @@
-DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
-DIST elasticsearch-2.0.0.tar.gz 28576708 SHA256 b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df SHA512 23473b658d68c07b65f66e04cdac07c0b88ac3a2a9ca1d5e700b5b17ebc1b23b77a5b0fa32959d30d8e0267ec186be42de0c11ce86864fe55d0e353c27d0003a WHIRLPOOL 22a7a274961999d5105ed9ba817d225deb8e46330e5774be8caecb34e6997c2a8debf348a5f6d58ac9d959a6b96957723a63944750155f37592278b8e6e590c6
-DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51
 DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
 DIST elasticsearch-py-1.4.0.tar.gz 74498 SHA256 7959787b47c3523e9c9aeffec441091fcd2b293d26c4fd5f576cf84cfb85ef63 SHA512 dbe51362f68d40e95a0cfefde4feb8d9d9c61b4f4795cbf69fd70bf981f290812ebac19a20ae8594cc39ac46a3c35ddfe450ff436fca0fada060736128478cf7 WHIRLPOOL a6730bcccc1201048f82aed6e63b7e73f38150002dd9889c575c9edf52834bc6f9a8256977ac27b092f3865074e4699729cc766564a4b731766d77d6a6de6324
-DIST elasticsearch-py-1.5.0.tar.gz 77037 SHA256 275eaeb2f64c8eba8691d953ac0d8a16e4f759d9cad797323b7cbd0ef87a69ce SHA512 10d473a221be3deb086dca0c5463324647e38f8be4f4bbea934079b002f1414d30c98976c56fd2fc55c97d24ed2338137a9983194e8bf82c95cc70321ee5ee86 WHIRLPOOL 3aa83b9bfd5363ea39baf58cc7bdaaa9606085e471e7e683518cf707642fc9a514264c51cf3e296db071a2a5333f58b8e1335bc4473477df9d085bea63c584ba
-DIST elasticsearch-py-1.6.0.tar.gz 77205 SHA256 59dd03284ab7314e5eb50d13ba92df65efb93778ca318906baad5776b152aff7 SHA512 09cdec0b3f50707b9a5e11534fe28507db669e4da44bbda1952d07b6ac8e3aea0c0c05297db26d9425c2247724681fa4e5485e9525571ff64f070e700a9a9b07 WHIRLPOOL 04f43a848cc811d1bee22d2bf7931a4348fb4a455172e381bedad5179d72313320009cb8b2dfdadb252aacc13cc1a4ef15b311488401d6b2bc23e242272bb74b
-DIST elasticsearch-py-1.8.0.tar.gz 73848 SHA256 9394a1eef66223f8292f005bbe0c2309df10f76e8065823966e045e5e0a76cb3 SHA512 c4ca91db0fd1094dd02b1a9e7ca94f11c4c528373a71f180c5e256efdf53515802fc854866dcb7077e2f5c6300ee88cb80fd6c766e22f1f76357a0b970e1444d WHIRLPOOL b3cfd3011e97cfe97690a784e896dc794ece747ed1b82e1a3b1731b9dda25f38011ef4e0dd8271a514f31a85fb35349877baa2ce66908f908c5c7470412a23ef
-DIST elasticsearch-py-1.9.0.tar.gz 74021 SHA256 bf00a6c7ecd965bf585199335d2619267ae0caabc356ee011dfc37e373edc023 SHA512 1a523867fd40534332a8b46e84ca3009dbaf86c9bf51e1487d76b90420e0c5371271f7956ebd2a416288bab57fa539377471386e23bcc03b1e7cdd4ab90a6027 WHIRLPOOL 9c5f4ffcdc97ce695845d8597d39aa41e71495de78f49fa2003d3665f683a04e32d5a5dabd4670ab9928a1ebc082564b4169b7e19f5c803146772b50598ae091
-DIST elasticsearch-py-2.1.0.tar.gz 72785 SHA256 faa04d251ba266c419bb45b644b984fc3028f558ff50d34ec92547f65db75652 SHA512 445ca902b9b1b0239f751174d812672a623a205bc22da679a61edcd88a29d86be2e1e35421579da1ae34b346476f951c24848015bbf2d437e2209b706044ec0b WHIRLPOOL e50ec6278a229f5129aa56693b761226ba11a453f1841dadec54a57998205246b8a95eb10365a79fb831ed47532d8b3c231f4134515e4f169b123e4d7bfcf8e4
-DIST elasticsearch-py-2.2.0.tar.gz 74228 SHA256 e0d252a8c1e9af2b7b89ae8aa8cb006bb1714e19e147418655baebd0c4f90e77 SHA512 fcdcb72064920aeaaaba644166184d6826d5bd26542824744cb9bc899d01b50f972bbee4e92dce2f24fc81d66201d807d89fb2b9ccda446986eb79c9c131171e WHIRLPOOL a92cbe1e959cef132901c60c31ec0cc30a437e049205b4475094a05112efdb58fb136c92e3e1507589e1c77d001679d1e083710accb9ee47c43d25d0a71c183c
 DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.5.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.5.0.ebuild
deleted file mode 100644
index 973f5cc..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-1.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Remove tests attempting to connect ot the network
-	rm -rf test_elasticsearch/test_server/ || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test_all() {
-	# For unknown reason the testsuite fails to iterate the set of impls of PYTHON_COMPAT
-	# but they all pass on testing when run individually
-	"${PYTHON}" test_elasticsearch/run_tests.py
-
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.6.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.6.0.ebuild
deleted file mode 100644
index 9effa3b..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-1.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}] )"
-# nosexcover is listed for tests but is not essential
-
-python_prepare_all() {
-	# Remove tests attempting to connect ot the network
-	rm -rf test_elasticsearch/test_server/ || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test_all() {
-	# For unknown reason the testsuite fails to iterate the set of impls of PYTHON_COMPAT
-	# but they all pass on testing when run individually
-	"${PYTHON}" test_elasticsearch/run_tests.py
-
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild
deleted file mode 100644
index cd99890..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-ES_VERSION="1.7.3"
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${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 ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_prepare_all() {
-	# rename manpage to elasticsearch-py
-	sed \
-		-e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	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: elasticsearch/cluster.name: gentoo-es-py-test/g" \
-	${ES}/config/elasticsearch.yml
-
-	# Elasticsearch 1.6+ needs to set path.repo
-	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
-
-	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID}
-
-	for i in `seq 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_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild
deleted file mode 100644
index a9f9b0f..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-ES_VERSION="1.7.3"
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${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 ~arm ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_prepare_all() {
-	# rename manpage to elasticsearch-py
-	sed \
-		-e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	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: elasticsearch/cluster.name: gentoo-es-py-test/g" \
-	${ES}/config/elasticsearch.yml
-
-	# Elasticsearch 1.6+ needs to set path.repo
-	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
-
-	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID}
-
-	for i in `seq 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_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.1.0.ebuild
deleted file mode 100644
index 4de564a..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-2.1.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-
-ES_VERSION="2.0.0"
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_prepare_all() {
-	# rename manpage to elasticsearch-py
-	sed \
-		-e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	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-py-test/g" \
-	${ES}/config/elasticsearch.yml
-
-	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID}
-
-	for i in `seq 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_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.2.0.ebuild
deleted file mode 100644
index 746f3ac..0000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-2.2.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-ES_VERSION="2.1.1"
-
-inherit distutils-r1
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	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-py-test/g" \
-	${ES}/config/elasticsearch.yml
-
-	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID}
-
-	for i in `seq 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_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}