gentoo resync : 12.05.2022

6 files changed, 2 insertions, 121 deletions

diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index e60579c17f6e..fa29c003c167 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,13 +1,6 @@
-AUX globalid-0.4.2-integer-time.patch 778 BLAKE2B 5414dffd32180cc6306f26076583d804ed4c26bde10c941944647e859383516ba2cfc5f68175ad11bb97fc9098e71cd20b8dcf462c22337abd49a97bfbc6923f SHA512 2c7cbbfc3c1a8740721f85647d504d947bf9911897429ae2b006c983dc39c03bb02a11ec2e695b8c4f5157c1d78aa8a96f3800b717e37e3c2871340560170ed6
-DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-DIST globalid-0.5.1.tar.gz 18978 BLAKE2B bf13df8d8a5ce21f85c5bec3c5d0b690ceea94a51b0fbfe9bcb7dd9fe55d8abf2c5a36589147a72b6a68d1263afa130a2acff7fbe0075599e6a67fc416ac20a9 SHA512 998478876781b70cadb6c6ce0624443033f6e29ce9cb7ce145f5e3f288b7998267c63aa1b43ce0d3f7c5fc378d7e148ee11b9d88b63665fa951efb1cc72ad93e
-DIST globalid-0.5.2.tar.gz 19137 BLAKE2B 8e01b965b396aa04149f83b30066ae99a50970fb2de97c99e09c422f4ccd59325bd7697de6a0873d3876cee9e1ead7ff0715233eaa3abf03b10cc1ed7168e4af SHA512 4954b9f558048eb143d4a9d1b041dc438f5852779340e11d93840e540f1c030714da2412e9eb2777d3eaafc887cc94c43ffabdc0060cc809a033e7e6352fb4a6
 DIST globalid-0.6.0.tar.gz 20908 BLAKE2B 764d25ffb216ad73098c86aaa0ebbef412e6e97ff36beb0ad780e2613e41ed1404b1c93c27332cb3f85d29c774f243bf77caa44c179433057e92320acb8bf838 SHA512 5adc8035a10942318825c348dde8cc988255962b00d96df0f1aa7eebfa316e2637a7f5c79af559661c02837b0690e5e9c4a8cc3f4ee58ac75a6b180397485e0f
 DIST globalid-1.0.0.tar.gz 20916 BLAKE2B 4e932269cce13d319bb44ee8da878fd94d95a82badf67a8f3aa7f5c2064a401e9aaa743cbd763305de65dea242c4e8316c742a8c24e3f1a06b30a799578372f1 SHA512 228c672aa2934a726677e11a90124767f302910791153b68024aa8b44921f2ed1444903ac592c46240f19c9dae25c170405ac2a21fc269c573b066d4cd34b04d
-EBUILD globalid-0.4.2-r2.ebuild 828 BLAKE2B 1f2fb67010d33eab7831a911f7a7cbd95a056ceb214b6741c38cfa6932ab2fc4513735990c29edab19392b454fe2af9292c3f872204059d3d6c6c95d3cf0feb8 SHA512 1a38d7cf266efdd9938fcf0b739fbd67bc4bab4586fa2411a1db7d07e7f622d19ea7bc264a422f26b5cd3726a14a5861362b9e05afe4c174cd81b3b06d175c7b
-EBUILD globalid-0.5.1.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
-EBUILD globalid-0.5.2.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
 EBUILD globalid-0.6.0.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
-EBUILD globalid-1.0.0-r1.ebuild 759 BLAKE2B f4dd16b81b1f930dbd84c1733781980a2ed67f162df4e0ac0e9816b2b30f9a44f1d1755ec2ac3e9d944ca10b5b42b73fb6e29208f7ec9ce676a1ff7fab851cc9 SHA512 f02b10a70d9c33f5312c1efbf6038382d601b55778435f310938ea7c504db91f8b32a997b2d20efbaff85f52788a1871b1ee1b6c4f7a8660e5f89c139353a071
+EBUILD globalid-1.0.0-r1.ebuild 771 BLAKE2B 9f7640b12950f54f6a5c9d9d9e868716193c6ba8d02c2b53f2678d9979447b4cb2375a81782584986b4c8fa163e0d3fb1f58be8d97f644de2a2e6fe04f6ecc8f SHA512 05c65d1191b876d4dad02de9e06c752badbb21fbfcb52e7a1418824a7bfc094bb4435f33ecbe46030c66c066990092d4fe8fb324b5f275cf1b2f1aaa50ffb38c
 EBUILD globalid-1.0.0.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
 MISC metadata.xml 341 BLAKE2B e15397f0d2b0ce51ddb3da642f55ca1ed8ce12d69621757ac84ac8649108faa27948164eb1adcd1f5e1aee48b5cb2d01a2c75faf93285bb06c33841f04805600 SHA512 330c1a59a0a77ee5e02a685fb2b6884c16f99028960c308319077b2815a0b86eb4e320bbcae48fc4efadf80931da56ab2163c8b51b544d18c6aab896053c5733
diff --git a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch b/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
deleted file mode 100644
index 7cd1c627daf2..000000000000
--- a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1aec708b98d8657ef241d02813960e8af8ebd952 Mon Sep 17 00:00:00 2001
-From: Eugene Kenny <elkenny@gmail.com>
-Date: Sun, 26 Apr 2020 17:35:41 +0100
-Subject: [PATCH] Require time core extension for 1.year
-
-Since 39ab83a43a64b339739c6e8c7ab24bb1325204ed this file uses `1.year`
-without requiring the Active Support core extension that defines it.
----
- lib/global_id/railtie.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/global_id/railtie.rb b/lib/global_id/railtie.rb
-index edc90d8..096c20b 100644
---- a/lib/global_id/railtie.rb
-+++ b/lib/global_id/railtie.rb
-@@ -5,6 +5,7 @@
- require 'global_id'
- require 'active_support'
- require 'active_support/core_ext/string/inflections'
-+require 'active_support/core_ext/integer/time'
- 
- class GlobalID
-   # = GlobalID Railtie
diff --git a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
deleted file mode 100644
index 556a7328ac76..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 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=""
-
-PATCHES=( "${FILESDIR}/${P}-integer-time.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.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-0.5.1.ebuild b/dev-ruby/globalid/globalid-0.5.1.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.1.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-0.5.2.ebuild b/dev-ruby/globalid/globalid-0.5.2.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.2.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.0.0-r1.ebuild
index 17c165a2b331..c685e133c73d 100644
--- a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
+++ b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+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 )"