1 |
commit: 15758dabbd97c62c6e2572a9e237041469d7aa1f |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Sep 8 05:07:59 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 10 21:24:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15758dab |
7 |
|
8 |
app-emulation/vagrant: version bump to 1.9.8. |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.2 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/5657 |
12 |
|
13 |
app-emulation/vagrant/Manifest | 1 + |
14 |
app-emulation/vagrant/files/vagrant.in | 8 ++- |
15 |
app-emulation/vagrant/vagrant-1.9.8.ebuild | 81 ++++++++++++++++++++++++++++++ |
16 |
3 files changed, 89 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest |
19 |
index 0e014b61a7a..1bfe5d16690 100644 |
20 |
--- a/app-emulation/vagrant/Manifest |
21 |
+++ b/app-emulation/vagrant/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 |
24 |
DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 |
25 |
+DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee |
26 |
|
27 |
diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in |
28 |
index 0da39caea41..761753208a7 100644 |
29 |
--- a/app-emulation/vagrant/files/vagrant.in |
30 |
+++ b/app-emulation/vagrant/files/vagrant.in |
31 |
@@ -25,7 +25,7 @@ export VAGRANT_INSTALLER_ENV=1 |
32 |
# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file |
33 |
# to locate plugins configuration file. |
34 |
export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" |
35 |
-export VAGRANT_INSTALLER_VERSION="2" |
36 |
+export VAGRANT_INSTALLER_VERSION=2 |
37 |
|
38 |
# Export the OS as an environmental variable that Vagrant can access |
39 |
# so that it can behave better. |
40 |
@@ -34,5 +34,11 @@ export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" |
41 |
# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit |
42 |
export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" |
43 |
|
44 |
+# Allow to install plugins even with deps in different slots (Bug #628648) |
45 |
+export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 |
46 |
+ |
47 |
+# Make it work with rvm (Bugs #474476 #628648) |
48 |
+unset GEM_HOME GEM_PATH |
49 |
+ |
50 |
# Call the actual Vagrant bin with our arguments |
51 |
exec ruby "${VAGRANT_EXECUTABLE}" "$@" |
52 |
|
53 |
diff --git a/app-emulation/vagrant/vagrant-1.9.8.ebuild b/app-emulation/vagrant/vagrant-1.9.8.ebuild |
54 |
new file mode 100644 |
55 |
index 00000000000..7d133f044eb |
56 |
--- /dev/null |
57 |
+++ b/app-emulation/vagrant/vagrant-1.9.8.ebuild |
58 |
@@ -0,0 +1,81 @@ |
59 |
+# Copyright 1999-2017 Gentoo Foundation |
60 |
+# Distributed under the terms of the GNU General Public License v2 |
61 |
+ |
62 |
+EAPI="6" |
63 |
+USE_RUBY="ruby22 ruby23" |
64 |
+ |
65 |
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" |
66 |
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" |
67 |
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" |
68 |
+RUBY_FAKEGEM_TASK_DOC="" |
69 |
+ |
70 |
+inherit bash-completion-r1 ruby-fakegem eutils |
71 |
+ |
72 |
+DESCRIPTION="A tool for building and distributing development environments" |
73 |
+HOMEPAGE="http://vagrantup.com/" |
74 |
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
75 |
+ |
76 |
+LICENSE="MIT" |
77 |
+SLOT="0" |
78 |
+KEYWORDS="~amd64" |
79 |
+IUSE="+virtualbox" |
80 |
+ |
81 |
+RDEPEND="${RDEPEND} |
82 |
+ app-arch/libarchive |
83 |
+ net-misc/curl |
84 |
+ virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" |
85 |
+ |
86 |
+ruby_add_rdepend " |
87 |
+ >=dev-ruby/childprocess-0.6.0 |
88 |
+ >=dev-ruby/erubis-2.7.0 |
89 |
+ <dev-ruby/i18n-0.8.0:* |
90 |
+ >=dev-ruby/listen-3.1.5 |
91 |
+ >=dev-ruby/hashicorp-checkpoint-0.1.1 |
92 |
+ >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 |
93 |
+ >=dev-ruby/net-ssh-4.1.0:* |
94 |
+ >=dev-ruby/net-sftp-2.1 |
95 |
+ >=dev-ruby/net-scp-1.2.0 |
96 |
+ || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) |
97 |
+ >=dev-ruby/nokogiri-1.7.1 |
98 |
+ <dev-ruby/mime-types-3:* |
99 |
+" |
100 |
+ |
101 |
+ruby_add_bdepend " |
102 |
+ >=dev-ruby/rake-12.0.0 |
103 |
+" |
104 |
+ |
105 |
+all_ruby_prepare() { |
106 |
+ # remove bundler support |
107 |
+ sed -i '/[Bb]undler/d' Rakefile || die |
108 |
+ rm Gemfile || die |
109 |
+ |
110 |
+ # loosen dependencies |
111 |
+ sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ |
112 |
+ -e '/ruby_dep/s/<=/>=/' \ |
113 |
+ -i ${PN}.gemspec || die |
114 |
+ |
115 |
+ # remove windows-specific gems |
116 |
+ sed -e '/wdm\|winrm/d' \ |
117 |
+ -i ${PN}.gemspec || die |
118 |
+ |
119 |
+ # remove bsd-specific gems |
120 |
+ sed -e '/rb-kqueue/d' \ |
121 |
+ -i ${PN}.gemspec || die |
122 |
+ |
123 |
+ # disable embedded CA certs and use system ones |
124 |
+ epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch |
125 |
+ |
126 |
+ sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die |
127 |
+} |
128 |
+ |
129 |
+all_ruby_install() { |
130 |
+ newbashcomp contrib/bash/completion.sh ${PN} |
131 |
+ all_fakegem_install |
132 |
+ |
133 |
+ # provide executable similar to upstream: |
134 |
+ # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb |
135 |
+ dobin "${PN}" |
136 |
+ |
137 |
+ # directory for plugins.json |
138 |
+ dodir /var/lib/vagrant |
139 |
+} |