Merge updates from master

8 files changed, 114 insertions, 5 deletions

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 8198793a6a85..1d3e39f22bfc 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="4.30"
 
 BDEPEND="
diff --git a/dev-python/build/build-1.2.1.ebuild b/dev-python/build/build-1.2.1.ebuild
index c50be1f5770d..fe0e635e268d 100644
--- a/dev-python/build/build-1.2.1.ebuild
+++ b/dev-python/build/build-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc64 ~sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/uv/uv-0.1.24.ebuild b/dev-python/uv/uv-0.1.24.ebuild
index 5eaf16db71da..ffb629683410 100644
--- a/dev-python/uv/uv-0.1.24.ebuild
+++ b/dev-python/uv/uv-0.1.24.ebuild
@@ -41,7 +41,7 @@ LICENSE+="
 # ring crate
 LICENSE+=" openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="test"
 PROPERTIES="test_network"
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..ae5aff4c339e
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="brotli +parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	brotli? ( dev-ruby/brotli )
+	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+	oauth? ( >=dev-ruby/simple_oauth-0.1 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
+	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	>=dev-ruby/brotli-0.1.8
+	dev-ruby/bundler
+	dev-ruby/addressable
+	>=dev-ruby/rake-12.3.3
+	dev-ruby/webmock:3
+	dev-ruby/json
+	>=dev-ruby/multi_xml-0.5.3
+	dev-ruby/rack:2.2
+	>=dev-ruby/rack-cache-1.1
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash_alt-0.4.3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
+		-e "/addressable/ s/, '< 2.4'//" \
+		-e "/rack/ s/< 2/< 2.3/" \
+		-e "/rack-cache/ s/, '< 1.3'//" \
+		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/safe_yaml/ s:^:#:" \
+		-e "/webmock/ s/2.3/3.0/" Gemfile || die
+
+	# Avoid unneeded dependency on git
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	# Avoid safe_yaml specs since they are broken with newer ruby versions
+	# and safe_yaml is not mandatory for using faraday_middleware.
+	rm -f spec/unit/parse_yaml_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index ecdf2b73ae7e..269c5b406a8b 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1 +1,2 @@
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
+DIST ruby2ruby-2.5.0.gem 29184 BLAKE2B f1c8a8e904bf93a07e4b57c82bddd9b2f80b286b91ca5973375700f8a853f3a08731d5a067a25eac16cd2983f7bbceec7a3996bbf8d4fd8527322b439291f575 SHA512 4b968400a40ae6eed7528c848d8d78dd4e1f1efa63481423eb82309d1dc884416a7aac301f84c945f744e898200bb83cd1be39e10c4ceec530fc751f8bf2e4ba
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild
new file mode 100644
index 000000000000..1fce1cd7cccc
--- /dev/null
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates readable ruby from ParseTree"
+HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/sexp_processor-4.6.0:4
+	>=dev-ruby/ruby_parser-3.1:3
+"
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
+
+all_ruby_prepare() {
+	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sprockets/sprockets-4.2.1.ebuild b/dev-ruby/sprockets/sprockets-4.2.1.ebuild
index c815cab62643..6043672b9d83 100644
--- a/dev-ruby/sprockets/sprockets-4.2.1.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# 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_EXTRADOC="README.md"
 
diff --git a/profiles/default/linux/x86/17.0/musl/package.use.stable.mask b/profiles/default/linux/x86/17.0/musl/package.use.stable.mask
new file mode 100644
index 000000000000..c021f45d8508
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
+# Does not compile with musl-1.2.4
+sys-devel/gcc sanitize