gentoo resync : 10.11.2017

2 files changed, 20 insertions, 26 deletions

diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch b/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch
deleted file mode 100644
index 81d17be010e3..000000000000
--- a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vagrant-1.8.1/bin/vagrant
-+++ vagrant-1.8.1/bin/vagrant
-@@ -5,6 +5,8 @@
- # initializing which have historically resulted in stack traces.
- Signal.trap("INT") { abort }
- 
-+ENV.delete('GEM_PATH')
-+
- # Split arguments by "--" if its there, we'll recombine them later
- argv = ARGV.dup
- argv_extra = []
diff --git a/app-emulation/vagrant/files/vagrant-1.9.6 b/app-emulation/vagrant/files/vagrant.in-r1
index ef264888f3ff..7c0405e8a835 100644
--- a/app-emulation/vagrant/files/vagrant-1.9.6
+++ b/app-emulation/vagrant/files/vagrant.in-r1
@@ -4,16 +4,25 @@
 # 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.6"' )"
+for r in ruby24 ruby23 ruby22; do
+  VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )"
+  # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
+  export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
+  "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null
+  if [ $? -eq 0 ]; then
+    ruby="${r}"
+    break
+  fi
+done
 
 # 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")
+if [ -z ${VAGRANT_HOME} ]; then
+  VAGRANT_HOME="~/.vagrant.d"
 fi
-export GEM_HOME="$VAGRANT_HOME/gems"
+export GEM_HOME="${VAGRANT_HOME}/gems"
 
 # SSL certs
 export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
@@ -25,21 +34,17 @@ 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 VAGRANT_INSTALLER_VERSION=2
 
 # Export the OS as an environmental variable that Vagrant can access
 # so that it can behave better.
-export VAGRANT_DETECTED_OS="${OS}"
+export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)"
 
-VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
+# Allow to install plugins even with deps in different slots (Bug #628648)
+export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1
 
-# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
-export VAGRANT_EXECUTABLE
+# Make it work with rvm (Bugs #474476 #628648)
+unset GEM_HOME GEM_PATH
 
 # Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_EXECUTABLE}" "$@"
+exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@"