[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 53a7376efa22aeee0473bd5d16cdefcc1ccb19ab Author: Guillaume Seren gmail com> AuthorDate: Wed Nov 29 21:07:50 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jan 31 12:54:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a7376e app-emulation/vagrant: Bump to 2.4.0 Closes: https://bugs.gentoo.org/916978 Signed-off-by: Guillaume Seren gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34054 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.4.0.ebuild | 122 + 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 9f3c8b22cca7..ee40ff4269b4 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2 +DIST vagrant-2.4.0.tar.gz 3334706 BLAKE2B 62b720a83646e94c7608a2f8aa7acf985aea0a3532e0474aa45c229b054ea40a6e0b23ccdbfdbf7e27e3da9a4db5f57407656fe103ead0f5a98dc27dae5ebb57 SHA512 94e866b012303b65d33b72034f08305fc04c12be40aeb95247b786b53d14259b7b5062b372e3c87523390f0539848a0eafd45b28ad16a27badecd541243b diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 0dfd12d10148..21d6c0bf3c82 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 ruby32 ruby31 ruby30 ruby27 ruby26; do +for r in ruby33 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.4.0.ebuild b/app-emulation/vagrant/vagrant-2.4.0.ebuild new file mode 100644 index ..225878aa2fc9 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.4.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32 ruby33" + +RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant/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 ~arm64" +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-1.59.2 + >=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.1.0 + >=dev-ruby/ipaddr-1.2.4 +" + +ruby_add_bdepend " + >=dev-ruby/rake-13.0.0 + test? ( + ~app-emulation/vagrant-${PV} + dev-ruby/fake_ftp + 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:^#*:#:' \ +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: ff3405ff6ce995c680819e26126d6718e8e1e3eb Author: Georgy Yakovlev gentoo org> AuthorDate: Tue May 19 03:27:46 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue May 19 03:27:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3405ff app-emulation/vagrant: drop 2.2.6 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/support-vbox-6.1.patch | 75 -- app-emulation/vagrant/vagrant-2.2.6-r1.ebuild | 92 -- 3 files changed, 168 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 826fa92c652..d686f4587be 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a 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/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch deleted file mode 100644 index 59a54630279..000 --- a/app-emulation/vagrant/files/support-vbox-6.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: be1b9590db51c709dfd721ca9bfbc49efeee91e3 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Dec 1 03:20:36 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Dec 1 03:20:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1b9590 app-emulation/vagrant: drop old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest| 2 - app-emulation/vagrant/files/vagrant.in| 61 app-emulation/vagrant/vagrant-2.1.1.ebuild| 79 - app-emulation/vagrant/vagrant-2.1.2-r1.ebuild | 83 --- app-emulation/vagrant/vagrant-2.1.2.ebuild| 79 - 5 files changed, 304 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 03a22b8ca6d..9b2e5b6e9d4 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 -DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in deleted file mode 100644 index 134cb31f299..000 --- a/app-emulation/vagrant/files/vagrant.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 ruby24 ruby23 ruby22; 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.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild deleted file mode 100644 index ee48d642baa..000 --- a/app-emulation/vagrant/vagrant-2.1.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -USE_RUBY="ruby23 ruby24" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" -RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" -RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" -RUBY_FAKEGEM_TASK_DOC=""
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a55d71b7959c1c24b95b90b00ff1c56e72940288 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jul 8 08:11:03 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jul 8 08:54:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55d71b7 app-emulation/vagrant: add ruby25 support Closes: https://github.com/gentoo/gentoo/pull/9117 Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-emulation/vagrant/files/vagrant-r1.in | 61 + app-emulation/vagrant/vagrant-2.1.2-r1.ebuild | 79 +++ 2 files changed, 140 insertions(+) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in new file mode 100644 index 000..ee5e48c2154 --- /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 ruby25 ruby24 ruby23; 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.1.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild new file mode 100644 index 000..c41ac30accb --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby23 ruby24 ruby25" + +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" +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="+virtualbox" +RESTRICT="test" + +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.5 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.2.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 windows-specific gems + sed -e '/wdm\|win32-\|winrm/d' \ + -i ${PN}.gemspec || die + + # remove bsd-specific gems + sed -e '/rb-kqueue/d' \ + -i ${PN}.gemspec || die + + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die +} + +all_ruby_install() { + newbashcomp
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: c3f9cb5fc88cdabde1b509c8c86fd3d7b5e2cca8 Author: Tomas Mozes gmail com> AuthorDate: Wed Jun 27 09:54:26 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 27 16:57:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f9cb5f app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/8987 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-emulation/vagrant/Manifest | 2 - .../vagrant/files/{vagrant.in-r1 => vagrant.in}| 0 app-emulation/vagrant/vagrant-2.0.2.ebuild | 79 -- app-emulation/vagrant/vagrant-2.0.3.ebuild | 79 -- app-emulation/vagrant/vagrant-2.1.1.ebuild | 2 +- app-emulation/vagrant/vagrant-2.1.2.ebuild | 2 +- 6 files changed, 2 insertions(+), 162 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index cf6a0e38e94..393f07e9cb3 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a -DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in similarity index 100% rename from app-emulation/vagrant/files/vagrant.in-r1 rename to app-emulation/vagrant/files/vagrant.in diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild deleted file mode 100644 index ff7a205039a..000 --- a/app-emulation/vagrant/vagrant-2.0.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 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" -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="+virtualbox" -RESTRICT="test" - -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.5 - >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.2.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 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 - - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die -} - -all_ruby_install() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install - - # provide executable similar to upstream: - # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb - dobin "${PN}" - -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: b73eaf0a93e7b94adebdda786d6a933614f3eaf4 Author: Tomas Mozes gmail com> AuthorDate: Fri Apr 20 07:49:49 2018 + Commit: Amy Liffey gentoo org> CommitDate: Fri Apr 20 08:59:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73eaf0a app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/8079 Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-emulation/vagrant/Manifest | 2 - .../vagrant-1.8.1-disable-embedded-cacert.patch| 17 - app-emulation/vagrant/files/vagrant.in | 44 app-emulation/vagrant/vagrant-2.0.0.ebuild | 81 -- app-emulation/vagrant/vagrant-2.0.1-r1.ebuild | 78 - 5 files changed, 222 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 5722b113a3b..24c601035a8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 -DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch b/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch deleted file mode 100644 index afcb6f707f5..000 --- a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb -index 8756fc3..7fb2be8 100644 a/lib/vagrant/util/downloader.rb -+++ b/lib/vagrant/util/downloader.rb -@@ -215,8 +215,9 @@ module Vagrant - # If we're in Vagrant, then we use the packaged CA bundle - if Vagrant.in_installer? - subprocess_options[:env] ||= {} -- subprocess_options[:env]["CURL_CA_BUNDLE"] = --File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) -+ # Use system certificates. -+ # subprocess_options[:env]["CURL_CA_BUNDLE"] = -+ # File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) - end - - return [options, subprocess_options] - diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in deleted file mode 100644 index 761753208a7..000 --- a/app-emulation/vagrant/files/vagrant.in +++ /dev/null @@ -1,44 +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-@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" - -# Allow to install plugins even with deps in different slots (Bug #628648) -export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 - -#
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 2f902a36a4952856f4b7737c3ec94159be772d2d Author: Tomas Mozes gmail com> AuthorDate: Thu Nov 30 06:55:54 2017 + Commit: Patrice Clement gentoo org> CommitDate: Tue Dec 12 20:34:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f902a36 app-emulation/vagrant: improve ruby version discovery. Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6352 app-emulation/vagrant/files/vagrant.in-r1 | 15 +-- .../{vagrant-2.0.1.ebuild => vagrant-2.0.1-r1.ebuild} | 0 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in-r1 index 7c0405e8a83..134cb31f299 100644 --- a/app-emulation/vagrant/files/vagrant.in-r1 +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -5,16 +5,27 @@ # so that everything loads and compiles to proper directories. for r in ruby24 ruby23 ruby22; 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" - "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null - if [ $? -eq 0 ]; then + + 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 diff --git a/app-emulation/vagrant/vagrant-2.0.1.ebuild b/app-emulation/vagrant/vagrant-2.0.1-r1.ebuild similarity index 100% rename from app-emulation/vagrant/vagrant-2.0.1.ebuild rename to app-emulation/vagrant/vagrant-2.0.1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a87aeea90cf92a816a21ab18304296075f753922 Author: Tomáš Mózes gmail com> AuthorDate: Sat Nov 4 22:06:35 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Nov 6 07:37:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87aeea9 app-emulation/vagrant: drop old Closes:#6126 app-emulation/vagrant/Manifest | 1 - .../vagrant/files/vagrant-1.8.1-rvm.patch | 11 --- app-emulation/vagrant/files/vagrant-1.9.6 | 45 app-emulation/vagrant/vagrant-1.9.7.ebuild | 84 -- 4 files changed, 141 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c626066ee4a..6608809f83d 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -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-1.8.1-rvm.patch b/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch deleted file mode 100644 index 81d17be010e..000 --- 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-1.9.6 deleted file mode 100644 index ef264888f3f..000 --- a/app-emulation/vagrant/files/vagrant-1.9.6 +++ /dev/null @@ -1,45 +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.9.6"' )" - -# 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.7.ebuild b/app-emulation/vagrant/vagrant-1.9.7.ebuild deleted file mode 100644 index b6b67db26be..000 ---
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 6943dced0c6ac2d304ae45860c76ff550dd50b9a Author: Tomas Mozes gmail com> AuthorDate: Wed Aug 16 09:54:40 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 16 14:24:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6943dced app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/5353 Package-Manager: Portage-2.3.7, Repoman-2.3.2 app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/vagrant-1.9.5 | 45 app-emulation/vagrant/vagrant-1.9.5.ebuild | 82 -- 3 files changed, 128 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 521a17e4ad7..0e014b61a7a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -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-1.9.5 b/app-emulation/vagrant/files/vagrant-1.9.5 deleted file mode 100644 index 17041e56575..000 --- a/app-emulation/vagrant/files/vagrant-1.9.5 +++ /dev/null @@ -1,45 +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.9.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" - -# 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.5.ebuild b/app-emulation/vagrant/vagrant-1.9.5.ebuild deleted file mode 100644 index b8c4920bc85..000 --- a/app-emulation/vagrant/vagrant-1.9.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -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 -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 703f15e18a5635eef6d2029e1786f4b87daf0729 Author: Tomas Mozes gmail com> AuthorDate: Mon May 22 08:59:22 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 13:20:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703f15e1 app-emulation/vagrant: bump to 1.9.5, drop old Closes: https://github.com/gentoo/gentoo/pull/4709 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-emulation/vagrant/Manifest| 2 +- app-emulation/vagrant/files/{vagrant-1.9.2 => vagrant-1.9.5} | 2 +- .../vagrant/{vagrant-1.9.2.ebuild => vagrant-1.9.5.ebuild}| 11 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 1eca1c22ef8..91e43dc13dd 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -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 +DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208 diff --git a/app-emulation/vagrant/files/vagrant-1.9.2 b/app-emulation/vagrant/files/vagrant-1.9.5 similarity index 98% rename from app-emulation/vagrant/files/vagrant-1.9.2 rename to app-emulation/vagrant/files/vagrant-1.9.5 index 060bf9e059e..17041e56575 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.2 +++ b/app-emulation/vagrant/files/vagrant-1.9.5 @@ -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.2"' )" +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.5"' )" # Export GEM_HOME based on VAGRANT_HOME # diff --git a/app-emulation/vagrant/vagrant-1.9.2.ebuild b/app-emulation/vagrant/vagrant-1.9.5.ebuild similarity index 92% rename from app-emulation/vagrant/vagrant-1.9.2.ebuild rename to app-emulation/vagrant/vagrant-1.9.5.ebuild index 6e5ff4a2b6c..b8c4920bc85 100644 --- a/app-emulation/vagrant/vagrant-1.9.2.ebuild +++ b/app-emulation/vagrant/vagrant-1.9.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="5" -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby22 ruby23" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -26,17 +26,17 @@ RDEPEND="${RDEPEND} virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" ruby_add_rdepend " - >=dev-ruby/childprocess-0.5.0 + >=dev-ruby/childprocess-0.6.0 >=dev-ruby/erubis-2.7.0 >=dev-ruby/i18n-0.6.0:* =dev-ruby/listen-3.1.5 >=dev-ruby/hashicorp-checkpoint-0.1.1 >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-3.0.1:* + >=dev-ruby/net-ssh-4.1.0:* >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.1.0 + >=dev-ruby/net-scp-1.2.0 || ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) - >=dev-ruby/nokogiri-1.6.7.1 + >=dev-ruby/nokogiri-1.7.1 >=dev-ruby/mime-types-2.6.2:* />=/' \ -e '/ruby_dep/s/<=/>=/' \ - -e '/nokogiri/s/=/>=/' \ -i ${PN}.gemspec || die # remove windows-specific gems
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 2dd1e81d3eae8232a2710435c19ea2d2f5d905bf Author: Tomas Mozes gmail com> AuthorDate: Mon Mar 6 06:43:26 2017 + Commit: Amy Liffey gentoo org> CommitDate: Wed Mar 15 21:07:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd1e81d app-emulation/vagrant: bump to 1.9.2, drop old Closes: #4135 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-emulation/vagrant/Manifest | 3 +- ...agrant-1.8.4-install-plugins-in-isolation.patch | 114 - app-emulation/vagrant/files/vagrant-1.8.7 | 46 - .../vagrant/files/{vagrant-1.8.6 => vagrant-1.9.2} | 5 +- app-emulation/vagrant/vagrant-1.8.7.ebuild | 87 app-emulation/vagrant/vagrant-1.9.1-r1.ebuild | 2 +- .../{vagrant-1.8.6.ebuild => vagrant-1.9.2.ebuild} | 16 ++- 7 files changed, 10 insertions(+), 263 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 7172e250aea..3efc9763881 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -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 +DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76 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 76730733eb6..000 --- 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.rb2016-06-13 10:21:40.0 +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 -+#
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 858920a09a10d24538d90159016a325148c3315d Author: Tomas Mozes gmail com> AuthorDate: Tue Nov 15 06:38:54 2016 + Commit: David Seifert gentoo org> CommitDate: Tue Nov 15 22:28:23 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858920a0 app-emulation/vagrant: drop old 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.4 | 46 app-emulation/vagrant/vagrant-1.8.4.ebuild | 87 -- 3 files changed, 134 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index e1078af..cb9c46a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -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.4 b/app-emulation/vagrant/files/vagrant-1.8.4 deleted file mode 100644 index 7306d3b.. --- a/app-emulation/vagrant/files/vagrant-1.8.4 +++ /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.4"' )" - -# 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.4.ebuild b/app-emulation/vagrant/vagrant-1.8.4.ebuild deleted file mode 100644 index f1b2602.. --- a/app-emulation/vagrant/vagrant-1.8.4.ebuild +++ /dev/null @@ -1,87 +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" - -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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 4e47762ac4ee5f896d0c7880b0cc6f947e30b751 Author: Tomas Mozes gmail com> AuthorDate: Fri Oct 7 05:14:43 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 8 12:45:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e47762a app-emulation/vagrant: version bump to 1.8.6. Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2500 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.6 | 46 app-emulation/vagrant/vagrant-1.8.6.ebuild | 88 ++ 3 files changed, 135 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 6fcc7eb..f1eb49f 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ 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 +DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b diff --git a/app-emulation/vagrant/files/vagrant-1.8.6 b/app-emulation/vagrant/files/vagrant-1.8.6 new file mode 100644 index ..d4db0de --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.6 @@ -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.6"' )" + +# 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.6.ebuild b/app-emulation/vagrant/vagrant-1.8.6.ebuild new file mode 100644 index ..fda85cc --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.6.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" + +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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 3cc12b63fe4209ba7ea87de6d76fcfe78d94634f Author: Tomas Mozes gmail com> AuthorDate: Fri Oct 7 05:16:25 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 8 12:45:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc12b63 app-emulation/vagrant: drop old. Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2500 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/vagrant-1.8.1 | 46 ...agrant-1.8.1-install-plugins-in-isolation.patch | 122 - app-emulation/vagrant/vagrant-1.8.1.ebuild | 87 --- 4 files changed, 256 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index f1eb49f..ee34b31 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +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 DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b diff --git a/app-emulation/vagrant/files/vagrant-1.8.1 b/app-emulation/vagrant/files/vagrant-1.8.1 deleted file mode 100644 index 760db56.. --- a/app-emulation/vagrant/files/vagrant-1.8.1 +++ /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.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 arguments -exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch deleted file mode 100644 index c6934ab.. --- a/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/bin/vagrant b/bin/vagrant -index fce68c8..781fc63 100755 a/bin/vagrant -+++ b/bin/vagrant -@@ -69,6 +69,11 @@ end - require "bundler" - begin - $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) -+# Invalidate the
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a48f6b99381ac753738bec83430df4f96267c25b Author: Tomas Mozes gmail com> AuthorDate: Thu Jun 23 10:29:14 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Jun 23 21:18:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48f6b99 app-emulation/vagrant: version bump to 1.8.4 Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1728 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.4 | 46 + ...agrant-1.8.4-install-plugins-in-isolation.patch | 114 + app-emulation/vagrant/vagrant-1.8.4.ebuild | 87 4 files changed, 248 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 24578f1..c72fb6d 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ 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 diff --git a/app-emulation/vagrant/files/vagrant-1.8.4 b/app-emulation/vagrant/files/vagrant-1.8.4 new file mode 100644 index 000..7306d3b --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.4 @@ -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.4"' )" + +# 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.4-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch new file mode 100644 index 000..7673073 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch @@ -0,0 +1,114 @@ +--- 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.rb2016-06-13 10:21:40.0 +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