gentoo resync : 28.04.2021

3 files changed, 2 insertions, 112 deletions

diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index b0f379470032..bd651d28650d 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,5 +1,4 @@
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
-EBUILD elasticsearch-py-7.7.0-r1.ebuild 2935 BLAKE2B 13c8802c1a2e3b44387c461bb7d6c3b221b0a0c275231353925e0b1887c58d97775a1829148e63f9454576697c6fd117b95c4a3ee25da01ab0a00031f9347722 SHA512 0686e343f49de18249d7c4650c9ca3b81873d06d62054534cddd0465a9b33f31a4f7ad06160039851777562cfa746396b092726d58b93329f1b07228be2f8409
-EBUILD elasticsearch-py-7.7.0.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
+EBUILD elasticsearch-py-7.7.0-r1.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
 MISC metadata.xml 535 BLAKE2B 50be35e12f13939b5bba95815e72e85178274802227dabf66a30fa4784038db423731ad3a2cfbefc026c64bd48963dbc10f265cfc7186662bb7855bfd4da32eb SHA512 dd7a1e75f2781281eb0d80056eaf4e16fbd1e19b7d8c8cdf6d713134861fcb01eb780d48ce1efb095b6ba684a18ff637f6a443be5a87e6b30649dc769404fb78
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
index ad8b35583dab..d58c676ddca3 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elastic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # tests fail in chroot
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
deleted file mode 100644
index d58c676ddca3..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-ES_VERSION="7.7.0"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="Official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elastic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND="dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		virtual/jre:*
-	)"
-BDEPEND=">=dev-python/sphinx-1.3.1-r1"
-
-python_prepare_all() {
-	# needs numpy/pandas
-	sed -e '/test_serializes_numpy_bool/,+79d' \
-		-e '/import numpy/d' \
-		-e '/import pandas/d' \
-		-i test_elasticsearch/test_serializer.py || die
-
-	sed -e '/coverage/d' \
-		-e '/nosexcover/d' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	local es_port="25124"
-	local es_instance="gentoo-es-py-test"
-	local es_log="${es}/logs/${es_instance}.log"
-	local pid="${es}/elasticsearch.pid"
-	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
-
-	# 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}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; 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 ELASTICSEARCH_HOST="localhost:${es_port}"
-	nosetests -v || die
-
-	pkill -F ${pid} || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}