diff options
| -rw-r--r-- | app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild | 2 | ||||
| -rw-r--r-- | dev-lang/ruby/ruby-3.1.4-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/bundler/bundler-2.3.26.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/rdoc/rdoc-6.4.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/rubygems/rubygems-3.3.26.ebuild | 2 | ||||
| -rw-r--r-- | eclass/ruby-utils.eclass | 4 | ||||
| -rw-r--r-- | profiles/arch/sparc/make.defaults | 4 | ||||
| -rw-r--r-- | profiles/arch/sparc/use.stable.mask | 4 |
10 files changed, 9 insertions, 17 deletions
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild index 45fe9a677c06..abc16ce7a317 100644 --- a/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild +++ b/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-admin/eselect-1.0.2" diff --git a/dev-lang/ruby/ruby-3.1.4-r2.ebuild b/dev-lang/ruby/ruby-3.1.4-r2.ebuild index 83f48a8b358b..b24615a56441 100644 --- a/dev-lang/ruby/ruby-3.1.4-r2.ebuild +++ b/dev-lang/ruby/ruby-3.1.4-r2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/" SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" LICENSE="|| ( Ruby-BSD BSD-2 )" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk valgrind xemacs" RDEPEND=" diff --git a/dev-ruby/bundler/bundler-2.3.26.ebuild b/dev-ruby/bundler/bundler-2.3.26.ebuild index 08769db3cabb..91d40972c38e 100644 --- a/dev-ruby/bundler/bundler-2.3.26.ebuild +++ b/dev-ruby/bundler/bundler-2.3.26.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler" LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" ruby_add_rdepend virtual/rubygems diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild index 81d0ffb36b91..e0dc4a3dcc51 100644 --- a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild +++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean" LICENSE="MIT" SLOT="2.6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/test-unit )" diff --git a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild index c8913e0a5586..f4d12f10a2cb 100644 --- a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild +++ b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/" SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2 Ruby-BSD )" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" IUSE="doc" diff --git a/dev-ruby/rdoc/rdoc-6.4.0.ebuild b/dev-ruby/rdoc/rdoc-6.4.0.ebuild index b5219a2cbb81..b37e273ea0f0 100644 --- a/dev-ruby/rdoc/rdoc-6.4.0.ebuild +++ b/dev-ruby/rdoc/rdoc-6.4.0.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/" SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2 Ruby-BSD )" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" IUSE="doc" diff --git a/dev-ruby/rubygems/rubygems-3.3.26.ebuild b/dev-ruby/rubygems/rubygems-3.3.26.ebuild index 936998369e32..49f7e5e022fc 100644 --- a/dev-ruby/rubygems/rubygems-3.3.26.ebuild +++ b/dev-ruby/rubygems/rubygems-3.3.26.ebuild @@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )" SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" IUSE="server test" RESTRICT="!test? ( test )" diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass index eef2aba2fb99..c4b6f1502f8a 100644 --- a/eclass/ruby-utils.eclass +++ b/eclass/ruby-utils.eclass @@ -33,10 +33,10 @@ if [[ ! ${_RUBY_UTILS} ]]; then # provide for a better first installation experience. # All stable RUBY_TARGETS -RUBY_TARGETS_PREFERENCE="ruby30 " +RUBY_TARGETS_PREFERENCE="ruby31 ruby30 " # All other active ruby targets -RUBY_TARGETS_PREFERENCE+="ruby31 ruby32" +RUBY_TARGETS_PREFERENCE+="ruby32" _ruby_implementation_depend() { diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index bc314dc140cc..852a8fb95b8e 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -42,7 +42,3 @@ VIDEO_CARDS="fbdev mga r128 radeon" # Enable USE=libtirpc by default, to ease dependency resolution during # the stabilization of glibc-2.26. Bug 657148 USE="libtirpc" - -# Sam James <sam@gentoo.org> (2023-05-29) -# Temporarily use old default until bug #907377 is done for this arch -RUBY_TARGETS="ruby30" diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask index 6e7bdf7a7d54..868e5ba4559f 100644 --- a/profiles/arch/sparc/use.stable.mask +++ b/profiles/arch/sparc/use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Sam James <sam@gentoo.org> (2023-05-29) -# Temporary mask for bug #907377 -ruby_targets_ruby31 - # Sam James <sam@gentoo.org> (2021-04-27) # Clang and friends aren't (yet?) stable on sparc clang |