gentoo auto-resync : 16:11:2024 - 03:02:52

2 files changed, 9 insertions, 17 deletions

diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 797b981c87ac..703d4ff94da2 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,14 +1,14 @@
-DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0 SHA512 5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
 DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3f08eadc6824e5499d5949a07d59e824d92e48b5dffa5bc3777ba70b25f87d67683ddcb817d03cb0947d8890f4618e1b48661000 SHA512 43e3c5d685855e26433674f4b0822caf10c829131dc3a947ab13598dd39de5baa1967d0fd3631b8c89b6f91fa7ff7422118b7c7e537803201f0cc752a3a50818
 DIST elasticsearch-ruby-8.12.2.tar.gz 1908814 BLAKE2B f3caffe7336a63547ba0d44a3239fb6b71ed7fb46b1136114a87e7e5f69608d69b14d12f568b6e945db0917a6913a10407cf7cae3137605adaaac5fb7fd9439b SHA512 08fe791ee20cbe9f6ad9aee1b7d9c02813895add4bb0ff7b4e063051b42e62e037d71217521f6a9cb0076c51e8f7160bad52798741435164451806932488d17c
 DIST elasticsearch-ruby-8.13.0.tar.gz 1918145 BLAKE2B ded410c9e77876dc61a942ab1de7945d28aa1c06cd7079f693119812128fdfd38c206d9644aadb79fb8c9b48e12d77fec6c313434cfb58510bc48fecc905106b SHA512 8babc5797802ae256b41a00927cd1688c2d3d90770d8a867a9b96a7a115f537f1ca301b2d6b73107995b23578abc755d7bf7dc03075520fa857dda22e6a2d32b
 DIST elasticsearch-ruby-8.14.0.tar.gz 1918771 BLAKE2B 1824edd7ae6ade20b58cb56dfa01b9e9d5d833918cddbba49f7f0d258eff6a19c55f112d7dd70f9457274b457851b59a208db3b1e69c1f12867951b960333c99 SHA512 36fb8fb18e410df7f2c4c46e2ffaed0ea591879ad4e753d178513281be5de78bd7ee1cda5cbbf02313cd255ad85e010f92bc5690f16f2ab91fd38bb0d17f8dbc
 DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
-EBUILD elasticsearch-7.17.10.ebuild 1752 BLAKE2B 88f73fbab576c4f7b094dc759389a01580641a79321b0c5c391d6e0b6b506752c296ab166c3f0c98c41e22c278b7cc5df61e8abf0a7190e8c311cc3318e9fdc0 SHA512 7342fc9f437367f03ac3f80c6c45e4409c0e3140ca509b8e960ff0395f32f1565c1bd832266bb3b2c2b8acc2d4b4b4051849ca67629a4da8b3ec35eef4fd21a3
+DIST elasticsearch-ruby-8.16.0.tar.gz 1938620 BLAKE2B 742180d14d6d003b498f2e5812239c6d83c39c5d8fb37dad1a113f017857fe2563932e05ca67774e1db428f264d57d43bd694b6bf784c374db0c560e31af2931 SHA512 78191a95577aa443a85c75476a6743cc31371958a3f30d1d95cbe9159893bdeb297a9010c1e41d7adcb53172f5f096e7666a8f1506a6b05fcbaa7559328589ab
 EBUILD elasticsearch-7.17.11.ebuild 1805 BLAKE2B eb4864a1ddac4467f0e16aa1095201c5406f6cbf32e4039f7b6e2a75cdccdc96fb75e8b16903f4f670e23724816d3b0b3d89e1f3d798199ae2c9dc61320ecb85 SHA512 89f338d4fef0d97b6989dad68c6a0952648cef56ceb03662ca58fcfc3072cd843ad3c4c985700fb9d10b9542e9fdadeaac81797037ca1ca483101e55bf2f716d
 EBUILD elasticsearch-8.12.2.ebuild 1329 BLAKE2B 91e1c9ecdce5e0934516f87f1420dce3b3a053ed551756cdfc27c7569c1f3ec860540ec9449cf8c2f1abab42cff90d03c6113aaa639291c88ce841862ae9dcdd SHA512 773039940b47f3a0880ccea4606be5217f173ea4e800aefc6a829c36473ecdb47b9e51d9a5d23b3dd45e8c3bd5261939a11d5648e46408e4d6344f6d44582fd5
 EBUILD elasticsearch-8.13.0-r1.ebuild 1335 BLAKE2B a33266a847db4274e42b4a637adb41a0659e1da8fa1db1323504ed8e2eb20baa63caf7fb152c71fbb459f47cfacf6564b62b7c2410b15c77101e45e2fc24a1af SHA512 b519c6eb7b8dde22969a544eef8e8efdc94bf227fb5b98953290c72353a5a6ed59edb460bea61d3bc185af5b9a9761b81be5e76822a1d6c6d660ddb6796dd0f8
 EBUILD elasticsearch-8.13.0.ebuild 1329 BLAKE2B 91e1c9ecdce5e0934516f87f1420dce3b3a053ed551756cdfc27c7569c1f3ec860540ec9449cf8c2f1abab42cff90d03c6113aaa639291c88ce841862ae9dcdd SHA512 773039940b47f3a0880ccea4606be5217f173ea4e800aefc6a829c36473ecdb47b9e51d9a5d23b3dd45e8c3bd5261939a11d5648e46408e4d6344f6d44582fd5
 EBUILD elasticsearch-8.14.0.ebuild 1335 BLAKE2B a33266a847db4274e42b4a637adb41a0659e1da8fa1db1323504ed8e2eb20baa63caf7fb152c71fbb459f47cfacf6564b62b7c2410b15c77101e45e2fc24a1af SHA512 b519c6eb7b8dde22969a544eef8e8efdc94bf227fb5b98953290c72353a5a6ed59edb460bea61d3bc185af5b9a9761b81be5e76822a1d6c6d660ddb6796dd0f8
 EBUILD elasticsearch-8.15.0.ebuild 1340 BLAKE2B ca41e48345e7d66e34ac5962cce3c7013c1d8461d4a516638855aac841eae8af30667099a1184ee0de1d480c0609f12b9ba5f5bb6852bd03e0637466c9ca410b SHA512 a436243a3e67d41cd4539fbdd8e2e37ae862162b4add32761a9539ac7d1626e6588eb1b7e9dbefb3b9390ac40815ee7669b19194f36a8aad45ca11da9c90ba31
