gentoo resync : 22.01.2021

4 files changed, 46 insertions, 20 deletions

diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index df22085f74d8..a3db8ede4b72 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,10 +1,13 @@
-DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
 DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3a43f9dbef29c3dce651974a4c9bde200085632cc7f4fb0957aae42a7cbaae28c8cab91986dacf1f52f1deb SHA512 bbee12a30362d1dfd8a7de4258d6623d08df91a38ba1e869f9a5878871d8fd145221f8eaa99fcb72e0c1404c9c31df37a5a1dbf4a94610cb3381566cc6c45516
 DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef
-EBUILD bundler-1.17.3-r1.ebuild 937 BLAKE2B 8ca548e66814bc848ee7e573a9c42d12a606d9f5e51af8625e2da279153e30f43dd22166be2b82ff75707bef6f38dfc085c5be32f04ec2867321dd9a310d6bf9 SHA512 5e17118352330d5add47e1462245aaaa7a938575aea543f9151ec0964fcb0427788a05d835c13defec53dd41c6111ec86358d677e235069be5b29e222dcb05e3
-EBUILD bundler-1.17.3.ebuild 912 BLAKE2B f0ec5223d9461d85eb381a6a7cab0e8eddad44c8b2f99222bd6301b3f64236a1b64ae14cd60152762080780fca44a863a3b97bd1940365791dfafb3a1d88d306 SHA512 48836a1da9702079dc72c11f8f88c5422b1516f7cd427d4d6619e138a18f70a3ceae84957e724c9ead5240588318731bcdfd8da3135cffe657696b7e04c93263
+DIST bundler-2.2.4.gem 386048 BLAKE2B 7a2cec046b75ff371df9b563a81f48c8a2a3782f75ec4868869b4b2fda5e117b6cd38daf6a566ec1201fe7a5f6b8b2c4dbe0cc552d2a63bcb4e5e9f53c710046 SHA512 f3c988278746896da276e5af5cf046c5910962c2022fc8d37ab00db1a81a69d77a1fd21fabd8a1d086891d18bfb4ac321dbb60f830b139aa7c3192ea879b4cf8
+DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742
+DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504
 EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
 EBUILD bundler-2.2.0.ebuild 931 BLAKE2B 45ea33bc46297106a0cf1cbf84426c45e4b7699126bec073a7312c3b4e7a9cc968c9b008ea0635b2c3fdabc57856b4b7e23285e4bbf65305d5752e685f007c1f SHA512 bf4c48c4944bd02dcbe255a8f23a2df6bd24ceb8ccabbb1bcc8ab8bb36fb656ac2672e570261178576e57fdd75a764ef195f67e7bd1c81d91fbb5046d51044f7
 EBUILD bundler-2.2.3.ebuild 938 BLAKE2B be710cc6084c21afe9b6826249b64d8d3f051cf7e23f104e21b6c79204eb5f56eb9ed8f2ef0d39372ff8cdf010f183bdb1698e6956a249a255bff8297076fbb9 SHA512 453daf930f02fe82539a9f9b7277b93ef1def4512743d2bc16ce56ba738dfdf56ad531427b1ed13c85659dcb8560a96f65e5742087ee0a2eef59aff930449f81
+EBUILD bundler-2.2.4.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.5.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.6.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.17.3.ebuild b/dev-ruby/bundler/bundler-2.2.4.ebuild
index 41bb44124a03..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-1.17.3.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # The specs require a number of gems to be installed in a temporary
 # directory, but this requires network access. They also don't work
@@ -11,23 +11,20 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 # No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
 RUBY_FAKEGEM_BINDIR="exe"
 
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
 HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git"
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild b/dev-ruby/bundler/bundler-2.2.5.ebuild
index f72fbe8859e8..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # The specs require a number of gems to be installed in a temporary
 # directory, but this requires network access. They also don't work
@@ -11,13 +11,9 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 # No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
 RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
 
 inherit ruby-fakegem
 
@@ -25,10 +21,10 @@ DESCRIPTION="An easy way to vendor gem dependencies"
 HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git"
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.6.ebuild b/dev-ruby/bundler/bundler-2.2.6.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"