5 files changed, 8 insertions, 68 deletions
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 9cc8470a3269..4d9e9499dfe2 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,2 +1,2 @@
-DIST globalid-0.6.0.tar.gz 20908 BLAKE2B 764d25ffb216ad73098c86aaa0ebbef412e6e97ff36beb0ad780e2613e41ed1404b1c93c27332cb3f85d29c774f243bf77caa44c179433057e92320acb8bf838 SHA512 5adc8035a10942318825c348dde8cc988255962b00d96df0f1aa7eebfa316e2637a7f5c79af559661c02837b0690e5e9c4a8cc3f4ee58ac75a6b180397485e0f
-DIST globalid-1.0.0.tar.gz 20916 BLAKE2B 4e932269cce13d319bb44ee8da878fd94d95a82badf67a8f3aa7f5c2064a401e9aaa743cbd763305de65dea242c4e8316c742a8c24e3f1a06b30a799578372f1 SHA512 228c672aa2934a726677e11a90124767f302910791153b68024aa8b44921f2ed1444903ac592c46240f19c9dae25c170405ac2a21fc269c573b066d4cd34b04d
+DIST globalid-1.1.0.tar.gz 21131 BLAKE2B 74f49046e84421df1ae4640cf1ecc23d6c09d4a7176583a4662fa89b031ec9c142c09d13b90dfd40cb23417aec3285a93366f975600b2b52b11a62f62878b313 SHA512 42d6fbdaa4de42da6677d620420c96989ed358197b36f4f0e4b4304a4c8a0f2df7d91c0de84381fb0fec87c213d3ba00335e95d92ae2bce59fe7ac7863219c1d
+DIST globalid-1.2.1.tar.gz 24210 BLAKE2B 0cd47d65b6af78b9201ba4300820f94c126e5e69683b87503967a8b7887b9638693d51a9a1d20277dc5678ca925c567d29ed21dc1805825386fe028ddc475074 SHA512 35f3252afd41226a3dd728238be226a1f2ebb62ca853874fdf35e296dd807603319105117d4585df98cdb577efda9166fc5e5733b7af5bea7073d5c44ddec2c1
diff --git a/dev-ruby/globalid/globalid-0.6.0.ebuild b/dev-ruby/globalid/globalid-0.6.0.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-1.0.0.ebuild b/dev-ruby/globalid/globalid-1.0.0.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
index df3b884797a3..fc707554e48d 100644
--- a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
+++ b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/globalid/globalid-1.0.0-r2.ebuild b/dev-ruby/globalid/globalid-1.2.1.ebuild
index e27c4deae508..e2577102b660 100644
--- a/dev-ruby/globalid/globalid-1.0.0-r2.ebuild
+++ b/dev-ruby/globalid/globalid-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -19,11 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-6.1 >=dev-ruby/railties-6.1 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-6.1:*"
 
 all_ruby_prepare() {
 	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
 }