gentoo resync : 30.05.2020

3 files changed, 59 insertions, 3 deletions

diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 24f62de10e04..5366b0fb14f4 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-EBUILD elasticsearch-transport-6.8.0.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
+DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
+EBUILD elasticsearch-transport-6.8.0.ebuild 1286 BLAKE2B 74253518166d3899889640fd67d32b3a9851b85d04e8bfbda7cbe5219bd623f0d33b43497843dd487edcc47228df4ead1e05e192d8719f170eff5afd5bd5f03a SHA512 e897ff95b6406ae36bbea0b2d092c9de8990310aaecec94a97fad17cea20b9e953b294ef1f46ab237461f4789fc9b32f2ff0eca29a9a338d8db4e085317a5a41
 EBUILD elasticsearch-transport-6.8.1.ebuild 1245 BLAKE2B de79ad2d371cdc49172d4aa835048c11b462c5f7faec0e3512890b6ea36865b15289e46a5b0bff61ab9bf0fb1080d6333ff3c58f15558940112898903bebe4ea SHA512 72c619d7be6141257c7e91f6c436cdd349e0abdced71e93a05a143246ad56f0003a0ed876e53aaceba5b8b3c049cb82c4daf80261b867cd6cb44822f9d3e620b
+EBUILD elasticsearch-transport-6.8.2.ebuild 1266 BLAKE2B cd158092fb761a3a7e02917c62a9e75ae207142d04cb40d3377b48a28cdbf3e96fe05c9a46884bb4d52502b77e7c6dfecef1f68ed1261ea2ddbbcaf35feb4ef0 SHA512 ad6021417629213db68bcfdfcbf7773de1ddf07e49fcbae26ffa8df46a0505c335964f8da53ffeee8e5bde8d78c79821f31272df4b393dc1b66813646d52061e
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
index 62da4c569e55..792e50aa53ea 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/faraday
+	dev-ruby/faraday:*
 	dev-ruby/multi_json
 "
 ruby_add_bdepend "
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
new file mode 100644
index 000000000000..1d13774e21d5
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}