mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
Merge remote-tracking branch 'github/pr/1997'
This commit is contained in:
@@ -1,2 +1,3 @@
|
||||
DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261
|
||||
DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9
|
||||
DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
#!/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.5"' )"
|
||||
|
||||
# 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}" "$@"
|
||||
@@ -0,0 +1,87 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
USE_RUBY="ruby20 ruby21 ruby22"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
|
||||
RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
inherit bash-completion-r1 ruby-fakegem eutils
|
||||
|
||||
DESCRIPTION="A tool for building and distributing development environments"
|
||||
HOMEPAGE="http://vagrantup.com/"
|
||||
SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+virtualbox"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
app-arch/libarchive
|
||||
net-misc/curl
|
||||
virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/bundler-1.12.5
|
||||
>=dev-ruby/childprocess-0.5.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-sftp-2.1
|
||||
>=dev-ruby/net-scp-1.1.0
|
||||
>=dev-ruby/rest-client-1.6.0 <dev-ruby/rest-client-3.0
|
||||
>=dev-ruby/nokogiri-1.6.7.1
|
||||
>=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:*
|
||||
"
|
||||
|
||||
ruby_add_bdepend "
|
||||
dev-ruby/rake
|
||||
"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# remove bundler support
|
||||
sed -i '/[Bb]undler/d' Rakefile || die
|
||||
rm Gemfile || die
|
||||
|
||||
# loosen dependencies
|
||||
sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \
|
||||
-e '/nokogiri\|bundler/s/=/>=/' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
# remove windows-specific gems
|
||||
sed -e '/wdm\|winrm/d' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
# remove bsd-specific gems
|
||||
sed -e '/rb-kqueue/d' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
# see https://github.com/mitchellh/vagrant/pull/5877
|
||||
epatch "${FILESDIR}"/${PN}-1.8.4-install-plugins-in-isolation.patch
|
||||
|
||||
# disable embedded CA certs and use system ones
|
||||
epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch
|
||||
|
||||
# fix rvm issue (bug #474476)
|
||||
epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
newbashcomp contrib/bash/completion.sh ${PN}
|
||||
all_fakegem_install
|
||||
|
||||
# provide executable similar to upstream:
|
||||
# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
|
||||
newbin "${FILESDIR}/${P}" "${PN}"
|
||||
|
||||
# directory for plugins.json
|
||||
dodir /var/lib/vagrant
|
||||
}
|
||||
Reference in New Issue
Block a user