gentoo resync : 15.12.2019

4 files changed, 2 insertions, 52 deletions

diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index b27e9cdd484d..be5892a5bd98 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,9 +1,5 @@
 DIST backports-3.11.4.gem 157696 BLAKE2B 0c341380e350a61fac7ad09a2425598214945f1ecb26abf8f17494a2fc6ee256ee20517555bfde433cd2f564fd1148211c2cfd1c16d21ecbe574492837f610ef SHA512 bbc2afae9b40d2e3b14e46321200fb5e8290a2494a86187939e8e51b4a960b62aec55bee3ee37da4ece3d575a50653e63b950915eaedff745125ab39926765ad
-DIST backports-3.13.0.gem 151552 BLAKE2B cd36caf40cff2d6a3274a7a419baf27066a1ec26f60099d51c89e27a9c33194f23486763e8fb11649d44349feb51d934f79b877d4a4ef26ccd84a34f98b0bd27 SHA512 9e0bed5a0b03160e88d19b70848cc843a1a35fbc53dd2249c5b2f3adb43ce9f752cae06f955e50c96f2ac67cd5df3b3426e94f00c158cac3746401d603d6f3b8
-DIST backports-3.14.0.gem 151552 BLAKE2B f178ad697317aef22bed9e74552e1a819e1d73d0f816911ee917b78dbaa4d3ea93631ff95f6f95c4c1bf57e6f0bf21dac1313601f28afbd6762542f19c15d4e2 SHA512 405b6edf024ef60e7cda7e9ad2ef9d39f3c1b2ab61c910afabc707047e8b31b7319c9d8f301f7386c2ce436af31588e62a879b7c2f9d440b2d63c7795aa11633
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
 EBUILD backports-3.11.4.ebuild 642 BLAKE2B 51dfa1acd8c8ab135b1828e9db1b6cb16f1e22c581c5b0923caab204a30972aa5f20a04a3bee894c7e95d10da106f7fbd94df7a85d0b95f94c88f7c92c5e7309 SHA512 2c4ac0b04f769c5f447aa7066771e850c62dbc953ea434f46ff8ac2ba2e2bfb7becc85423c2d7e210447e2e3669640b5810bbfc944bfb73e8beb6ec4995852a8
-EBUILD backports-3.13.0.ebuild 659 BLAKE2B caf245aa831fce0c2c811805a4d1d81c23217f3ed55caeebd3b9673de8c28ec8ed336dde63dc93c9a0defb7ff270a38e19742d97d0956e2685d1d884835b4fa3 SHA512 a27b0af32008737242927cc8a7467c98882d50a00d2dd2eaa5d26b6eb7c09c207dbec701036ebd07d3ddddd1d3e7f23c17705463733e894ba526ba4cf4cddf34
-EBUILD backports-3.14.0.ebuild 659 BLAKE2B caf245aa831fce0c2c811805a4d1d81c23217f3ed55caeebd3b9673de8c28ec8ed336dde63dc93c9a0defb7ff270a38e19742d97d0956e2685d1d884835b4fa3 SHA512 a27b0af32008737242927cc8a7467c98882d50a00d2dd2eaa5d26b6eb7c09c207dbec701036ebd07d3ddddd1d3e7f23c17705463733e894ba526ba4cf4cddf34
-EBUILD backports-3.15.0.ebuild 659 BLAKE2B caf245aa831fce0c2c811805a4d1d81c23217f3ed55caeebd3b9673de8c28ec8ed336dde63dc93c9a0defb7ff270a38e19742d97d0956e2685d1d884835b4fa3 SHA512 a27b0af32008737242927cc8a7467c98882d50a00d2dd2eaa5d26b6eb7c09c207dbec701036ebd07d3ddddd1d3e7f23c17705463733e894ba526ba4cf4cddf34
+EBUILD backports-3.15.0.ebuild 650 BLAKE2B 1f811024e25030a1d709307217506cbb64567cbab1adf7d63ed22ccbbbe3ac154c51de1e4327c84eecec2cb24e157053ebfc8cf7e35a6769bc8f6b84d69be94e SHA512 e5c53fcf6e051c5bb413ac1193e17751b4895c2ed2017d54bf867e6ac0fb18b18ac45a5d081be9ba0c37806edc03f41ec1fd987752536ded4c561dd6b54d9085
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.13.0.ebuild b/dev-ruby/backports/backports-3.13.0.ebuild
deleted file mode 100644
index 5a902a203bec..000000000000
--- a/dev-ruby/backports/backports-3.13.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-}
diff --git a/dev-ruby/backports/backports-3.14.0.ebuild b/dev-ruby/backports/backports-3.14.0.ebuild
deleted file mode 100644
index 5a902a203bec..000000000000
--- a/dev-ruby/backports/backports-3.14.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-}
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
index 5a902a203bec..3c71061ced0b 100644
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ b/dev-ruby/backports/backports-3.15.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {