gentoo resync : 12.03.2021

3 files changed, 56 insertions, 0 deletions

diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index ff523f53a167..9a68d10980d6 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,4 +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
 EBUILD globalid-0.4.2-r1.ebuild 771 BLAKE2B 1cbb9c4519c92b261ac79a4724e0486673d1d8612be7fa99ddd9ae3433e1efc6d42f9bf3bc4bc7cc52b14417222ef57d9576aef66ba627e92ed6cb0a40bdca0c SHA512 811b75c6fe582e7bd0dae989064370e53c871809ac6b2560f3ca0911854044d7b629a5fe24354003fbddb2b4ef12ac5aedc1aef0ece4b6feb267f084901b7568
+EBUILD globalid-0.4.2-r2.ebuild 822 BLAKE2B 0b8cbd1ad98c957e552d35b1d961fb7089dda0b2702767293d851e2247210b7af3e37f5db67f6b43aed5b755266bdd564f60e533d64fde9f45a977e84f02f0bc SHA512 f3cf8a874c958859b11ef20cbff3fc93972c3efaea4529bb45c074fc13ee19298f9aa236137b39a4651bd01165a7a293a68a561f669f906a3aba117d7b4fee18
 EBUILD globalid-0.4.2.ebuild 774 BLAKE2B 7141669a7747eaa4b73074a8a6bba1154ed997c8691bae1dcc33dbd6fcebad74baf98861884abd9d76a6819e806fe5907e245eeb0d6d89cc6ad5aa4d520b0827 SHA512 87db6271ebb3ff86096dca8a0b650c981261d05cd0c79fb4f06c74f509ce82f3c53d13b836877575361a79074d51bd81de81ee483aadf8692b186f72240ac582
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
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
new file mode 100644
index 000000000000..7cd1c627daf2
--- /dev/null
+++ b/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..8a4c361b25e6
--- /dev/null
+++ b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
@@ -0,0 +1,31 @@
+# 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 ~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
+}