Merge updates from master

11 files changed, 20 insertions, 162 deletions

diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 5a9dc4704f75..94e9acdf9a27 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,2 +1,2 @@
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
-DIST cx_Freeze-6.14.2.gh.tar.gz 1647508 BLAKE2B 7b14a75a21dbeb360c61609e9ac018c6e8bba6ffb357781cc2d8d27cd3cc27e054587845d117ce25912cd57b3fe83c037e5b76f55cd593890f66056ff18039df SHA512 40158afb0e2291c4a2f161eb2ef733fc8a2107c620dcf87f812bb0f6b81bfd06e3ec1b4108333c7d43a4855605621745395e765a825a68f3dd62b3edc21fc3c3
+DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
index 93c422b0d59a..cb720dc27e68 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
@@ -55,3 +55,7 @@ EPYTEST_DESELECT=(
 	# new setuptools?
 	tests/test_command_bdist_rpm.py::test_bdist_rpm
 )
+EPYTEST_IGNORE=(
+	# windows-specific test
+	tests/test_winversioninfo.py
+)
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 1904f423a997..c117a5b8af0e 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,2 @@
-DIST rack-2.2.4.tar.gz 278632 BLAKE2B 2d12a9c1e239590a4aedea5f3bb4c171b6032255658688a151e665aa1cb33dee17754c7b2736f8f1725c70b8344f5f6664cace8c4d4cb4e9f6f2ee1c7a3117c0 SHA512 aef54a06efce54d58e600829bbf550162bf68fe710b61b2b81022b2a8581819fb575e03992f493f11ed5f3391349f21cd142f6acc5b6017ec4c8e21cb17e4874
-DIST rack-2.2.5.tar.gz 278648 BLAKE2B 8778364969506e8fdb152c5f88ab4b0b07c8764bf2cff9aee82ab6ca9958669038100816804215a09947a15b8ce06597c9204d4f2b34218178c14dfc8298ac48 SHA512 bc0e33d7bab700e2a5ad05aa1089d261b3f78a6c456ff14def57645df853915057ae9d42fb5ecd72989737a2882dcbdefe7af4939020efdde1ada38a4cf274e2
 DIST rack-2.2.6.2.tar.gz 278839 BLAKE2B 30cb5607bba97ef3a6a20f917b82c46de734cd0c248ae20bf3af266814e32250cf6cd77aea49de28a24651335cdc888385968cb4b9937843ffd99cad2283e896 SHA512 73202990bad9e34da84c45f70c71c45bd6291960d58a04ee4b013835d5c5a8a066f36d31275913744a63cb9836c5071bb237b7f613a717794f49236c195107a8
-DIST rack-3.0.3.tar.gz 786619 BLAKE2B 471c76e05dc52809e1cd95463ffe7fd2b9bbb0f0d97783d5cbea728cad1cf8272b7045f7329aec6efc9d3881c87b1e3a6e3eb376de015eb6e1188c37668531c1 SHA512 9b5860c62191df983a76aacc0c765d6275aff6d0d146fe0f2f1361e9ad6b76115ba0cbb94682bf9bdede8170e086b67018d362044099c91ea3dc015944d1b444
 DIST rack-3.0.4.1.tar.gz 787073 BLAKE2B 532bd36dcb521da8387d464dca0983417a9a89a4d365e5652894003e38ffdf5939a903510be73aaf607c6a695909058aaef311967e6d66c525b26af3ea4c5e82 SHA512 6cfb35d78901fdb5e7b4571eb6b37b035014cfea705aeff280a73930793e53cd6d2d9b51ae86803567884b5509af358c95687eecc222a5df61dc80d0ada019af
diff --git a/dev-ruby/rack/rack-2.2.4.ebuild b/dev-ruby/rack/rack-2.2.4.ebuild
deleted file mode 100644
index 8845730cf3f3..000000000000
--- a/dev-ruby/rack/rack-2.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-
-	# Avoid test failing due to security version number usage
-	sed -i -e '/support -v option to get version/askip "broken with security version number"' test/spec_server.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.2.5.ebuild b/dev-ruby/rack/rack-2.2.5.ebuild
deleted file mode 100644
index 79462f5c22de..000000000000
--- a/dev-ruby/rack/rack-2.2.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-
-	# Avoid test failing due to security version number usage
-	sed -i -e '/support -v option to get version/askip "broken with security version number"' test/spec_server.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-3.0.3.ebuild b/dev-ruby/rack/rack-3.0.3.ebuild
deleted file mode 100644
index 7aee70d2e0f0..000000000000
--- a/dev-ruby/rack/rack-3.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 3f7683f95648..c3a52f5a7406 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
-DIST patch-6.1.11.xz 717696 BLAKE2B 57033764612efc0a173f501036ccd6cc4fb1ddb452f40d3d81cfea7c3d918174a6b242490fbb8b0c66eb91c4e6503b820b0e77ba12c3beeea95b492b662f3466 SHA512 3ea57aa49805a2ed9521b11237e70e2df68cff5c3215e5e047ec292daaa1caace6747219fbec6cdef84b099d607bc59ac7f9a7e72189fc269945586ee16ab899
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.2.ebuild
index c9df3f9793cf..c9df3f9793cf 100644
--- a/dev-util/perf/perf-6.1.11.ebuild
+++ b/dev-util/perf/perf-6.2.ebuild
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 80ec269eaf8b..d34ce47706ad 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @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="ruby27 "
+RUBY_TARGETS_PREFERENCE="ruby30 ruby27 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby30 ruby31"
+RUBY_TARGETS_PREFERENCE+="ruby31 ruby32"
 
 
 _ruby_implementation_depend() {
@@ -92,6 +92,10 @@ _ruby_implementation_depend() {
 			rubypn="dev-lang/ruby"
 			rubyslot=":3.1"
 			;;
+		ruby32)
+			rubypn="dev-lang/ruby"
+			rubyslot=":3.2"
+			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
 			rubyslot=":1.8"
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 073c161ed52c..eae0b1d0df9f 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Hans de Graaff <graaff@gentoo.org> (2023-02-27)
+# Depends on virtual/rust
+dev-lang/ruby jit
+
 # Sam James <sam@gentoo.org> (2022-12-26)
 # Unkeyworded dependencies
 dev-util/diffoscope opendocument pascal pdf R
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 2ae021013873..721deb5a7efc 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,9 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org) (2023-02-27)
+# Depends on virtual/rust
+dev-lang/ruby jit
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
 # dev-cpp/glog fails tests, needs checknig