gentoo auto-resync : 30:04:2025 - 12:55:02

4 files changed, 9 insertions, 146 deletions

diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 607f5a0c7776..9b984ab3ece0 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,15 +1,11 @@
 DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3f08eadc6824e5499d5949a07d59e824d92e48b5dffa5bc3777ba70b25f87d67683ddcb817d03cb0947d8890f4618e1b48661000 SHA512 43e3c5d685855e26433674f4b0822caf10c829131dc3a947ab13598dd39de5baa1967d0fd3631b8c89b6f91fa7ff7422118b7c7e537803201f0cc752a3a50818
-DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
-DIST elasticsearch-ruby-8.16.0.tar.gz 1938620 BLAKE2B 742180d14d6d003b498f2e5812239c6d83c39c5d8fb37dad1a113f017857fe2563932e05ca67774e1db428f264d57d43bd694b6bf784c374db0c560e31af2931 SHA512 78191a95577aa443a85c75476a6743cc31371958a3f30d1d95cbe9159893bdeb297a9010c1e41d7adcb53172f5f096e7666a8f1506a6b05fcbaa7559328589ab
-DIST elasticsearch-ruby-8.17.0.tar.gz 1940073 BLAKE2B 25d141927f4adacb2f7d447a8f929859fd0081526e47355673d702445cdb01add122c303d1cea6bef0f4c5d9ac743c55fba98220303a9440218e99860bd619e8 SHA512 2968ed0648eeb9b0b0620d6778f9dd63cee0c20da433a5023b6c0eec8f9c906449cc5d5c8a0bad195815f6f85b93e70545dafc43c9ce2fdbf113be80524ee3ab
 DIST elasticsearch-ruby-8.17.1.tar.gz 1940369 BLAKE2B 95e7b79b6f95905ce221cda6bea928868507d8629f8122a1eb3181e4da3a652df0e35ed13823451d10fd3fc3e6e619c24856803afdef68ecb6340f843d4ac382 SHA512 49937635a2488a155a03dc86ac55ec27b3e1c98ed4445a0df038e9cc6ac51d524252ac8b923c1174f7d121a42d1f72d542c0460e360c055dacb467c916dff970
 DIST elasticsearch-ruby-8.17.2.tar.gz 1941489 BLAKE2B 78d87d6c8a44b584177522561c9969249517bee60a069dbe3dd4934a72efdd62bff2ac613b99019fe2f3a447fde6db7f4e419b38bd7e3a0f46003ff5269bb39a SHA512 2a901c937359bc0c7705b45945af3b0cde4938f4247b53d26c40148df4ad854e31491564d1b4777d44d53e0d58b364feed73215fe10617f1bc6415e2f92e84d5
 DIST elasticsearch-ruby-8.18.0.tar.gz 1948108 BLAKE2B 972518914ad038005688bc241c0b67dfc079143ad26f33d302ca2bf020a166eb2e9d35f3fd7e58ebafe0f3082ddcf172b2ff4ccba3080c533d1e8581cffed213 SHA512 58f70cedc8b3c387dc83776521dfbc63518d5c477f2e5a681669f3b94a8eecdc0713c2d789e6d849682c9870f29efa64df064cf8475d7606b009f98507eda63d
+DIST elasticsearch-ruby-9.0.2.tar.gz 1740456 BLAKE2B 0c1e8cec357c6be81fdadd0eebbfb519b553cf579208de3508d1af30c513e9c74103ed1813beae1a98e0a7b4579277c3e205f1e6d9d850b1c6f024b46c25e168 SHA512 356fa390858523b5ff2fd6e7a15fb7856d34b8c51f743927dbc402ba05222433c82ef1e384f4d96ae6dc5e38af726118801f5f23345a14c3a5820d4a3806ac64
 EBUILD elasticsearch-api-7.17.11.ebuild 1594 BLAKE2B 4abeaaff0a36a4d127cc32a7c26347a4af0dfc51fef829f892e3ebfe0ae6344a4f335cde6cb80497a618153bfadbc949ea273bb7e9c6ec216230f6820f6bb4ac SHA512 e6d11289e9f445167c69f19755abb77e99f6dd766bece9391bc644efee178a12558a477eff97ff52bc5e98b87d985dc9953703efe528a95bcb8ac39ab4d39e5c
