gentoo resync : 30.05.2020

3 files changed, 11 insertions, 86 deletions

diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index c6c571be067a..4f87f101695d 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,7 +1,6 @@
-AUX support-vbox-6.1.patch 3249 BLAKE2B aa381ecbfc964782654c239dc45a54694f2f142498e67d2dc3b4ddf0770e07673f12892efccbaf48f14f57770680e63bf2a107a6ca017a4a90ddd3668f34d31e SHA512 d386f406606301a07a949c7b8cba9b199a8d2903dbd2bd88468f941a1e566338cca6d9e52cd0b0024e0af618cb71e4a5139d240c3ed0c91d6c2aabb912204311
 AUX vagrant.in 1872 BLAKE2B b30abe68fa76b9f521481ade296d5a05eed214b5c49ad22c29f81d82051f0d669680f002eb5e58d7ec6bf73ebe984a693ce471c54028ff7adf0bcca07fd31096 SHA512 0b9be4e39735c2d8f9ee0fa0002e7740212c9abad2af0b670ea17493a7312125b6c865fb1e01f2b5ef9d72541b4094e3df04173cc2d379b718eea6ae046fdc7f
-DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a
 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87
-EBUILD vagrant-2.2.6-r1.ebuild 2501 BLAKE2B 7d357e69133d9ae47fa4edb856933f56ce2f49c5c944ed2b4ef4fc325952d44e68cc37a26faa6f628964a80b84e33c40a2f07aa88657b8dde7376bf49d2087c7 SHA512 55bef8ea9b148c962e6411ebd8af6c1fe4e6dd5264f6f23d30dd112e5c13c438de2a8c735d2fe9c2fbe0f1b5663f1a45ef0216db93d331679a39886ba665832e
+DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
 EBUILD vagrant-2.2.7-r1.ebuild 2559 BLAKE2B dcb267f7c75f4bd744f2a83e416aa7005c8576f8d36326efd38b6dc634034b366ddf99016f24b5ced6a8ee87d8b7247db5c16e362f171be98ecd81c46d7d133f SHA512 e4f0a36c8b36625ad0ae660ed1eb4987f1a12f0d9c96316734cdcc31975f75621ea1e3f7a18162d780dc3d33e266e66f4fdd9014be557d50fbc1894ba602d852
