gentoo resync : 29.12.2022

5 files changed, 55 insertions, 43 deletions

diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 7c4541f1590c..416da2f4a344 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,13 +1,13 @@
-DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
 DIST rbs-1.3.3.tar.gz 632597 BLAKE2B 810f090800ecb9507c07de6991e45a089fbaaa677337e924234ce7487a38a51ec5a3966c670c9d828ad351ea921c0d245c66cf0c497b672b3c2fdb04ac99578a SHA512 084b6e84858b2a947181602cdd707b1812486be86787afaaa18894b5ea71ad3b1438e1addb995a0dc24b65cd81f4f844b77f7a6fcaf42a653f718b39ff7c371b
 DIST rbs-1.5.1.tar.gz 672987 BLAKE2B acdaa88627ab79626cb391f5c7dd040da648c9c0cd2e7a7ed697075436d6215edd444dea6079c0319051b326e8823d8151376193f7aa34ab10b533560ecd5987 SHA512 2104eb5ae023fec317ed5cb498a283ac8d3831360822f8917d89ea522a3e5f3479da7d4c57e878a6be6064debd7f3818e1367d4b12f0cd487d7b019f80096d9e
-DIST rbs-2.2.2.tar.gz 963888 BLAKE2B ae6e66b496501b6eb2db7b8e6d265691ab8e95193b434b1ecdc8802de6a7e1f505f4d944cf67d1ec00bc9fbb5da436e74813e7dfea07d774ded609ae2b246bc1 SHA512 3eb2ae59641b66dc6d7757074ea8a77e7621941fc0553f1b83852d507ec058c0738992931df587c38de11ecae35d994149cbfe5e5d268449f2f017f22c9955a5
 DIST rbs-2.3.1.tar.gz 977367 BLAKE2B da15dc2bbf2a10f05c3a4a86db774f9a30b8d9df28137bba363dc2e57c800fe19848cec481df7fd0df4070e5f94ac6c2aa7e5c8e978197dfac1a265790e924bc SHA512 69a052225b055c24c7bc2ce6a44f8541c099ab5bf3ee5eee1958b83a9a666328fc24e39bfa79e3eb76cfcf360eeada3fc5cf1fd333e34290164fff3abb04ffcd
 DIST rbs-2.3.2.tar.gz 977459 BLAKE2B d33984c03a962f4d72989b5b665e7e256f8928e86fa15162a8df549259a832b7898da62c949ae5bb06ed3da82d3179c3e350a392e6177d15a26600debea82539 SHA512 1ae9318265f47232bac77ca966fbf7c2b1b7a1eb3c1070258812f697c633026527c411d2e2319f3c16a3318307cf1cd0983967ba0cf2cae1f9f37a607b6aa92e
-EBUILD rbs-1.2.1.ebuild 1188 BLAKE2B e6eb0b7b25631b6d65779d737381764d6a856d5aaf2369f695fd8d2330eb3f4f5edd67d5dc0becf79581b768f68df19c7420b5bb00cc12e7aa766b8d4f88036e SHA512 21a63c61d4078bbffbed89086551f649398609e1b655f8afc8ab78641a7a0dd978b9dfc37867e2d58ad42606549e90e6d68185ff5e6b4d8059175aec3bb77b30
+DIST rbs-2.5.0.tar.gz 983245 BLAKE2B 16f146012f9c5ada7e641f76d07b52953a6591bb6ff6ae7e1a26c6839cff2e3bd4d242f5ab5cca97a5f1626b06713d72f6f5e5f70c742414c9e163d775debb20 SHA512 5f44ab87b1deb054cec3db1e63b1752d417902b8a78146e59df6389fddb73a94e5243c56512857fdb0b1233c9f29f532931ac11e2014855c8d8568cb1b12cbd1
+DIST rbs-2.5.1.tar.gz 983686 BLAKE2B d0feb4f173e2d1dd76d93309279fc75f9ed992ead2c144d69905e6acd139c709535ae29d78e85787f082821734a6448446e746791922e4322c55dc446a38ec06 SHA512 079778ad36db8f096e33d04a460b03d03c6b3616a2066e40a3aa06615d51265d8bfa7669a31463ce46bbcb16dc74ed8a24ba280b46c24f25b2327f5c8a8ae891
 EBUILD rbs-1.3.3.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-1.5.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
-EBUILD rbs-2.2.2.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
 EBUILD rbs-2.3.1.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
-EBUILD rbs-2.3.2.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
+EBUILD rbs-2.3.2.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
+EBUILD rbs-2.5.0.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
+EBUILD rbs-2.5.1.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-1.2.1.ebuild b/dev-ruby/rbs/rbs-1.2.1.ebuild
deleted file mode 100644
index 6602e2b93a34..000000000000
--- a/dev-ruby/rbs/rbs-1.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-2.3.2.ebuild b/dev-ruby/rbs/rbs-2.3.2.ebuild
index 0380669086c4..038f8bc8983e 100644
--- a/dev-ruby/rbs/rbs-2.3.2.ebuild
+++ b/dev-ruby/rbs/rbs-2.3.2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rbs/rbs-2.2.2.ebuild b/dev-ruby/rbs/rbs-2.5.0.ebuild
index 0380669086c4..038f8bc8983e 100644
--- a/dev-ruby/rbs/rbs-2.2.2.ebuild
+++ b/dev-ruby/rbs/rbs-2.5.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rbs/rbs-2.5.1.ebuild b/dev-ruby/rbs/rbs-2.5.1.ebuild
new file mode 100644
index 000000000000..038f8bc8983e
--- /dev/null
+++ b/dev-ruby/rbs/rbs-2.5.1.ebuild
@@ -0,0 +1,48 @@
+# 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_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}