-EBUILD elasticsearch-api-8.15.0.ebuild 1659 BLAKE2B cb836aa9a99a657aeda03d59f21666503274e6faa311579bb9e0f36f66286b2b305219d2e126005274c77d5652e921c186455748c9861341a1c48fee48cb7736 SHA512 deb41ee5ed3b5acc33aea8df7974be3c98f89eaf0fa712cf6df63ac1395779740145b1c8b5c651c15b12269fcb30ea30b185581aa8a3d9992fb83ac40e2a8043
-EBUILD elasticsearch-api-8.16.0.ebuild 1719 BLAKE2B da8c6c10b57d42dde4720d69d2ea9c53b068c761fd182402cf85db1df4541dd2de517f3ed46c552df6bc7a36089a731476504043a1ad44bb64184cc2cb19f312 SHA512 4ed71e6eea75df19d0d441e7ade6484b588fdce3a03d44fbc3b2dcff75f7fd15f2a89fd9e4f404583f1dda734a86590e391c998bee09c567f9bba5db4802a864
-EBUILD elasticsearch-api-8.17.0.ebuild 1719 BLAKE2B da8c6c10b57d42dde4720d69d2ea9c53b068c761fd182402cf85db1df4541dd2de517f3ed46c552df6bc7a36089a731476504043a1ad44bb64184cc2cb19f312 SHA512 4ed71e6eea75df19d0d441e7ade6484b588fdce3a03d44fbc3b2dcff75f7fd15f2a89fd9e4f404583f1dda734a86590e391c998bee09c567f9bba5db4802a864
 EBUILD elasticsearch-api-8.17.1.ebuild 1719 BLAKE2B ae7cb2fe8e9ae06fa1176c9d570f0967d9f31308a388b5a6879b9babb665a2049b74596ce55627d77b94701669fdacd87fd51a384e1c1394c60e17758a6472da SHA512 7f42e0bd1555e5f0c938f73a16423481c121b5f226bc4187742d596da95bbd1c25fb287a54eea0cb3687cd8bdd1119d5c1899cb6539e5e101ec26293c2b61430
 EBUILD elasticsearch-api-8.17.2.ebuild 1719 BLAKE2B ae7cb2fe8e9ae06fa1176c9d570f0967d9f31308a388b5a6879b9babb665a2049b74596ce55627d77b94701669fdacd87fd51a384e1c1394c60e17758a6472da SHA512 7f42e0bd1555e5f0c938f73a16423481c121b5f226bc4187742d596da95bbd1c25fb287a54eea0cb3687cd8bdd1119d5c1899cb6539e5e101ec26293c2b61430
 EBUILD elasticsearch-api-8.18.0.ebuild 1719 BLAKE2B ae7cb2fe8e9ae06fa1176c9d570f0967d9f31308a388b5a6879b9babb665a2049b74596ce55627d77b94701669fdacd87fd51a384e1c1394c60e17758a6472da SHA512 7f42e0bd1555e5f0c938f73a16423481c121b5f226bc4187742d596da95bbd1c25fb287a54eea0cb3687cd8bdd1119d5c1899cb6539e5e101ec26293c2b61430
+EBUILD elasticsearch-api-9.0.2.ebuild 1635 BLAKE2B 98d39aa3f1a65dfe008fa1a3a7f1c9cc4803dcfae10e6c89c64a991423ee3d99c05524215dc682e18bf0fce0c8efb21f60bc52b6f519c745d2843254e0b23629 SHA512 9b3e265c49b8eedb9d949b7991947738aa1bb26d27bd8fd2ddd667bb2e62900bd031a6e10cede17b586ef1c9d8fe851e9c51c449299108ee9ea9e3a6cdbbd667
 MISC metadata.xml 316 BLAKE2B 6dd63e5f6301f77e0a7eaa6cede387182abac37b0bd81ea6484e7a211318aadcdf8bb86f8b5b40abe82402a99c8ccaf9ca168921d085ddbb70319afd5e256db3 SHA512 28e3e5371dad297baa577034783afa219b4796d6dfbbcd24ad1e90c47f130dbaebdf0a9a76bf38a0b9e7df610d24cdc3a7b92f76bf1ff92b8ed88bcf861de881
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild
deleted file mode 100644
index 1d03ce30f109..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api 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="test"
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch
-		dev-ruby/elastic-transport
-		dev-ruby/mocha:2
-		dev-ruby/patron
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-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
-
-	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
-		-e '/RspecJunitFormatter/ s:^:#:' \
-		-e '/ansi/arequire "patron"' \
-		-i spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-
-	# Create tmp directory required for tests
-	mkdir -p ../tmp/rest-api-spec/api || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.0.ebuild
deleted file mode 100644
index 8860bb3afe64..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api 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="test"
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/activesupport
-		dev-ruby/ansi
-		dev-ruby/elasticsearch
-		dev-ruby/elastic-transport
-		dev-ruby/mocha:2
-		dev-ruby/patron
-		dev-ruby/pry
-		dev-ruby/rspec:3
-		dev-ruby/shoulda-context
-		dev-ruby/yard
-	)
-"
-
-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
-
-	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
-		-e '/RspecJunitFormatter/ s:^:#:' \
-		-e '/ansi/arequire "patron"' \
-		-i spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-
-	# Create tmp directory required for tests
-	mkdir -p ../tmp/rest-api-spec/api || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.16.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-9.0.2.ebuild
index 8860bb3afe64..8968ae36502d 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-8.16.0.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-9.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby32 ruby33"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
@@ -32,6 +32,7 @@ ruby_add_bdepend "
 		dev-ruby/ansi
 		dev-ruby/elasticsearch
 		dev-ruby/elastic-transport
+		dev-ruby/jbuilder
 		dev-ruby/mocha:2
 		dev-ruby/patron
 		dev-ruby/pry
@@ -54,14 +55,13 @@ all_ruby_prepare() {
 
 	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
 
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+	# Avoid tests that require unpackaged jsonify
+	sed -e '/\(pry-\|jsonify\)/ s:^:#:' \
 		-e '/RspecJunitFormatter/ s:^:#:' \
 		-e '/ansi/arequire "patron"' \
 		-i spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+	sed -e '/context.*Jsonify/ s/context/xcontext/' \
+		-i spec/unit/actions/json_builders_spec.rb || die
 
 	# Create tmp directory required for tests
 	mkdir -p ../tmp/rest-api-spec/api || die