gentoo resync : 06.04.2022

3 files changed, 36 insertions, 3 deletions

diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 7a1be4ba3f7b..83bcb2a5f1dd 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,3 +1,4 @@
 DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
-EBUILD stringex-2.8.5.ebuild 858 BLAKE2B 7438417b30d926b9ddc8e1f15179b92d8cb1309c1b86c108ffa49ccc823dc0533879adb65e35f62ca2b31663b96cf98e9a3790da3d2a65af734c82800f76fcff SHA512 0ab317c6e1a9048f7442742558f7ff620386b9e599c7a58b0744a55f9ad02c5e35a31d949b41dd4f4554ce778d044dbcd9bc73cd077231886d8962b90aa63b80
+EBUILD stringex-2.8.5-r1.ebuild 970 BLAKE2B df2e77cf82068e4d955b5b1c7d8579d48b73cad61a2be28cfe86d900826c0523165ffa15a8b8da54537cbb7a56f4f97742702f3a39eef002f455915a9225b267 SHA512 cf475d4b22fc8f9bd9d163fac744b3601035c5e41189c46ae528226f7cee485e64c6ff8cdfd66c724a76fe82545e3dd462c72c38b2e44aabc80215441b7fc07e
+EBUILD stringex-2.8.5.ebuild 923 BLAKE2B b23daf72180b32fa01f2f61dd577ebc8afbf5f64ed701ee48e12f319e526b7fd695bae133dc34ce5c3f5adc42d5e7d052f66adb73216cf715bb580ad1cf95c77 SHA512 6008c4d672635aeeeb4aaf31dad05d021705747c1209d8e9d64e841bd75af242cf861fecbd5ea2edd0a20fa43f691092fe161eec39e3de8ef70968f5ebe3df42
 MISC metadata.xml 339 BLAKE2B f73c3a0f80358652d11426529ad603b32ea4ef3b882be5d1862ffa94d35fc49a154406d66eff59d61544d6c35a8aaf841f553f689e4fdedffd88337d2be3ce4c SHA512 87d2f65efec8bab706894e788d2c6ac548221684034bc93cf43efc104fd2340188ad8aaf1e9e484ab40475aee38a7bd9227b55f73e8ae31c39548c297bb18d32
diff --git a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
new file mode 100644
index 000000000000..e03217216203
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+# we could rely on activerecord[sqlite3], but since we do not remove the
+# sqlite3 adapter from activerecord when building -sqlite3, it's easier
+# to just add another dependency, so the user doesn't have to change the
+# USE flags at all.
+ruby_add_bdepend "
+	test? (
+		dev-ruby/i18n:1
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		|| ( dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] dev-ruby/activerecord:6.0[sqlite] dev-ruby/activerecord:5.2[sqlite] )
+		)"
+
+all_ruby_prepare() {
+	# Let tests work with newer rails versions
+	sed -i -e 's/update_attributes/update/' test/unit/acts_as_url/adapter/* || die
+}
diff --git a/dev-ruby/stringex/stringex-2.8.5.ebuild b/dev-ruby/stringex/stringex-2.8.5.ebuild
index b462fe523553..57771381bc08 100644
--- a/dev-ruby/stringex/stringex-2.8.5.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5.ebuild
@@ -25,9 +25,9 @@ ruby_add_bdepend "
 		dev-ruby/i18n:1
 		dev-ruby/redcloth
 		dev-ruby/test-unit:2
-		>=dev-ruby/activerecord-3
+		|| ( dev-ruby/activerecord:6.0 dev-ruby/activerecord:5.2 )
 		dev-ruby/sqlite3 )"
 
 all_ruby_prepare() {
-	sed -i -e '1agem "i18n", "~>1.0"' test/test_helper.rb || die
+	sed -i -e '1agem "i18n", "~>1.0"; gem "activerecord", "~> 6.0.0"' test/test_helper.rb || die
 }