From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 18 May 2017 22:09:31 +0000 (+0200)
Subject: dev-python/elasticsearch-py: [QA] Revert "Bump, fix maintainer"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=959b399e29f968c8ad239206106821a43c4228db;p=gentoo.git

dev-python/elasticsearch-py: [QA] Revert "Bump, fix maintainer"

The maintainer change was unwarranted and incomplete.
---

diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 9d20009448be..fe895e449f32 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -8,4 +8,3 @@ DIST elasticsearch-py-2.4.1.tar.gz 77420 SHA256 673cdc861d2fd0cd9d1de5be80239dab
 DIST elasticsearch-py-5.0.1.tar.gz 79648 SHA256 b4e17253b950f550c8fb53a68f431abc0a67131154aecd3a1dff19e955c3345c SHA512 a10483c853b3b1b6a9a250ceb51738b5351764cde18140b0b754f6563aa5ed8d3095063e85524968adc0faeb846acebedeeab7a29533e3025db698db228823d9 WHIRLPOOL 109890c3c6a408a700e9d03265308b3d33910a8883e2ec48657c0b2f0c0bb48349067ad19877d76f27945b5712e373db669bda7f74128e077198853f18397a5f
 DIST elasticsearch-py-5.1.0.tar.gz 79933 SHA256 6d2c06607dd1c27842e25552878c2d45a345dc27946e8819588bcacedbe3c5f8 SHA512 a8b34c767247c906e7b602161adb94614b17f293e350908b375ae9c1a4f835914b3f4081cab20f958976c8b355189f1b4d3afa88dc66277773cf944fa7bbaccb WHIRLPOOL 9c1b8635220f24e4954d3464facff32a8d71e8aaef05062a8bc9e9eca369b179a9b50309558f1a199abb97bbadfe80e5344038015a54477664a9c8ea1e5ca500
 DIST elasticsearch-py-5.2.0.tar.gz 80317 SHA256 47725bfb394d40198ef8cdf254f2ded87970c87282e1b09510de0406ebbf5476 SHA512 df03879c981361b55f0c12ad7bbc9a123b49d9a6b351aa18840858f4ac43b9ef11d8a9a8b3200e295e461438254bf95c4f233a50752f917aa31392be5cd3b7fc WHIRLPOOL 7ed9f9af2d4c4cc4011454f3e9bfa8121e375d017d2a23ef3420cb3b02c054a9976438eaa4cdd3cdeda39602d14941376ec2da65b839858229cfd9274893f6d8
-DIST elasticsearch-py-5.3.0.tar.gz 80767 SHA256 f0b8a33a81b12a5a1b2bb603093a63a39e9e1ca116e56f85d18c02c2e93d6173 SHA512 2479b5be237f4ba4ca87997fafa92041fba1fe49658117515d70ae5d551e4da11d4556b3ed23f7b7c8907606b6b1f76b024a0293fd58072cf9bf650a902e5f06 WHIRLPOOL 4b17838d11d33edb389fc864f7aba0e07f4c766bc5197d19e029c05a304b2e9ac1b42d76ce4948b51e093bfbd90b1d8366725d48f6546b783b32afed65afeb64
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
deleted file mode 100644
index 29a8b47150c9..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="5.2.1"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-# that's now the second time I've disabled this.
-# Why am I as the maintainer ignored?
-
-MY_PN=${PN/-py/}
-
-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://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~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 )"
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-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_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
-}
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index 720e5a643ae1..a8403705d71a 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -2,13 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
   </maintainer>
   <maintainer type="person">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
+  <maintainer type="person">
+    <email>erkiferenc@gmail.com</email>
+    <name>Ferenc Erki</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>