+EBUILD elasticsearch-8.16.0.ebuild 1340 BLAKE2B ca41e48345e7d66e34ac5962cce3c7013c1d8461d4a516638855aac841eae8af30667099a1184ee0de1d480c0609f12b9ba5f5bb6852bd03e0637466c9ca410b SHA512 a436243a3e67d41cd4539fbdd8e2e37ae862162b4add32761a9539ac7d1626e6588eb1b7e9dbefb3b9390ac40815ee7669b19194f36a8aad45ca11da9c90ba31
 MISC metadata.xml 316 BLAKE2B 6dd63e5f6301f77e0a7eaa6cede387182abac37b0bd81ea6484e7a211318aadcdf8bb86f8b5b40abe82402a99c8ccaf9ca168921d085ddbb70319afd5e256db3 SHA512 28e3e5371dad297baa577034783afa219b4796d6dfbbcd24ad1e90c47f130dbaebdf0a9a76bf38a0b9e7df610d24cdc3a7b92f76bf1ff92b8ed88bcf861de881
diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.16.0.ebuild
index 4bd16db0ddb3..28b77e676fba 100644
--- a/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-8.16.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
-RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -19,21 +18,20 @@ SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz ->
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 ruby_add_rdepend "
 	~dev-ruby/elasticsearch-api-${PV}
-	~dev-ruby/elasticsearch-transport-${PV}
+	>=dev-ruby/elastic-transport-8.3:8
 "
 ruby_add_bdepend "
 	doc? ( dev-ruby/yard )
 	test? (
 		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
+		dev-ruby/base64
+		dev-ruby/mocha:2
 		dev-ruby/pry
 		dev-ruby/shoulda-context
-		dev-ruby/webmock
 	)
 "
 
@@ -53,11 +51,5 @@ all_ruby_prepare() {
 
 	# Avoid spec requiring a running elasticsearch server
 	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
-
-	# Use the Faraday default adapter instead of a random auto-detected and unpackaged one.
-	sed -e '/Elasticsearch::Client.new/ s/$/ adapter: :net_http/' \
-		-i spec/unit/wrapper_gem_spec.rb || die
-	sed -e 's/Elasticsearch::Client.new /Elasticsearch::Client.new adapter: :net_http/' \
-		-e '/Elasticsearch::Client.new(/ s/(/(adapter: :net_http, /' \
-		-i spec/unit/elasticsearch_product_validation_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
 }