1 |
commit: 4e47762ac4ee5f896d0c7880b0cc6f947e30b751 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Oct 7 05:14:43 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 8 12:45:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e47762a |
7 |
|
8 |
app-emulation/vagrant: version bump to 1.8.6. |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2500 |
12 |
|
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
|
15 |
app-emulation/vagrant/Manifest | 1 + |
16 |
app-emulation/vagrant/files/vagrant-1.8.6 | 46 ++++++++++++++++ |
17 |
app-emulation/vagrant/vagrant-1.8.6.ebuild | 88 ++++++++++++++++++++++++++++++ |
18 |
3 files changed, 135 insertions(+) |
19 |
|
20 |
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest |
21 |
index 6fcc7eb..f1eb49f 100644 |
22 |
--- a/app-emulation/vagrant/Manifest |
23 |
+++ b/app-emulation/vagrant/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 |
26 |
DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 |
27 |
DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c |
28 |
+DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b |
29 |
|
30 |
diff --git a/app-emulation/vagrant/files/vagrant-1.8.6 b/app-emulation/vagrant/files/vagrant-1.8.6 |
31 |
new file mode 100644 |
32 |
index 00000000..d4db0de |
33 |
--- /dev/null |
34 |
+++ b/app-emulation/vagrant/files/vagrant-1.8.6 |
35 |
@@ -0,0 +1,46 @@ |
36 |
+#!/usr/bin/env bash |
37 |
+# |
38 |
+# This is a wrapper to properly execute Vagrant within the embedded |
39 |
+# Vagrant installation directory. This sets up proper environmental variables |
40 |
+# so that everything loads and compiles to proper directories. |
41 |
+ |
42 |
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.6"' )" |
43 |
+ |
44 |
+# Export GEM_HOME based on VAGRANT_HOME |
45 |
+# |
46 |
+# This needs to be set because Bundler includes gem paths |
47 |
+# from RubyGems' Gem.paths. |
48 |
+if [ -z $VAGRANT_HOME ]; then |
49 |
+ VAGRANT_HOME=$(eval echo "~/.vagrant.d") |
50 |
+fi |
51 |
+export GEM_HOME="$VAGRANT_HOME/gems" |
52 |
+ |
53 |
+# SSL certs |
54 |
+export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" |
55 |
+ |
56 |
+# Export an environmental variable to say we're in a Vagrant |
57 |
+# installer created environment. |
58 |
+export VAGRANT_INSTALLER_ENV=1 |
59 |
+ |
60 |
+# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file |
61 |
+# to locate plugins configuration file. |
62 |
+export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" |
63 |
+export VAGRANT_INSTALLER_VERSION="2" |
64 |
+ |
65 |
+# Determine the OS that we're on, which is used in some later checks. |
66 |
+# It is very important we do this _before_ setting the PATH below |
67 |
+# because uname dependencies can conflict on some platforms. |
68 |
+OS=$(uname -s 2>/dev/null) |
69 |
+ |
70 |
+# Export the OS as an environmental variable that Vagrant can access |
71 |
+# so that it can behave better. |
72 |
+export VAGRANT_DETECTED_OS="${OS}" |
73 |
+ |
74 |
+VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" |
75 |
+VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" |
76 |
+ |
77 |
+# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit |
78 |
+export VAGRANT_EXECUTABLE |
79 |
+ |
80 |
+# Call the actual Vagrant bin with our arguments |
81 |
+exec ruby "${VAGRANT_LAUNCHER}" "$@" |
82 |
|
83 |
diff --git a/app-emulation/vagrant/vagrant-1.8.6.ebuild b/app-emulation/vagrant/vagrant-1.8.6.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000..fda85cc |
86 |
--- /dev/null |
87 |
+++ b/app-emulation/vagrant/vagrant-1.8.6.ebuild |
88 |
@@ -0,0 +1,88 @@ |
89 |
+# Copyright 1999-2016 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+# $Id$ |
92 |
+ |
93 |
+EAPI="5" |
94 |
+USE_RUBY="ruby20 ruby21 ruby22" |
95 |
+ |
96 |
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
97 |
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
98 |
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
99 |
+RUBY_FAKEGEM_TASK_DOC="" |
100 |
+ |
101 |
+inherit bash-completion-r1 ruby-fakegem eutils |
102 |
+ |
103 |
+DESCRIPTION="A tool for building and distributing development environments" |
104 |
+HOMEPAGE="http://vagrantup.com/" |
105 |
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
106 |
+ |
107 |
+LICENSE="MIT" |
108 |
+SLOT="0" |
109 |
+KEYWORDS="~amd64" |
110 |
+IUSE="+virtualbox" |
111 |
+ |
112 |
+RDEPEND="${RDEPEND} |
113 |
+ app-arch/libarchive |
114 |
+ net-misc/curl |
115 |
+ virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
116 |
+ |
117 |
+ruby_add_rdepend " |
118 |
+ >=dev-ruby/bundler-1.12.5 |
119 |
+ >=dev-ruby/childprocess-0.5.0 |
120 |
+ >=dev-ruby/erubis-2.7.0 |
121 |
+ >=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:* |
122 |
+ >=dev-ruby/listen-3.1.5 |
123 |
+ >=dev-ruby/hashicorp-checkpoint-0.1.1 |
124 |
+ >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 |
125 |
+ >=dev-ruby/net-ssh-3.0.1 |
126 |
+ >=dev-ruby/net-sftp-2.1 |
127 |
+ >=dev-ruby/net-scp-1.1.0 |
128 |
+ || ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) |
129 |
+ >=dev-ruby/nokogiri-1.6.7.1 |
130 |
+ >=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:* |
131 |
+" |
132 |
+ |
133 |
+ruby_add_bdepend " |
134 |
+ dev-ruby/rake |
135 |
+" |
136 |
+ |
137 |
+all_ruby_prepare() { |
138 |
+ # remove bundler support |
139 |
+ sed -i '/[Bb]undler/d' Rakefile || die |
140 |
+ rm Gemfile || die |
141 |
+ |
142 |
+ # loosen dependencies |
143 |
+ sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \ |
144 |
+ -e '/ruby_dep/s/<=/>=/' \ |
145 |
+ -e '/nokogiri\|bundler/s/=/>=/' \ |
146 |
+ -i ${PN}.gemspec || die |
147 |
+ |
148 |
+ # remove windows-specific gems |
149 |
+ sed -e '/wdm\|winrm/d' \ |
150 |
+ -i ${PN}.gemspec || die |
151 |
+ |
152 |
+ # remove bsd-specific gems |
153 |
+ sed -e '/rb-kqueue/d' \ |
154 |
+ -i ${PN}.gemspec || die |
155 |
+ |
156 |
+ # see https://github.com/mitchellh/vagrant/pull/5877 |
157 |
+ epatch "${FILESDIR}"/${PN}-1.8.4-install-plugins-in-isolation.patch |
158 |
+ |
159 |
+ # disable embedded CA certs and use system ones |
160 |
+ epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch |
161 |
+ |
162 |
+ # fix rvm issue (bug #474476) |
163 |
+ epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch |
164 |
+} |
165 |
+ |
166 |
+all_ruby_install() { |
167 |
+ newbashcomp contrib/bash/completion.sh ${PN} |
168 |
+ all_fakegem_install |
169 |
+ |
170 |
+ # provide executable similar to upstream: |
171 |
+ # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
172 |
+ newbin "${FILESDIR}/${P}" "${PN}" |
173 |
+ |
174 |
+ # directory for plugins.json |
175 |
+ dodir /var/lib/vagrant |
176 |
+} |