1 |
commit: 02cfdf5d067ff904b95725f75e70f6250e4ab6fe |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 1 06:12:58 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 1 06:13:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cfdf5d |
7 |
|
8 |
app-emulation/vagrant: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
app-emulation/vagrant/Manifest | 4 -- |
14 |
app-emulation/vagrant/files/vagrant-r1.in | 61 ------------------ |
15 |
app-emulation/vagrant/files/vagrant.in | 2 +- |
16 |
app-emulation/vagrant/vagrant-2.1.5.ebuild | 82 ------------------------ |
17 |
app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 90 --------------------------- |
18 |
app-emulation/vagrant/vagrant-2.2.4.ebuild | 90 --------------------------- |
19 |
app-emulation/vagrant/vagrant-2.2.5.ebuild | 90 --------------------------- |
20 |
app-emulation/vagrant/vagrant-2.2.6-r1.ebuild | 2 +- |
21 |
8 files changed, 2 insertions(+), 419 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest |
24 |
index 307430a6bf1..b063bb21fc8 100644 |
25 |
--- a/app-emulation/vagrant/Manifest |
26 |
+++ b/app-emulation/vagrant/Manifest |
27 |
@@ -1,5 +1 @@ |
28 |
-DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 |
29 |
-DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 |
30 |
-DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a |
31 |
-DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272 |
32 |
DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a |
33 |
|
34 |
diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in |
35 |
deleted file mode 100644 |
36 |
index fd35177c6fe..00000000000 |
37 |
--- a/app-emulation/vagrant/files/vagrant-r1.in |
38 |
+++ /dev/null |
39 |
@@ -1,61 +0,0 @@ |
40 |
-#!/usr/bin/env bash |
41 |
-# |
42 |
-# This is a wrapper to properly execute Vagrant within the embedded |
43 |
-# Vagrant installation directory. This sets up proper environmental variables |
44 |
-# so that everything loads and compiles to proper directories. |
45 |
- |
46 |
-for r in ruby26 ruby25 ruby24; do |
47 |
- # not all ruby versions are guaranteed to be installed |
48 |
- if ! command -v "${r}" >/dev/null 2>&1; then |
49 |
- continue |
50 |
- fi |
51 |
- |
52 |
- VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" |
53 |
- |
54 |
- # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit |
55 |
- export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" |
56 |
- |
57 |
- if [ -f ${VAGRANT_EXECUTABLE} ] ;then |
58 |
- ruby="${r}" |
59 |
- break |
60 |
- fi |
61 |
-done |
62 |
- |
63 |
-if [ -z ${ruby} ]; then |
64 |
- echo "Error: failed to find any usable ruby" |
65 |
- exit 1 |
66 |
-fi |
67 |
- |
68 |
-# Export GEM_HOME based on VAGRANT_HOME |
69 |
-# |
70 |
-# This needs to be set because Bundler includes gem paths |
71 |
-# from RubyGems' Gem.paths. |
72 |
-if [ -z ${VAGRANT_HOME} ]; then |
73 |
- VAGRANT_HOME="~/.vagrant.d" |
74 |
-fi |
75 |
-export GEM_HOME="${VAGRANT_HOME}/gems" |
76 |
- |
77 |
-# SSL certs |
78 |
-export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" |
79 |
- |
80 |
-# Export an environmental variable to say we're in a Vagrant |
81 |
-# installer created environment. |
82 |
-export VAGRANT_INSTALLER_ENV=1 |
83 |
- |
84 |
-# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file |
85 |
-# to locate plugins configuration file. |
86 |
-export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" |
87 |
-export VAGRANT_INSTALLER_VERSION=2 |
88 |
- |
89 |
-# Export the OS as an environmental variable that Vagrant can access |
90 |
-# so that it can behave better. |
91 |
-export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" |
92 |
- |
93 |
-# Allow to install plugins even with deps in different slots (Bug #628648) |
94 |
-export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 |
95 |
- |
96 |
-# Make it work with rvm (Bugs #474476 #628648) |
97 |
-unset GEM_HOME GEM_PATH |
98 |
- |
99 |
-# Call the actual Vagrant bin with our arguments |
100 |
-exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@" |
101 |
|
102 |
diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in |
103 |
index 86fa86fe591..fd35177c6fe 100644 |
104 |
--- a/app-emulation/vagrant/files/vagrant.in |
105 |
+++ b/app-emulation/vagrant/files/vagrant.in |
106 |
@@ -4,7 +4,7 @@ |
107 |
# Vagrant installation directory. This sets up proper environmental variables |
108 |
# so that everything loads and compiles to proper directories. |
109 |
|
110 |
-for r in ruby25 ruby24; do |
111 |
+for r in ruby26 ruby25 ruby24; do |
112 |
# not all ruby versions are guaranteed to be installed |
113 |
if ! command -v "${r}" >/dev/null 2>&1; then |
114 |
continue |
115 |
|
116 |
diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild |
117 |
deleted file mode 100644 |
118 |
index 509b0117225..00000000000 |
119 |
--- a/app-emulation/vagrant/vagrant-2.1.5.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,82 +0,0 @@ |
122 |
-# Copyright 1999-2019 Gentoo Authors |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
- |
125 |
-EAPI="6" |
126 |
-USE_RUBY="ruby24 ruby25" |
127 |
- |
128 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
129 |
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
130 |
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
131 |
-RUBY_FAKEGEM_TASK_DOC="" |
132 |
- |
133 |
-inherit bash-completion-r1 ruby-fakegem |
134 |
- |
135 |
-DESCRIPTION="A tool for building and distributing development environments" |
136 |
-HOMEPAGE="https://vagrantup.com/" |
137 |
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
138 |
- |
139 |
-LICENSE="MIT" |
140 |
-SLOT="0" |
141 |
-KEYWORDS="~amd64" |
142 |
-IUSE="+virtualbox" |
143 |
-RESTRICT="test" |
144 |
- |
145 |
-RDEPEND="${RDEPEND} |
146 |
- app-arch/libarchive |
147 |
- net-misc/curl |
148 |
- virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
149 |
- |
150 |
-ruby_add_rdepend " |
151 |
- >=dev-ruby/childprocess-0.6.0 |
152 |
- >=dev-ruby/erubis-2.7.0 |
153 |
- <dev-ruby/i18n-0.8.0:* |
154 |
- >=dev-ruby/listen-3.1.5 |
155 |
- >=dev-ruby/hashicorp-checkpoint-0.1.5 |
156 |
- >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 |
157 |
- >=dev-ruby/net-ssh-5.0.0:* |
158 |
- >=dev-ruby/net-sftp-2.1 |
159 |
- >=dev-ruby/net-scp-1.2.0 |
160 |
- dev-ruby/rest-client:2 |
161 |
- <dev-ruby/mime-types-3:* |
162 |
-" |
163 |
- |
164 |
-# upstream specifies rake>=12 but it apparently doesn't need something this |
165 |
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake |
166 |
-# is tricky, we specify a lower dependency requirement here. This way, we'll be |
167 |
-# able to stabilize vagrant sooner. |
168 |
-ruby_add_bdepend " |
169 |
- >=dev-ruby/rake-10.0.0 |
170 |
-" |
171 |
- |
172 |
-all_ruby_prepare() { |
173 |
- # remove bundler support |
174 |
- sed -i '/[Bb]undler/d' Rakefile || die |
175 |
- rm Gemfile || die |
176 |
- |
177 |
- # loosen dependencies |
178 |
- sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ |
179 |
- -e '/ruby_dep/s/<=/>=/' \ |
180 |
- -i ${PN}.gemspec || die |
181 |
- |
182 |
- # remove windows-specific gems |
183 |
- sed -e '/wdm\|winrm/d' \ |
184 |
- -i ${PN}.gemspec || die |
185 |
- |
186 |
- # remove bsd-specific gems |
187 |
- sed -e '/rb-kqueue/d' \ |
188 |
- -i ${PN}.gemspec || die |
189 |
- |
190 |
- sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die |
191 |
-} |
192 |
- |
193 |
-all_ruby_install() { |
194 |
- newbashcomp contrib/bash/completion.sh ${PN} |
195 |
- all_fakegem_install |
196 |
- |
197 |
- # provide executable similar to upstream: |
198 |
- # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
199 |
- dobin "${PN}" |
200 |
- |
201 |
- # directory for plugins.json |
202 |
- keepdir /var/lib/vagrant |
203 |
-} |
204 |
|
205 |
diff --git a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild |
206 |
deleted file mode 100644 |
207 |
index 92052b88307..00000000000 |
208 |
--- a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild |
209 |
+++ /dev/null |
210 |
@@ -1,90 +0,0 @@ |
211 |
-# Copyright 1999-2019 Gentoo Authors |
212 |
-# Distributed under the terms of the GNU General Public License v2 |
213 |
- |
214 |
-EAPI=6 |
215 |
-USE_RUBY="ruby24 ruby25" |
216 |
- |
217 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
218 |
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
219 |
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
220 |
-RUBY_FAKEGEM_TASK_DOC="" |
221 |
- |
222 |
-inherit bash-completion-r1 ruby-fakegem |
223 |
- |
224 |
-DESCRIPTION="A tool for building and distributing development environments" |
225 |
-HOMEPAGE="https://vagrantup.com/" |
226 |
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
227 |
- |
228 |
-LICENSE="MIT" |
229 |
-SLOT="0" |
230 |
-KEYWORDS="~amd64" |
231 |
-IUSE="+virtualbox" |
232 |
-RESTRICT="test" |
233 |
- |
234 |
-RDEPEND="${RDEPEND} |
235 |
- app-arch/libarchive |
236 |
- net-misc/curl |
237 |
- virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
238 |
- |
239 |
-ruby_add_rdepend " |
240 |
- >=dev-ruby/bcrypt_pbkdf-1.0.0 |
241 |
- >=dev-ruby/childprocess-0.6.0 |
242 |
- >=dev-ruby/ed25519-1.2.4 |
243 |
- >=dev-ruby/erubis-2.7.0 |
244 |
- >=dev-ruby/hashicorp-checkpoint-0.1.5 |
245 |
- >=dev-ruby/i18n-1.1.1:1 |
246 |
- >=dev-ruby/listen-3.1.5 |
247 |
- <dev-ruby/log4r-1.1.11 |
248 |
- <dev-ruby/mime-types-3:* |
249 |
- >=dev-ruby/net-ssh-5.0.0:* |
250 |
- >=dev-ruby/net-sftp-2.1 |
251 |
- >=dev-ruby/net-scp-1.2.0 |
252 |
- dev-ruby/rest-client:2 |
253 |
- >=dev-ruby/rubyzip-1.2.2 |
254 |
- >=dev-ruby/vagrant_cloud-2.0.0 |
255 |
-" |
256 |
- |
257 |
-# upstream specifies rake>=12 but it apparently doesn't need something this |
258 |
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake |
259 |
-# is tricky, we specify a lower dependency requirement here. This way, we'll be |
260 |
-# able to stabilize vagrant sooner. |
261 |
-ruby_add_bdepend " |
262 |
- >=dev-ruby/rake-10.5.0 |
263 |
-" |
264 |
- |
265 |
-all_ruby_prepare() { |
266 |
- # remove bundler support |
267 |
- sed -i '/[Bb]undler/d' Rakefile || die |
268 |
- rm Gemfile || die |
269 |
- |
270 |
- # loosen dependencies |
271 |
- sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ |
272 |
- -e '/ruby_dep/s/<=/>=/' \ |
273 |
- -i ${PN}.gemspec || die |
274 |
- |
275 |
- # remove windows-specific gems |
276 |
- sed -e '/wdm\|winrm/d' \ |
277 |
- -i ${PN}.gemspec || die |
278 |
- |
279 |
- # remove bsd-specific gems |
280 |
- sed -e '/rb-kqueue/d' \ |
281 |
- -i ${PN}.gemspec || die |
282 |
- |
283 |
- sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die |
284 |
-} |
285 |
- |
286 |
-all_ruby_install() { |
287 |
- all_fakegem_install |
288 |
- |
289 |
- newbashcomp contrib/bash/completion.sh ${PN} |
290 |
- |
291 |
- # provide executable similar to upstream: |
292 |
- # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
293 |
- dobin "${PN}" |
294 |
- |
295 |
- # directory for plugins.json |
296 |
- keepdir /var/lib/vagrant |
297 |
- |
298 |
- insinto /usr/share/vim/vimfiles/syntax/ |
299 |
- doins contrib/vim/vagrantfile.vim |
300 |
-} |
301 |
|
302 |
diff --git a/app-emulation/vagrant/vagrant-2.2.4.ebuild b/app-emulation/vagrant/vagrant-2.2.4.ebuild |
303 |
deleted file mode 100644 |
304 |
index 150022d0426..00000000000 |
305 |
--- a/app-emulation/vagrant/vagrant-2.2.4.ebuild |
306 |
+++ /dev/null |
307 |
@@ -1,90 +0,0 @@ |
308 |
-# Copyright 1999-2019 Gentoo Authors |
309 |
-# Distributed under the terms of the GNU General Public License v2 |
310 |
- |
311 |
-EAPI=6 |
312 |
-USE_RUBY="ruby24 ruby25 ruby26" |
313 |
- |
314 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
315 |
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
316 |
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
317 |
-RUBY_FAKEGEM_TASK_DOC="" |
318 |
- |
319 |
-inherit bash-completion-r1 ruby-fakegem |
320 |
- |
321 |
-DESCRIPTION="A tool for building and distributing development environments" |
322 |
-HOMEPAGE="https://vagrantup.com/" |
323 |
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
324 |
- |
325 |
-LICENSE="MIT" |
326 |
-SLOT="0" |
327 |
-KEYWORDS="~amd64" |
328 |
-IUSE="+virtualbox" |
329 |
-RESTRICT="test" |
330 |
- |
331 |
-RDEPEND="${RDEPEND} |
332 |
- app-arch/libarchive |
333 |
- net-misc/curl |
334 |
- virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
335 |
- |
336 |
-ruby_add_rdepend " |
337 |
- >=dev-ruby/bcrypt_pbkdf-1.0.0 |
338 |
- >=dev-ruby/childprocess-0.6.0 |
339 |
- >=dev-ruby/ed25519-1.2.4 |
340 |
- >=dev-ruby/erubis-2.7.0 |
341 |
- >=dev-ruby/hashicorp-checkpoint-0.1.5 |
342 |
- >=dev-ruby/i18n-1.1.1:1 |
343 |
- >=dev-ruby/listen-3.1.5 |
344 |
- <dev-ruby/log4r-1.1.11 |
345 |
- <dev-ruby/mime-types-3:* |
346 |
- >=dev-ruby/net-ssh-5.1.0:* |
347 |
- >=dev-ruby/net-sftp-2.1 |
348 |
- >=dev-ruby/net-scp-1.2.0 |
349 |
- dev-ruby/rest-client:2 |
350 |
- >=dev-ruby/rubyzip-1.2.2 |
351 |
- >=dev-ruby/vagrant_cloud-2.0.2 |
352 |
-" |
353 |
- |
354 |
-# upstream specifies rake>=12 but it apparently doesn't need something this |
355 |
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake |
356 |
-# is tricky, we specify a lower dependency requirement here. This way, we'll be |
357 |
-# able to stabilize vagrant sooner. |
358 |
-ruby_add_bdepend " |
359 |
- >=dev-ruby/rake-10.5.0 |
360 |
-" |
361 |
- |
362 |
-all_ruby_prepare() { |
363 |
- # remove bundler support |
364 |
- sed -i '/[Bb]undler/d' Rakefile || die |
365 |
- rm Gemfile || die |
366 |
- |
367 |
- # loosen dependencies |
368 |
- sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ |
369 |
- -e '/ruby_dep/s/<=/>=/' \ |
370 |
- -i ${PN}.gemspec || die |
371 |
- |
372 |
- # remove windows-specific gems |
373 |
- sed -e '/wdm\|winrm/d' \ |
374 |
- -i ${PN}.gemspec || die |
375 |
- |
376 |
- # remove bsd-specific gems |
377 |
- sed -e '/rb-kqueue/d' \ |
378 |
- -i ${PN}.gemspec || die |
379 |
- |
380 |
- sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die |
381 |
-} |
382 |
- |
383 |
-all_ruby_install() { |
384 |
- all_fakegem_install |
385 |
- |
386 |
- newbashcomp contrib/bash/completion.sh ${PN} |
387 |
- |
388 |
- # provide executable similar to upstream: |
389 |
- # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
390 |
- dobin "${PN}" |
391 |
- |
392 |
- # directory for plugins.json |
393 |
- keepdir /var/lib/vagrant |
394 |
- |
395 |
- insinto /usr/share/vim/vimfiles/syntax/ |
396 |
- doins contrib/vim/vagrantfile.vim |
397 |
-} |
398 |
|
399 |
diff --git a/app-emulation/vagrant/vagrant-2.2.5.ebuild b/app-emulation/vagrant/vagrant-2.2.5.ebuild |
400 |
deleted file mode 100644 |
401 |
index 150022d0426..00000000000 |
402 |
--- a/app-emulation/vagrant/vagrant-2.2.5.ebuild |
403 |
+++ /dev/null |
404 |
@@ -1,90 +0,0 @@ |
405 |
-# Copyright 1999-2019 Gentoo Authors |
406 |
-# Distributed under the terms of the GNU General Public License v2 |
407 |
- |
408 |
-EAPI=6 |
409 |
-USE_RUBY="ruby24 ruby25 ruby26" |
410 |
- |
411 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
412 |
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
413 |
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
414 |
-RUBY_FAKEGEM_TASK_DOC="" |
415 |
- |
416 |
-inherit bash-completion-r1 ruby-fakegem |
417 |
- |
418 |
-DESCRIPTION="A tool for building and distributing development environments" |
419 |
-HOMEPAGE="https://vagrantup.com/" |
420 |
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
421 |
- |
422 |
-LICENSE="MIT" |
423 |
-SLOT="0" |
424 |
-KEYWORDS="~amd64" |
425 |
-IUSE="+virtualbox" |
426 |
-RESTRICT="test" |
427 |
- |
428 |
-RDEPEND="${RDEPEND} |
429 |
- app-arch/libarchive |
430 |
- net-misc/curl |
431 |
- virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
432 |
- |
433 |
-ruby_add_rdepend " |
434 |
- >=dev-ruby/bcrypt_pbkdf-1.0.0 |
435 |
- >=dev-ruby/childprocess-0.6.0 |
436 |
- >=dev-ruby/ed25519-1.2.4 |
437 |
- >=dev-ruby/erubis-2.7.0 |
438 |
- >=dev-ruby/hashicorp-checkpoint-0.1.5 |
439 |
- >=dev-ruby/i18n-1.1.1:1 |
440 |
- >=dev-ruby/listen-3.1.5 |
441 |
- <dev-ruby/log4r-1.1.11 |
442 |
- <dev-ruby/mime-types-3:* |
443 |
- >=dev-ruby/net-ssh-5.1.0:* |
444 |
- >=dev-ruby/net-sftp-2.1 |
445 |
- >=dev-ruby/net-scp-1.2.0 |
446 |
- dev-ruby/rest-client:2 |
447 |
- >=dev-ruby/rubyzip-1.2.2 |
448 |
- >=dev-ruby/vagrant_cloud-2.0.2 |
449 |
-" |
450 |
- |
451 |
-# upstream specifies rake>=12 but it apparently doesn't need something this |
452 |
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake |
453 |
-# is tricky, we specify a lower dependency requirement here. This way, we'll be |
454 |
-# able to stabilize vagrant sooner. |
455 |
-ruby_add_bdepend " |
456 |
- >=dev-ruby/rake-10.5.0 |
457 |
-" |
458 |
- |
459 |
-all_ruby_prepare() { |
460 |
- # remove bundler support |
461 |
- sed -i '/[Bb]undler/d' Rakefile || die |
462 |
- rm Gemfile || die |
463 |
- |
464 |
- # loosen dependencies |
465 |
- sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ |
466 |
- -e '/ruby_dep/s/<=/>=/' \ |
467 |
- -i ${PN}.gemspec || die |
468 |
- |
469 |
- # remove windows-specific gems |
470 |
- sed -e '/wdm\|winrm/d' \ |
471 |
- -i ${PN}.gemspec || die |
472 |
- |
473 |
- # remove bsd-specific gems |
474 |
- sed -e '/rb-kqueue/d' \ |
475 |
- -i ${PN}.gemspec || die |
476 |
- |
477 |
- sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die |
478 |
-} |
479 |
- |
480 |
-all_ruby_install() { |
481 |
- all_fakegem_install |
482 |
- |
483 |
- newbashcomp contrib/bash/completion.sh ${PN} |
484 |
- |
485 |
- # provide executable similar to upstream: |
486 |
- # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
487 |
- dobin "${PN}" |
488 |
- |
489 |
- # directory for plugins.json |
490 |
- keepdir /var/lib/vagrant |
491 |
- |
492 |
- insinto /usr/share/vim/vimfiles/syntax/ |
493 |
- doins contrib/vim/vagrantfile.vim |
494 |
-} |
495 |
|
496 |
diff --git a/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
497 |
index db493d1a781..c7b3242780a 100644 |
498 |
--- a/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
499 |
+++ b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
500 |
@@ -72,7 +72,7 @@ all_ruby_prepare() { |
501 |
sed -e '/rb-kqueue/d' \ |
502 |
-i ${PN}.gemspec || die |
503 |
|
504 |
- sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die |
505 |
+ sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die |
506 |
} |
507 |
|
508 |
all_ruby_install() { |