gentoo resync : 08.10.2021

4 files changed, 21 insertions, 16 deletions

diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 594082b2246c..adb500b3eb67 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,6 +1,6 @@
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
-EBUILD slim-3.0.9-r1.ebuild 1628 BLAKE2B 1fc3c75042d2c270ba06e37c9e41a2f9454b82614289547133985156aaaaabd798ede3c60a635c02bced648ad8a020595e0870fff63225ac85935f6a70a593d2 SHA512 159783c00c5b0f916083850e36f645907adfd97007e284c81fc333dbbd09a06b8f0c11fb95041ba62cce99b65e90e551ad1706555e03778a48eb0361f642375c
-EBUILD slim-3.0.9.ebuild 1604 BLAKE2B b8caa913c512b408d04c99741cc4dadf95af6bf80abfee204997d8d9bba75c7ff65d8227430e80eb3967c1e70eaca1133f984f28be36f46144d91aad06ce9829 SHA512 4545b952f41cd47d43ea6cc3421d7599be2c351bf80c30ceeb92efe2e0255c03aabd210d122d90a0e982a2532ad95e3d17b038e8268551f701bebb7b21db00c9
-EBUILD slim-4.1.0.ebuild 1673 BLAKE2B fea31c503b4e7fb9c7dfec09803c84406fb243c33e77fe0eb74f5090bb24f421fee0b520f52dd7cd3c97890bacf40060ba8a258769535a9c9595ad7c7967d565 SHA512 3fab903654672c62e8c49b1b5a60781dbabbfee636d65abe185d210af02fd20c55d3e28035a45c57690efe6592155faa5530b4a77dd39d2ea054fe5f95f7e4bb
+EBUILD slim-3.0.9-r1.ebuild 1622 BLAKE2B a21f9c749739126147c9c8594e3212f061dec057aff4256a2adedd701cc5f31ac7b5cc3ef65bc6b4730e57842c3cb4dcd7f1d6f6d7fed77dc10c208dcc214520 SHA512 2ea75bcd6076502b53ee4804ba5dca49b88585f712030bcf58e37f74ca1dbf93c5aa3fd318fb6d5a30128707bf2abc70e9156e8a143cf25d7a724abb1e6d3635
+EBUILD slim-4.1.0-r1.ebuild 1756 BLAKE2B 810a241d007f01f4c5c841ce1ce38f7c835c9ac0b007a8ff613ae2b15e7599cd8b8b79ac52d8e387fb7249370b312e3be6aa63030288ec2f99baac46dd00ec70 SHA512 cc53128575e0f8e649aac1761706daeb2a777bebca4b03ac4a18eb01b36a3ad4ea432c7cb208fa7c4c6d3c39e0a186e257f7f827f9a56111046107eaee3c8c05
+EBUILD slim-4.1.0.ebuild 1653 BLAKE2B c706e322135b0a78d2bc2fcbeb0fbaadf8c44bf4635850043b3281c560f7075ef1e8692cac6ca7df3a28f88bc176b068d1ee9e745fe88a50f89ae7f8dab62bc4 SHA512 2be3514f16ee6fd78dc2a28f2b88c737011acc7a8abaf9281cd36e2ceb3eaabdb579bf0d230cd67a88401bc2486b22037d7a31b77b5564dd1e4cee1eeb369624
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/slim/slim-3.0.9-r1.ebuild b/dev-ruby/slim/slim-3.0.9-r1.ebuild
index 28b1bf6d333f..8c301dc90bf4 100644
--- a/dev-ruby/slim/slim-3.0.9-r1.ebuild
+++ b/dev-ruby/slim/slim-3.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-4.1.0-r1.ebuild
index fc9e8312c7df..d1f1920d1e35 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-4.1.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
 RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
 RUBY_FAKEGEM_TASK_DOC="yard"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -17,16 +18,17 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
 IUSE="doc"
 
-ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:*
-	>=dev-ruby/temple-0.7.6:0.7"
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+	>=dev-ruby/temple-0.7.6:0.7
+	!!<dev-ruby/slim-3.0.9-r1"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
 
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
@@ -34,6 +36,9 @@ all_ruby_prepare() {
 	# This sinatra code expects tests to be installed but we strip those.
 	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
 
+	# Add missing include, bug 816573
+	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
+
 	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
 	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
 		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
diff --git a/dev-ruby/slim/slim-4.1.0.ebuild b/dev-ruby/slim/slim-4.1.0.ebuild
index 956b9c862858..a618317cb6de 100644
--- a/dev-ruby/slim/slim-4.1.0.ebuild
+++ b/dev-ruby/slim/slim-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 
@@ -28,7 +28,7 @@ ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
 
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+ruby_add_bdepend "test? ( dev-ruby/redcarpet )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die