[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: e419db21acd6e588b8d12b7f59e48aff873917fb Author: Hans de Graaff gentoo org> AuthorDate: Sun Aug 27 16:57:48 2023 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Aug 27 16:58:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e419db21 app-emulation/vagrant: add 2.3.7 Closes: https://bugs.gentoo.org/867943 Closes: https://bugs.gentoo.org/912592 Signed-off-by: Hans de Graaff gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.3.7.ebuild | 121 + 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 5d7e68811a33..afc31a73f05b 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 +DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index d77c39d06045..0dfd12d10148 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -4,7 +4,7 @@ # Vagrant installation directory. This sets up proper environmental variables # so that everything loads and compiles to proper directories. -for r in ruby30 ruby27 ruby26; do +for r in ruby32 ruby31 ruby30 ruby27 ruby26; do # not all ruby versions are guaranteed to be installed if ! command -v "${r}" >/dev/null 2>&1; then continue diff --git a/app-emulation/vagrant/vagrant-2.3.7.ebuild b/app-emulation/vagrant/vagrant-2.3.7.ebuild new file mode 100644 index ..3225ddf513bd --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.3.7.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31" + +RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant_ssl/extconf.rb) +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" +RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" +RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_TASK_TEST=test:unit +RUBY_FAKEGEM_RECIPE_TEST=rake + +inherit bash-completion-r1 optfeature ruby-fakegem + +DESCRIPTION="A tool for building and distributing development environments" +HOMEPAGE="https://vagrantup.com/; +SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${RDEPEND} + app-arch/libarchive + net-misc/curl +" + +ruby_add_rdepend " + >=dev-ruby/bcrypt_pbkdf-1.1.0 + >=dev-ruby/childprocess-4.1.0 + >=dev-ruby/ed25519-1.3.0 + dev-ruby/erubi + >=dev-ruby/googleapis-common-protos-types-1.3.0 + dev-ruby/grpc + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.12:1 + >=dev-ruby/listen-3.7 + >=dev-ruby/log4r-1.1.9 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/net-ftp-0.2.0 + >=dev-ruby/net-ssh-7.0.0 + >=dev-ruby/net-sftp-4.0.0 + >=dev-ruby/net-scp-4.0.0 + >=dev-ruby/rexml-3.2.0 + >=dev-ruby/rgl-0.5.10 + >=dev-ruby/rubyzip-2.3.2 + >=dev-ruby/vagrant_cloud-3.0.5 + >=dev-ruby/ipaddr-1.2.4 +" + +ruby_add_bdepend " + >=dev-ruby/rake-13.0.0 + test? ( + ~app-emulation/vagrant-${PV} + dev-ruby/rake-compiler + >=dev-ruby/rspec-3.11 + >=dev-ruby/rspec-its-1.3.0 + >=dev-ruby/webrick-1.7.0 + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -e '/[Bb]undler/ s:^:#:' \ + -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/^end/ s:^:#:' \ + -i Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec: s:~>:>=:' \ + -e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \ + -e '/fake_ftp/ s:^#*:#:' \ + -e '/wdm/ s:^#*:#:' \ + -e '/winrm/ s:^#*:#:' \ + -e '/rb-kqueue/ s:^#*:#:' \ + -e '/ruby_dep/ s:^#*:#:' \ + -i ${PN}.gemspec || die + + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" ||
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: d846a14da7548f88932b2ee37f9bc54886c2adce Author: Guillaume Seren gmail com> AuthorDate: Mon Dec 14 17:11:40 2020 + Commit: Sam James gentoo org> CommitDate: Tue Sep 28 01:00:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d846a14d app-emulation/vagrant: Bump to version 2.2.14 Closes: https://bugs.gentoo.org/765253 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Guillaume Seren gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19053 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.2.14.ebuild | 93 + 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index d686f4587be..b59e046f1a2 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ +DIST vagrant-2.2.14.tar.gz 2522944 BLAKE2B 21980ab11fb7477518a40839715b6b207e9a2268e19df2ded0042a7d3d32cd45db02acfeb528c89869e54e9f4358b200f831150ada43c062513d864896eb7895 SHA512 540457c23ff52faef10774ac2d0da7a8c30682a19964f5ce805d5013eb27a6538468fcd511610d4bef539df14cbc4cf3a3dcdd9c96ba303ecf538028dc4aa659 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index fd35177c6fe..5760b56839c 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -4,7 +4,7 @@ # Vagrant installation directory. This sets up proper environmental variables # so that everything loads and compiles to proper directories. -for r in ruby26 ruby25 ruby24; do +for r in ruby27 ruby26 ruby25; do # not all ruby versions are guaranteed to be installed if ! command -v "${r}" >/dev/null 2>&1; then continue diff --git a/app-emulation/vagrant/vagrant-2.2.14.ebuild b/app-emulation/vagrant/vagrant-2.2.14.ebuild new file mode 100644 index 000..850c675b347 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.14.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby25 ruby26 ruby27" + +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 optfeature ruby-fakegem + +DESCRIPTION="A tool for building and distributing development environments" +HOMEPAGE="https://vagrantup.com/; +SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${RDEPEND} + app-arch/libarchive + net-misc/curl +" + +ruby_add_rdepend " + >=dev-ruby/bcrypt_pbkdf-1.0.0 + >=dev-ruby/childprocess-4.0.0 + >=dev-ruby/ed25519-1.2.4 + dev-ruby/erubi + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.1 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/rubyzip-2.0 + >=dev-ruby/net-scp-3.0.0 + >=dev-ruby/net-sftp-3.0 + >=dev-ruby/net-ssh-6.1.0 + dev-ruby/rest-client:2 + >=dev-ruby/vagrant_cloud-3.0.2 +" + +ruby_add_bdepend " + >=dev-ruby/rake-12.3.3 + test? ( + dev-ruby/rspec + dev-ruby/rspec-its + dev-ruby/webmock + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec\|webmock: s:~>:>=:' \ + -e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \ + -e '/fake_ftp/ s:^#*:#:' \ + -e '/wdm/ s:^#*:#:' \ + -e '/winrm/ s:^#*:#:' \ + -e '/rb-kqueue/ s:^#*:#:' \ + -e '/ruby_dep/ s:^#*:#:' \ + -i ${PN}.gemspec || die + + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die +} + +all_ruby_install() { + all_fakegem_install + + newbashcomp contrib/bash/completion.sh ${PN} + + # provide
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 02cfdf5d067ff904b95725f75e70f6250e4ab6fe Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jan 1 06:12:58 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jan 1 06:13:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cfdf5d app-emulation/vagrant: drop old Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest| 4 -- app-emulation/vagrant/files/vagrant-r1.in | 61 -- app-emulation/vagrant/files/vagrant.in| 2 +- app-emulation/vagrant/vagrant-2.1.5.ebuild| 82 app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 90 --- app-emulation/vagrant/vagrant-2.2.4.ebuild| 90 --- app-emulation/vagrant/vagrant-2.2.5.ebuild| 90 --- app-emulation/vagrant/vagrant-2.2.6-r1.ebuild | 2 +- 8 files changed, 2 insertions(+), 419 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 307430a6bf1..b063bb21fc8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,5 +1 @@ -DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 -DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 -DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a -DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272 DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in deleted file mode 100644 index fd35177c6fe..000 --- a/app-emulation/vagrant/files/vagrant-r1.in +++ /dev/null @@ -1,61 +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. - -for r in ruby26 ruby25 ruby24; do - # not all ruby versions are guaranteed to be installed - if ! command -v "${r}" >/dev/null 2>&1; then -continue - fi - - 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" - - if [ -f ${VAGRANT_EXECUTABLE} ] ;then -ruby="${r}" -break - fi -done - -if [ -z ${ruby} ]; then - echo "Error: failed to find any usable ruby" - exit 1 -fi - -# 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="~/.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 - -# Export the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" - -# Allow to install plugins even with deps in different slots (Bug #628648) -export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 - -# 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}" "$@" diff --git
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 2a65bfb72e82ecf9184130a6c627e11007663293 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jan 1 04:47:36 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jan 1 04:49:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a65bfb7 app-emulation/vagrant: add virtualbox-6.1 support to 2.2.6 Closes: https://bugs.gentoo.org/704372 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/support-vbox-6.1.patch | 75 ++ ...agrant-2.2.6.ebuild => vagrant-2.2.6-r1.ebuild} | 4 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/files/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch new file mode 100644 index 000..59a54630279 --- /dev/null +++ b/app-emulation/vagrant/files/support-vbox-6.1.patch @@ -0,0 +1,75 @@ +From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001 +From: Brian Cain +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 00..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.ebuild b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild similarity index 96% rename from app-emulation/vagrant/vagrant-2.2.6.ebuild rename to app-emulation/vagrant/vagrant-2.2.6-r1.ebuild index d3796ed1651..db493d1a781 100644 --- a/app-emulation/vagrant/vagrant-2.2.6.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,6 +52,8 @@ ruby_add_bdepend " >=dev-ruby/rake-10.5.0 " +PATCHES="${FILESDIR}/support-vbox-6.1.patch" + all_ruby_prepare() { # remove bundler support sed -i
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: f28c2f8bb72fad3d9ff11719b386d6a32fc20f13 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon May 20 18:58:09 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 20 18:58:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28c2f8b app-emulation/vagrant: drop ruby23 comepletely Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/vagrant.in| 2 +- app-emulation/vagrant/vagrant-2.1.5.ebuild| 4 ++-- app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index ee5e48c2154..86fa86fe591 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -4,7 +4,7 @@ # Vagrant installation directory. This sets up proper environmental variables # so that everything loads and compiles to proper directories. -for r in ruby25 ruby24 ruby23; do +for r in ruby25 ruby24; do # not all ruby versions are guaranteed to be installed if ! command -v "${r}" >/dev/null 2>&1; then continue diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index 8bfe0ff326b..509b0117225 100644 --- a/app-emulation/vagrant/vagrant-2.1.5.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" diff --git a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild index a2515b61584..92052b88307 100644 --- a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: e77645c70239367394dca3cca2030cb27b6d2e6a Author: Nick H gmail com> AuthorDate: Sun May 19 19:08:19 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 20 18:56:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77645c7 app-emulation/vagrant: add ruby 2.6 Signed-off-by: Nick Herman gmail.com> Bug: https://bugs.gentoo.org/686388 Closes: https://github.com/gentoo/gentoo/pull/12057 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/vagrant-r1.in | 61 ++ app-emulation/vagrant/vagrant-2.2.4.ebuild | 4 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in new file mode 100644 index 000..fd35177c6fe --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-r1.in @@ -0,0 +1,61 @@ +#!/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. + +for r in ruby26 ruby25 ruby24; do + # not all ruby versions are guaranteed to be installed + if ! command -v "${r}" >/dev/null 2>&1; then +continue + fi + + 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" + + if [ -f ${VAGRANT_EXECUTABLE} ] ;then +ruby="${r}" +break + fi +done + +if [ -z ${ruby} ]; then + echo "Error: failed to find any usable ruby" + exit 1 +fi + +# 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="~/.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 + +# Export the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" + +# Allow to install plugins even with deps in different slots (Bug #628648) +export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 + +# 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}" "$@" diff --git a/app-emulation/vagrant/vagrant-2.2.4.ebuild b/app-emulation/vagrant/vagrant-2.2.4.ebuild index a55cc3486a2..150022d0426 100644 --- a/app-emulation/vagrant/vagrant-2.2.4.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -70,7 +70,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die } all_ruby_install() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 5bc81fcd52b66b6988178bd35bbf456d68a133a3 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Dec 1 03:22:07 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Dec 1 03:22:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc81fcd app-emulation/vagrant: cleanup ./files Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/{vagrant-r1.in => vagrant.in} | 0 app-emulation/vagrant/vagrant-2.1.5.ebuild| 2 +- app-emulation/vagrant/vagrant-2.2.2.ebuild| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant.in similarity index 100% rename from app-emulation/vagrant/files/vagrant-r1.in rename to app-emulation/vagrant/files/vagrant.in diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index e147c40bcd3..f30a07577a8 100644 --- a/app-emulation/vagrant/vagrant-2.1.5.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -66,7 +66,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die } all_ruby_install() { diff --git a/app-emulation/vagrant/vagrant-2.2.2.ebuild b/app-emulation/vagrant/vagrant-2.2.2.ebuild index ebed665ac9a..c294b5ac584 100644 --- a/app-emulation/vagrant/vagrant-2.2.2.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.2.ebuild @@ -70,7 +70,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die } all_ruby_install() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 23d7aa2282f6b16c508738d31eb90d0334d8c602 Author: Tomáš Mózes gmail com> AuthorDate: Sat Nov 4 22:05:10 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Nov 6 07:35:38 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d7aa22 app-emulation/vagrant: bump to 2.0.1 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in-r1 | 50 +++ app-emulation/vagrant/vagrant-2.0.1.ebuild | 78 ++ 3 files changed, 129 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 34dfc7b9412..c626066ee4a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee DIST vagrant-2.0.0.tar.gz 1142850 SHA256 c25d3a5f18abdf349047f4d80bb74e6cb526959536e4bef5aa771de9d39cb260 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 WHIRLPOOL 8337800f6c5cc88081dc6f8630de60ecba8c851687d14143f34dc41b62cbd67b1e463f7351ecc0e1c764742004fdba389bc33c0bb2a5c043d1fbf6dde352171c +DIST vagrant-2.0.1.tar.gz 1153702 SHA256 212b91c45f60a825fcfc656424021e2550833778a6d4ebe13458676201a04eba SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd WHIRLPOOL 7c66469b1fc0078524b62dd62dd66ae45f6527602df650dbe755bbbe12d4d4b04d6e0964606705a2c9ef4113d5b6abdc5619d223f4913cb9425d4032921ec0d9 diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in-r1 new file mode 100644 index 000..7c0405e8a83 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -0,0 +1,50 @@ +#!/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. + +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="~/.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 + +# Export the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" + +# Allow to install plugins even with deps in different slots (Bug #628648) +export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 + +# 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}" "$@" diff --git a/app-emulation/vagrant/vagrant-2.0.1.ebuild b/app-emulation/vagrant/vagrant-2.0.1.ebuild new file mode 100644 index 000..a496014e0f4 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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 + +DESCRIPTION="A tool for building and distributing development environments"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 15758dabbd97c62c6e2572a9e237041469d7aa1f Author: Tomas Mozes gmail com> AuthorDate: Fri Sep 8 05:07:59 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 10 21:24:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15758dab app-emulation/vagrant: version bump to 1.9.8. Package-Manager: Portage-2.3.8, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5657 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 8 ++- app-emulation/vagrant/vagrant-1.9.8.ebuild | 81 ++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 0e014b61a7a..1bfe5d16690 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 +DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 0da39caea41..761753208a7 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -25,7 +25,7 @@ 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" +export VAGRANT_INSTALLER_VERSION=2 # Export the OS as an environmental variable that Vagrant can access # so that it can behave better. @@ -34,5 +34,11 @@ export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit export 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 + +# 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}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.8.ebuild b/app-emulation/vagrant/vagrant-1.9.8.ebuild new file mode 100644 index 000..7d133f044eb --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.8.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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/childprocess-0.6.0 + >=dev-ruby/erubis-2.7.0 + =dev-ruby/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.0:* + >=dev-ruby/net-sftp-2.1 + >=dev-ruby/net-scp-1.2.0 + || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) + >=dev-ruby/nokogiri-1.7.1 + =dev-ruby/rake-12.0.0 +" + +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\|rake\|childprocess/s/~>/>=/' \ + -e '/ruby_dep/s/<=/>=/' \ + -i ${PN}.gemspec || die + + # remove
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 255a7731dbaf1aa9967a0719993def3395631630 Author: Tomas Mozes gmail com> AuthorDate: Wed Aug 16 09:53:46 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 16 14:24:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255a7731 app-emulation/vagrant: bump to 1.9.7 Package-Manager: Portage-2.3.7, Repoman-2.3.2 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 38 ++ app-emulation/vagrant/vagrant-1.9.7.ebuild | 84 ++ 3 files changed, 123 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c93dba623e6..521a17e4ad7 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ 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 +DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in new file mode 100644 index 000..0da39caea41 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant.in @@ -0,0 +1,38 @@ +#!/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-@VAGRANT_VERSION@"' )" + +# 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="~/.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" + +# Export the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.7.ebuild b/app-emulation/vagrant/vagrant-1.9.7.ebuild new file mode 100644 index 000..b6b67db26be --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.7.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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/childprocess-0.6.0 + >=dev-ruby/erubis-2.7.0 + =dev-ruby/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.0:* + >=dev-ruby/net-sftp-2.1 + >=dev-ruby/net-scp-1.2.0 + || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 356593d8f2e0951c3dd4571e2af59f9fcfe460d7 Author: Tomas Mozes gmail com> AuthorDate: Thu Jul 6 05:54:18 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sun Jul 16 21:52:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356593d8 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 app-emulation/vagrant/Manifest | 2 +- .../files/vagrant-1.9.3-thread-deadlock.patch | 98 -- .../vagrant/files/{vagrant-1.9.3 => vagrant-1.9.6} | 2 +- .../{vagrant-1.9.3.ebuild => vagrant-1.9.6.ebuild} | 14 ++-- 4 files changed, 7 insertions(+), 109 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 91e43dc13dd..c93dba623e6 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 75cb63a2fb1..000 --- 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-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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 798fcf4b562821ec149b7b549dc0b72d9909974f Author: Tomas Mozes gmail com> AuthorDate: Mon Apr 24 06:33:48 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Apr 24 14:50:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798fcf4b app-emulation/vagrant: bump to 1.9.3, drop old Closes:#4460 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-emulation/vagrant/Manifest | 2 +- .../vagrant/files/{vagrant-1.9.1 => vagrant-1.9.3} | 2 +- .../files/vagrant-1.9.3-thread-deadlock.patch | 98 ++ ...agrant-1.9.1-r1.ebuild => vagrant-1.9.3.ebuild} | 3 + 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 3efc9763881..1eca1c22ef8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76 +DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d diff --git a/app-emulation/vagrant/files/vagrant-1.9.1 b/app-emulation/vagrant/files/vagrant-1.9.3 similarity index 98% rename from app-emulation/vagrant/files/vagrant-1.9.1 rename to app-emulation/vagrant/files/vagrant-1.9.3 index 40a91d63e96..a8018a64446 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.1 +++ b/app-emulation/vagrant/files/vagrant-1.9.3 @@ -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.1"' )" +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.3"' )" # Export GEM_HOME based on VAGRANT_HOME # 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 new file mode 100644 index 000..75cb63a2fb1 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch @@ -0,0 +1,98 @@ +From bfc2af4cf9c5e9280f0e7d74de226b7af7c18a2a Mon Sep 17 00:00:00 2001 +From: Chris Roberts+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] +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 426344635861bb968335ccdb0d7a4f3ea1f4b101 Author: Tomas Mozes gmail com> AuthorDate: Wed Dec 21 11:38:36 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 22 09:28:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42634463 app-emulation/vagrant: version bump to 1.9.1. Gentoo-Bug: https://bugs.gentoo.org/601930 Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3201 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.9.1 | 45 app-emulation/vagrant/vagrant-1.9.1.ebuild | 84 ++ 3 files changed, 130 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index cb9c46a..0490e5a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 +DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 diff --git a/app-emulation/vagrant/files/vagrant-1.9.1 b/app-emulation/vagrant/files/vagrant-1.9.1 new file mode 100644 index ..40a91d6 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.9.1 @@ -0,0 +1,45 @@ +#!/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.9.1"' )" + +# 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" + +# 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_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.1.ebuild b/app-emulation/vagrant/vagrant-1.9.1.ebuild new file mode 100644 index ..7e87339 --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +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"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 12f8906f9a5b8f652c5d153c859c6d6444dfc161 Author: Tomas Mozes gmail com> AuthorDate: Wed Dec 21 11:39:46 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 22 09:28:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f8906f app-emulation/vagrant: drop old. Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3201 app-emulation/vagrant/Manifest| 1 - app-emulation/vagrant/files/vagrant-1.8.5 | 46 -- app-emulation/vagrant/vagrant-1.8.5-r1.ebuild | 91 --- 3 files changed, 138 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 0490e5a..7172e25 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 diff --git a/app-emulation/vagrant/files/vagrant-1.8.5 b/app-emulation/vagrant/files/vagrant-1.8.5 deleted file mode 100644 index 0742cc2.. --- a/app-emulation/vagrant/files/vagrant-1.8.5 +++ /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.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}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild b/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild deleted file mode 100644 index 63e8ad6.. --- a/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 5f3c7b29b4a9a51246a170cf071c42126dba3cef Author: Tomas Mozes gmail com> AuthorDate: Tue Nov 15 06:33:05 2016 + Commit: David Seifert gentoo org> CommitDate: Tue Nov 15 22:28:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3c7b29 app-emulation/vagrant: version bump to 1.8.7 Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2837 Signed-off-by: David Seifert gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.7 | 46 app-emulation/vagrant/vagrant-1.8.7.ebuild | 88 ++ 3 files changed, 135 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index ee34b31..e1078af 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ 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 DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b +DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 diff --git a/app-emulation/vagrant/files/vagrant-1.8.7 b/app-emulation/vagrant/files/vagrant-1.8.7 new file mode 100644 index ..aa744d5e --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.7 @@ -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.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/vagrant-1.8.7.ebuild b/app-emulation/vagrant/vagrant-1.8.7.ebuild new file mode 100644 index ..7a735d7 --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.7.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 94ceab2786452c2d0c444023ad95f02e0f785c1c Author: Tomas Mozes gmail com> AuthorDate: Tue Aug 2 10:13:41 2016 + Commit: Sebastian Pipping gentoo org> CommitDate: Tue Aug 2 10:13:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ceab27 app-emulation/vagrant: bump to 1.8.5 Package-Manager: portage-2.3.0 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.5 | 46 app-emulation/vagrant/vagrant-1.8.5.ebuild | 87 ++ 3 files changed, 134 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c72fb6d..6fcc7eb 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -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 diff --git a/app-emulation/vagrant/files/vagrant-1.8.5 b/app-emulation/vagrant/files/vagrant-1.8.5 new file mode 100644 index 000..0742cc2 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.5 @@ -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}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.5.ebuild b/app-emulation/vagrant/vagrant-1.8.5.ebuild new file mode 100644 index 000..1c156ab --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.5.ebuild @@ -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 +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: ffce965ba1e2096a8807a21be7e59b4955bdca66 Author: Tomas Mozes gmail com> AuthorDate: Mon Jan 18 17:02:31 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon Jan 18 17:02:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffce965b app-emulation/vagrant: version bump to 1.8.1 Package-Manager: portage-2.2.26 app-emulation/vagrant/Manifest | 2 +- .../vagrant/files/vagrant-1.2.1-no-warning.patch | 12 -- .../vagrant/files/vagrant-1.2.2-rvm.patch | 12 -- app-emulation/vagrant/files/vagrant-1.8.1 | 46 .../vagrant-1.8.1-disable-embedded-cacert.patch| 17 +++ ...agrant-1.8.1-install-plugins-in-isolation.patch | 122 + .../vagrant/files/vagrant-1.8.1-rvm.patch | 11 ++ app-emulation/vagrant/metadata.xml | 20 +++- app-emulation/vagrant/vagrant-1.4.3-r2.ebuild | 69 app-emulation/vagrant/vagrant-1.8.1.ebuild | 84 ++ 10 files changed, 295 insertions(+), 100 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index a495574..24578f1 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1 @@ -DIST vagrant-1.4.3.tar.gz 2391973 SHA256 09ccc0d87999a3c133b9ef52a5cff58402745ee64af6080b2a5d304eb06c9c58 SHA512 93fd1cfa263004cadbf670fac4dc318db9719d2a86afe188857cbc97c1317e6ef2387be498ef9278ca95cdda6bd41400426e3bf52448eb59c31877c9fd0624e4 WHIRLPOOL e581e8488e0b1e75bcdd75f4572b89f9c23338e422d3acb57b1d5d513d9357ec0b061371d926ad0bb1087bf890e70422d4e3527dfd518329ba910f42f0733673 +DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 diff --git a/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch b/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch deleted file mode 100644 index 08d1d35..000 --- a/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ vagrant-1.2.1/bin/vagrant -+++ vagrant-1.2.1/bin/vagrant -@@ -74,9 +74,6 @@ - warned = true - end - end -- --# If we're not in the installer, warn. --env.ui.warn(I18n.t("vagrant.general.not_in_installer")) if !warned - end - - begin diff --git a/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch b/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch deleted file mode 100644 index 99265a2..000 --- a/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch +++ /dev/null @@ -1,12 +0,0 @@ vagrant-1.2.2/bin/vagrant -+++ vagrant-1.2.2/bin/vagrant -@@ -5,6 +5,9 @@ - # initializing which have historically resulted in stack traces. - Signal.trap("INT") { exit 1 } - -+ENV.delete('GEM_HOME') -+ENV.delete('GEM_PATH') -+ - require 'log4r' - require 'vagrant' - require 'vagrant/cli' diff --git a/app-emulation/vagrant/files/vagrant-1.8.1 b/app-emulation/vagrant/files/vagrant-1.8.1 new file mode 100755 index 000..760db56 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.1 @@ -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.1"' )" + +# 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