gentoo resync : 05.12.2021

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 4a2cc626d6be..62be7073294c 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,4 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1093 BLAKE2B 987a269b2a58579ff5e3b939559c5ccf30e25fc117c219576730454d428510d118335c727bb92180b1b7a43ea26d529d27543ccccfa4729a2b1bc70511bfcac4 SHA512 4e8e796e311b5654f3e5736d6bdb4bd4e2695be5d1dae1290c950953e466de8b0e234001d00b1e49b1aeae13fbe5ccaedc1a7ff76f281bd0390b0eb05f1da91d
-EBUILD erubis-2.7.0-r3.ebuild 1106 BLAKE2B b1144e4c09b095e4ec8a033429e9f8a8912bca3487829417d6093503463f0b170679cb4296da2e0c0dba7e45aa2312c38e82f1cbf644de4995c1c3246dbbe94d SHA512 ae1b85e4310fc0f933437831abfdc4fdd970805fa5716aa6d9f20c4174113206b6839e004dfcf6ba79af26a1a00f77cf09d64f5b998826233a67d0bcdf9cce91
+EBUILD erubis-2.7.0-r3.ebuild 1100 BLAKE2B 74405a8073fb3a523ad3f772e9b2b4132a797875445e1086d79cbba467efad412b0d00edb9cd8b483c28e4d9f4379ee0cefea9101ef1275ef3dd0e68e0e07db8 SHA512 69a93a894424af4ecf6191bec906bde42b9da00469d3557afb9248247c78d7033a8f5d629710718ea26e84db2dc8fc4404ca88ef025c91be4d09b3d88e9be899
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
deleted file mode 100644
index 5b0a70c6991d..000000000000
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Erubis is an implementation of eRuby"
-HOMEPAGE="http://www.kuwata-lab.com/erubis/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
-# Tests are not compatible with Psych as YAML module.
-RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/abstract-1.0.0"
-
-all_ruby_prepare() {
-	# These tests now fail due to other ordering and fact that sym
-	# are now returned.
-	rm test/test-users-guide.rb || die
-	sed -i -e '/test-users-guide/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
-}
diff --git a/dev-ruby/erubis/erubis-2.7.0-r3.ebuild b/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
index 0b9a3e4d769d..32a19d941df1 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201