app-emulation/vagrant: bump to 1.9.2, drop old

Closes: #4135

Package-Manager: Portage-2.3.3, Repoman-2.3.1

3 files changed, 2 insertions, 163 deletions

diff --git a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
deleted file mode 100644
index 76730733eb67..000000000000
--- a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- bin/vagrant
-+++ bin/vagrant
-@@ -69,6 +69,11 @@
- require "bundler"
- begin
-   $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)
-+# Invalidate the cached Gemfile.lock if necessary and try again
-+rescue Bundler::GemNotFound
-+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile") if File.exists? File.expand_path("~/.vagrant.d/Gemfile")
-+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile.lock") if File.exists? File.expand_path("~/.vagrant.d/Gemfile.lock")
-+  $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)  
- rescue Bundler::GemNotFound
-   $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins,"
-   $stderr.puts "is reporting that a plugin or its dependency can't be found."
---- lib/vagrant/bundler.rb        2016-06-13 10:21:40.000000000 +0200
-+++ lib/vagrant/bundler.rb     2016-06-23 08:19:22.466039136 +0200
-@@ -65,6 +65,13 @@
-       @configfile = tempfile("vagrant-configfile")
-       @configfile.close
- 
-+      # Ensure the path to user's Gemfile exists
-+      gemfile = Vagrant.user_data_path.join("Gemfile")
-+      unless File.exists? gemfile
-+        FileUtils.mkdir_p(File.dirname(gemfile))
-+        File.open(gemfile, 'w') {}
-+      end
-+
-       # Build up the Gemfile for our Bundler context. We make sure to
-       # lock Vagrant to our current Vagrant version. In addition to that,
-       # we add all our plugin dependencies.
-@@ -151,7 +158,7 @@
- 
-     # Clean removes any unused gems.
-     def clean(plugins)
--      gemfile    = build_gemfile(plugins)
-+      gemfile    = build_gemfile(plugins, false, true)
-       lockfile   = "#{gemfile.path}.lock"
-       definition = ::Bundler::Definition.build(gemfile, lockfile, nil)
-       root       = File.dirname(gemfile.path)
-@@ -182,11 +189,23 @@
-     # Builds a valid Gemfile for use with Bundler given the list of
-     # plugins.
-     #
-+    # @param [Hash|Bool] update Hash of gems to update or true for all
-+    # @param [Bool] invalidate Invalidate Gemfile.lock
-     # @return [Tempfile]
--    def build_gemfile(plugins)
-+    def build_gemfile(plugins, update = false, invalidate = false)
-       sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq
- 
--      f = tempfile("vagrant-gemfile")
-+      # Determine what gems to update
-+      if update.is_a? Hash
-+        update_gems = update[:gems]
-+      elsif update === true
-+        update_gems = plugins.map{ |p| p[0] }
-+      else
-+        update_gems = []
-+      end
-+
-+      gemfile = Vagrant.user_data_path.join("Gemfile")
-+      f = File.open(gemfile, "w+")
-       f.tap do |gemfile|
-         sources.each do |source|
-           next if source == ""
-@@ -195,6 +214,19 @@
- 
-         gemfile.puts(%Q[gem "vagrant", "= #{VERSION}"])
- 
-+        locked_gems = []
-+
-+        # Use Gemfile.lock to lock the gem versions
-+        if ENV["VAGRANT_INTERNAL_BUNDLERIZED"] && File.exist?("#{gemfile.path}.lock") && !invalidate
-+          lockfile = ::Bundler::LockfileParser.new(::Bundler.read_file("#{gemfile.path}.lock"))
-+          lockfile.specs.each do |s|
-+            if s.name != 'vagrant' && !(update_gems.include? s.name)
-+              gemfile.puts(%Q[gem "#{s.name}", "#{s.version.to_s}"])
-+            end
-+          end
-+          locked_gems = lockfile.specs.map(&:name) - update_gems
-+        end
-+
-         gemfile.puts("group :plugins do")
-         plugins.each do |name, plugin|
-           version = plugin["gem_version"]
-@@ -205,10 +237,18 @@
-             opts[:require] = plugin["require"]
-           end
- 
--          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}])
-+          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}]) unless locked_gems.include? name
-         end
-         gemfile.puts("end")
-         gemfile.close
-+
-+        # Create Gemfile.lock if missing and re-generate Gemfile
-+        if !File.exist?("#{f.path}.lock") && File.exist?(f.path)
-+          lockfile = "#{f.path}.lock"
-+          ENV['BUNDLE_GEMFILE'] = f.path
-+          definition = ::Bundler::Definition.build(f.path, lockfile, false)
-+        end
-+        f
-       end
-     end
- 
-@@ -219,7 +259,7 @@
-     #   can be a hash of options. See Bundler.definition.
-     # @return [Array<Gem::Specification>]
-     def internal_install(plugins, update, **extra)
--      gemfile    = build_gemfile(plugins)
-+      gemfile    = build_gemfile(plugins, update)
-       lockfile   = "#{gemfile.path}.lock"
-       definition = ::Bundler::Definition.build(gemfile, lockfile, update)
-       root       = File.dirname(gemfile.path)
diff --git a/app-emulation/vagrant/files/vagrant-1.8.7 b/app-emulation/vagrant/files/vagrant-1.8.7
deleted file mode 100644
index aa744d5e54b8..000000000000
--- a/app-emulation/vagrant/files/vagrant-1.8.7
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# This is a wrapper to properly execute Vagrant within the embedded
-# 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.8.7"' )"
-
-# Export GEM_HOME based on VAGRANT_HOME
-#
-# This needs to be set because Bundler includes gem paths
-# from RubyGems' Gem.paths.
-if [ -z $VAGRANT_HOME ]; then
-  VAGRANT_HOME=$(eval echo "~/.vagrant.d")
-fi
-export GEM_HOME="$VAGRANT_HOME/gems"
-
-# SSL certs
-export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
-
-# Export an environmental variable to say we're in a Vagrant
-# installer created environment.
-export VAGRANT_INSTALLER_ENV=1
-
-# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file
-# to locate plugins configuration file.
-export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant"
-export VAGRANT_INSTALLER_VERSION="2"
-
-# Determine the OS that we're on, which is used in some later checks.
-# It is very important we do this _before_ setting the PATH below
-# because uname dependencies can conflict on some platforms.
-OS=$(uname -s 2>/dev/null)
-
-# Export the OS as an environmental variable that Vagrant can access
-# so that it can behave better.
-export VAGRANT_DETECTED_OS="${OS}"
-
-VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"
-
-# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
-export VAGRANT_EXECUTABLE
-
-# Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_LAUNCHER}" "$@"
diff --git a/app-emulation/vagrant/files/vagrant-1.8.6 b/app-emulation/vagrant/files/vagrant-1.9.2
index d4db0deaefda..060bf9e059e3 100644
--- a/app-emulation/vagrant/files/vagrant-1.8.6
+++ b/app-emulation/vagrant/files/vagrant-1.9.2
@@ -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.8.6"' )"
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.2"' )"
 
 # Export GEM_HOME based on VAGRANT_HOME
 #
@@ -37,10 +37,9 @@ OS=$(uname -s 2>/dev/null)
 export VAGRANT_DETECTED_OS="${OS}"
 
 VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"
 
 # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
 export VAGRANT_EXECUTABLE
 
 # Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_LAUNCHER}" "$@"
+exec ruby "${VAGRANT_EXECUTABLE}" "$@"