Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
Date: Tue, 28 Sep 2021 01:01:57
Message-Id: 1632790850.d846a14da7548f88932b2ee37f9bc54886c2adce.sam@gentoo
1 commit: d846a14da7548f88932b2ee37f9bc54886c2adce
2 Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 14 17:11:40 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 28 01:00:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d846a14d
7
8 app-emulation/vagrant: Bump to version 2.2.14
9
10 Closes: https://bugs.gentoo.org/765253
11 Package-Manager: Portage-3.0.13, Repoman-3.0.2
12 Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/19053
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 app-emulation/vagrant/Manifest | 1 +
17 app-emulation/vagrant/files/vagrant.in | 2 +-
18 app-emulation/vagrant/vagrant-2.2.14.ebuild | 93 +++++++++++++++++++++++++++++
19 3 files changed, 95 insertions(+), 1 deletion(-)
20
21 diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
22 index d686f4587be..b59e046f1a2 100644
23 --- a/app-emulation/vagrant/Manifest
24 +++ b/app-emulation/vagrant/Manifest
25 @@ -1,2 +1,3 @@
26 +DIST vagrant-2.2.14.tar.gz 2522944 BLAKE2B 21980ab11fb7477518a40839715b6b207e9a2268e19df2ded0042a7d3d32cd45db02acfeb528c89869e54e9f4358b200f831150ada43c062513d864896eb7895 SHA512 540457c23ff52faef10774ac2d0da7a8c30682a19964f5ce805d5013eb27a6538468fcd511610d4bef539df14cbc4cf3a3dcdd9c96ba303ecf538028dc4aa659
27 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87
28 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
29
30 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in
31 index fd35177c6fe..5760b56839c 100644
32 --- a/app-emulation/vagrant/files/vagrant.in
33 +++ b/app-emulation/vagrant/files/vagrant.in
34 @@ -4,7 +4,7 @@
35 # Vagrant installation directory. This sets up proper environmental variables
36 # so that everything loads and compiles to proper directories.
37
38 -for r in ruby26 ruby25 ruby24; do
39 +for r in ruby27 ruby26 ruby25; do
40 # not all ruby versions are guaranteed to be installed
41 if ! command -v "${r}" >/dev/null 2>&1; then
42 continue
43
44 diff --git a/app-emulation/vagrant/vagrant-2.2.14.ebuild b/app-emulation/vagrant/vagrant-2.2.14.ebuild
45 new file mode 100644
46 index 00000000000..850c675b347
47 --- /dev/null
48 +++ b/app-emulation/vagrant/vagrant-2.2.14.ebuild
49 @@ -0,0 +1,93 @@
50 +# Copyright 1999-2021 Gentoo Authors
51 +# Distributed under the terms of the GNU General Public License v2
52 +
53 +EAPI=7
54 +USE_RUBY="ruby25 ruby26 ruby27"
55 +
56 +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
57 +RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
58 +RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
59 +RUBY_FAKEGEM_TASK_DOC=""
60 +
61 +inherit bash-completion-r1 optfeature ruby-fakegem
62 +
63 +DESCRIPTION="A tool for building and distributing development environments"
64 +HOMEPAGE="https://vagrantup.com/"
65 +SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
66 +
67 +LICENSE="MIT"
68 +SLOT="0"
69 +KEYWORDS="~amd64"
70 +IUSE="test"
71 +RESTRICT="!test? ( test )"
72 +
73 +RDEPEND="
74 + ${RDEPEND}
75 + app-arch/libarchive
76 + net-misc/curl
77 +"
78 +
79 +ruby_add_rdepend "
80 + >=dev-ruby/bcrypt_pbkdf-1.0.0
81 + >=dev-ruby/childprocess-4.0.0
82 + >=dev-ruby/ed25519-1.2.4
83 + dev-ruby/erubi
84 + >=dev-ruby/hashicorp-checkpoint-0.1.5
85 + >=dev-ruby/i18n-1.8:1
86 + >=dev-ruby/listen-3.1
87 + <dev-ruby/log4r-1.1.11
88 + >=dev-ruby/mime-types-3.3:*
89 + >=dev-ruby/rubyzip-2.0
90 + >=dev-ruby/net-scp-3.0.0
91 + >=dev-ruby/net-sftp-3.0
92 + >=dev-ruby/net-ssh-6.1.0
93 + dev-ruby/rest-client:2
94 + >=dev-ruby/vagrant_cloud-3.0.2
95 +"
96 +
97 +ruby_add_bdepend "
98 + >=dev-ruby/rake-12.3.3
99 + test? (
100 + dev-ruby/rspec
101 + dev-ruby/rspec-its
102 + dev-ruby/webmock
103 + )
104 +"
105 +
106 +all_ruby_prepare() {
107 + # remove bundler support
108 + sed -i '/[Bb]undler/d' Rakefile || die
109 + rm Gemfile || die
110 + rm tasks/bundler.rake || die
111 +
112 + sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
113 + -e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
114 + -e '/fake_ftp/ s:^#*:#:' \
115 + -e '/wdm/ s:^#*:#:' \
116 + -e '/winrm/ s:^#*:#:' \
117 + -e '/rb-kqueue/ s:^#*:#:' \
118 + -e '/ruby_dep/ s:^#*:#:' \
119 + -i ${PN}.gemspec || die
120 +
121 + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
122 +}
123 +
124 +all_ruby_install() {
125 + all_fakegem_install
126 +
127 + newbashcomp contrib/bash/completion.sh ${PN}
128 +
129 + # provide executable similar to upstream:
130 + # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
131 + dobin "${PN}"
132 +
133 + # directory for plugins.json
134 + keepdir /var/lib/vagrant
135 +
136 + insinto /usr/share/vim/vimfiles/syntax/
137 + doins contrib/vim/vagrantfile.vim
138 +
139 + elog "Optional dependencies:"
140 + optfeature "virtualbox support" app-emulation/virtualbox
141 + optfeature "docker support" app-emulation/docker
142 +}