app-emulation/vagrant: version bump to 1.9.6, drop old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5049

4 files changed, 7 insertions, 109 deletions

diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 91e43dc13dd2..c93dba623e6f 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,2 +1,2 @@
-DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d
 DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208
+DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174
diff --git a/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch b/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch
deleted file mode 100644
index 75cb63a2fb11..000000000000
--- a/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From bfc2af4cf9c5e9280f0e7d74de226b7af7c18a2a Mon Sep 17 00:00:00 2001
-From: Chris Roberts <code@chrisroberts.org>
-Date: Mon, 27 Mar 2017 12:55:15 -0700
-Subject: [PATCH] Always provide timeout on thread join to prevent deadlock
- errors
-
----
- lib/vagrant/batch_action.rb   | 6 ++++--
- lib/vagrant/environment.rb    | 2 +-
- lib/vagrant/shared_helpers.rb | 6 ++++++
- lib/vagrant/ui.rb             | 6 +++---
- 4 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lib/vagrant/batch_action.rb b/lib/vagrant/batch_action.rb
-index 9b6900f..d27e87d 100644
---- a/lib/vagrant/batch_action.rb
-+++ b/lib/vagrant/batch_action.rb
-@@ -123,7 +123,9 @@ def run
-         # Set some attributes on the thread for later
-         thread[:machine] = machine
- 
--        thread.join if !par
-+        if !par
-+          thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive?
-+        end
-         threads << thread
-       end
- 
-@@ -131,7 +133,7 @@ def run
- 
-       threads.each do |thread|
-         # Wait for the thread to complete
--        thread.join
-+        thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive?
- 
-         # If the thread had an error, then store the error to show later
-         if thread[:error]
-diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
-index 8fad272..125070f 100644
---- a/lib/vagrant/environment.rb
-+++ b/lib/vagrant/environment.rb
-@@ -295,7 +295,7 @@ def batch(parallel=true)
-     #
-     # @return [Hash]
-     def checkpoint
--      @checkpoint_thr.join
-+      @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT)
-       return @checkpoint_thr[:result]
-     end
- 
-diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb
-index c5d6ea6..5522272 100644
---- a/lib/vagrant/shared_helpers.rb
-+++ b/lib/vagrant/shared_helpers.rb
-@@ -12,6 +12,12 @@ module Vagrant
-   # @return [String]
-   DEFAULT_SERVER_URL = "https://atlas.hashicorp.com"
- 
-+  # Max number of seconds to wait for joining an active thread.
-+  #
-+  # @return [Integer]
-+  # @note This is not the maxium time for a thread to complete.
-+  THREAD_MAX_JOIN_TIMEOUT = 60
-+
-   # This holds a global lock for the duration of the block. This should
-   # be invoked around anything that is modifying process state (such as
-   # environmental variables).
-diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
-index 8092493..2a52c90 100644
---- a/lib/vagrant/ui.rb
-+++ b/lib/vagrant/ui.rb
-@@ -53,7 +53,7 @@ def initialize_copy(original)
-             # We're being called in a trap-context. Wrap in a thread.
-             Thread.new do
-               @logger.info { "#{method}: #{message}" }
--            end.join
-+            end.join(THREAD_MAX_JOIN_TIMEOUT)
-           end
-         end
-       end
-@@ -128,7 +128,7 @@ def machine(type, *data)
-           @lock.synchronize do
-             safe_puts("#{Time.now.utc.to_i},#{target},#{type},#{data.join(",")}")
-           end
--        end.join
-+        end.join(THREAD_MAX_JOIN_TIMEOUT)
-       end
-     end
- 
-@@ -244,7 +244,7 @@ def say(type, message, **opts)
-             safe_puts(format_message(type, message, **opts),
-                       io: channel, printer: printer)
-           end
--        end.join
-+        end.join(THREAD_MAX_JOIN_TIMEOUT)
-       end
- 
-       def format_message(type, message, **opts)
diff --git a/app-emulation/vagrant/files/vagrant-1.9.3 b/app-emulation/vagrant/files/vagrant-1.9.6
index a8018a644468..ef264888f3ff 100644
--- a/app-emulation/vagrant/files/vagrant-1.9.3
+++ b/app-emulation/vagrant/files/vagrant-1.9.6
@@ -4,7 +4,7 @@
 # Vagrant installation directory. This sets up proper environmental variables
 # so that everything loads and compiles to proper directories.
 
-VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.3"' )"
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.6"' )"
 
 # Export GEM_HOME based on VAGRANT_HOME
 #
diff --git a/app-emulation/vagrant/vagrant-1.9.3.ebuild b/app-emulation/vagrant/vagrant-1.9.6.ebuild
index b0e16387ba37..b8c4920bc85f 100644
--- a/app-emulation/vagrant/vagrant-1.9.3.ebuild
+++ b/app-emulation/vagrant/vagrant-1.9.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@@ -26,17 +26,17 @@ RDEPEND="${RDEPEND}
 	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
 
 ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/childprocess-0.6.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
 	>=dev-ruby/listen-3.1.5
 	>=dev-ruby/hashicorp-checkpoint-0.1.1
 	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-3.0.1:*
+	>=dev-ruby/net-ssh-4.1.0:*
 	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.1.0
+	>=dev-ruby/net-scp-1.2.0
 	|| ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 )
-	>=dev-ruby/nokogiri-1.6.7.1
+	>=dev-ruby/nokogiri-1.7.1
 	>=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:*
 "
 
@@ -52,7 +52,6 @@ all_ruby_prepare() {
 	# loosen dependencies
 	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
 		-e '/ruby_dep/s/<=/>=/' \
-		-e '/nokogiri/s/=/>=/' \
 		-i ${PN}.gemspec || die
 
 	# remove windows-specific gems
@@ -68,9 +67,6 @@ all_ruby_prepare() {
 
 	# fix rvm issue (bug #474476)
 	epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
-
-	# fix thread deadlock (bug #616426)
-	epatch "${FILESDIR}"/${P}-thread-deadlock.patch
 }
 
 all_ruby_install() {