+EBUILD vagrant-2.2.9-r1.ebuild 2561 BLAKE2B 4b510524099dddaa98fcc3a5df7a92b16e5ec2bc9983e55699a3d31689a5b1cc83c9467c248f25309ca9d9f226763664a33b4f9e4594a7e7459894586d1697a2 SHA512 e7ca458227e86b43cf01d3c76bd20342560256f8f35a483767a0e65ebd0a34d513de35d93f1b83c3e94441b5657c7bf5185127f85061eadaaeafbf0798a1eec5
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/files/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch
deleted file mode 100644
index 59a546302799..000000000000
--- a/app-emulation/vagrant/files/support-vbox-6.1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001
-From: Brian Cain <bcain@hashicorp.com>
-Date: Wed, 11 Dec 2019 13:25:11 -0800
-Subject: [PATCH] Fixes #11249: Add VirtualBox provider support for version
- 6.1.x
-
-This commit adds support for VirtualBox version 6.1.x. It simply
-inherits from the base 6.0.x provider class.
----
- plugins/providers/virtualbox/driver/meta.rb      |  1 +
- .../providers/virtualbox/driver/version_6_1.rb   | 16 ++++++++++++++++
- plugins/providers/virtualbox/plugin.rb           |  1 +
- website/source/docs/virtualbox/index.html.md     |  2 +-
- 4 files changed, 19 insertions(+), 1 deletion(-)
- create mode 100644 plugins/providers/virtualbox/driver/version_6_1.rb
-
-diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
-index 24547b4044..ed013737b0 100644
---- a/plugins/providers/virtualbox/driver/meta.rb
-+++ b/plugins/providers/virtualbox/driver/meta.rb
-@@ -64,6 +64,7 @@ def initialize(uuid=nil)
-             "5.1" => Version_5_1,
-             "5.2" => Version_5_2,
-             "6.0" => Version_6_0,
-+            "6.1" => Version_6_1,
-           }
- 
-           if @@version.start_with?("4.2.14")
-diff --git a/plugins/providers/virtualbox/driver/version_6_1.rb b/plugins/providers/virtualbox/driver/version_6_1.rb
-new file mode 100644
-index 0000000000..ebe417eb91
---- /dev/null
-+++ b/plugins/providers/virtualbox/driver/version_6_1.rb
-@@ -0,0 +1,16 @@
-+require File.expand_path("../version_6_0", __FILE__)
-+
-+module VagrantPlugins
-+  module ProviderVirtualBox
-+    module Driver
-+      # Driver for VirtualBox 6.1.x
-+      class Version_6_1 < Version_6_0
-+        def initialize(uuid)
-+          super
-+
-+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1")
-+        end
-+      end
-+    end
-+  end
-+end
-diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
-index e058ec65ad..f2fbf47e55 100644
---- a/plugins/providers/virtualbox/plugin.rb
-+++ b/plugins/providers/virtualbox/plugin.rb
-@@ -59,6 +59,7 @@ module Driver
-       autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
-       autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
-       autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__)
-+      autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__)
-     end
- 
-     module Model
-diff --git a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md
-index 558ef5f5d8..e9c1e79aad 100644
---- a/website/source/docs/virtualbox/index.html.md
-+++ b/website/source/docs/virtualbox/index.html.md
-@@ -13,7 +13,7 @@ Vagrant comes with support out of the box for [VirtualBox](https://www.virtualbo
- a free, cross-platform consumer virtualization product.
- 
- The VirtualBox provider is compatible with VirtualBox versions 4.0.x, 4.1.x,
--4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, and 6.0.x. Other versions are unsupported and the provider
-+4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, 6.0.x, and 6.1.x. Other versions are unsupported and the provider
- will display an error message. Please note that beta and pre-release versions
- of VirtualBox are not supported and may not be well-behaved.
- 
diff --git a/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild
index c7b3242780a4..9e265ce73a47 100644
--- a/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild
@@ -28,19 +28,19 @@ RDEPEND="${RDEPEND}
 
 ruby_add_rdepend "
 	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/childprocess-3.0.0
 	>=dev-ruby/ed25519-1.2.4
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.1.1:1
+	>=dev-ruby/i18n-1.8:1
 	>=dev-ruby/listen-3.1.5
 	<dev-ruby/log4r-1.1.11
 	<dev-ruby/mime-types-3:*
-	>=dev-ruby/net-ssh-5.1.0:*
+	>=dev-ruby/net-ssh-5.2.0:*
 	>=dev-ruby/net-sftp-2.1
 	>=dev-ruby/net-scp-1.2.0
 	dev-ruby/rest-client:2
-	>=dev-ruby/rubyzip-1.2.2:*
+	dev-ruby/rubyzip:2
 	>=dev-ruby/vagrant_cloud-2.0.3
 "
 
@@ -52,16 +52,13 @@ ruby_add_bdepend "
 	>=dev-ruby/rake-10.5.0
 "
 
-PATCHES="${FILESDIR}/support-vbox-6.1.patch"
-
 all_ruby_prepare() {
 	# remove bundler support
 	sed -i '/[Bb]undler/d' Rakefile || die
 	rm Gemfile || die
 
 	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
+	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|rake\|childprocess/s/~>/>=/' \
 		-i ${PN}.gemspec || die
 
 	# remove windows-specific gems
@@ -72,6 +69,10 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die
 
+	# remove ruby_dep, it's unused and only listed to loosen ruby implementation deps
+	sed -e '/ruby_dep/d' \
+		-i ${PN}.gemspec || die
+
 	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
 }