1 |
commit: 2a65bfb72e82ecf9184130a6c627e11007663293 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 1 04:47:36 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 1 04:49:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a65bfb7 |
7 |
|
8 |
app-emulation/vagrant: add virtualbox-6.1 support to 2.2.6 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/704372 |
11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
app-emulation/vagrant/files/support-vbox-6.1.patch | 75 ++++++++++++++++++++++ |
15 |
...agrant-2.2.6.ebuild => vagrant-2.2.6-r1.ebuild} | 4 +- |
16 |
2 files changed, 78 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-emulation/vagrant/files/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..59a54630279 |
21 |
--- /dev/null |
22 |
+++ b/app-emulation/vagrant/files/support-vbox-6.1.patch |
23 |
@@ -0,0 +1,75 @@ |
24 |
+From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001 |
25 |
+From: Brian Cain <bcain@×××××××××.com> |
26 |
+Date: Wed, 11 Dec 2019 13:25:11 -0800 |
27 |
+Subject: [PATCH] Fixes #11249: Add VirtualBox provider support for version |
28 |
+ 6.1.x |
29 |
+ |
30 |
+This commit adds support for VirtualBox version 6.1.x. It simply |
31 |
+inherits from the base 6.0.x provider class. |
32 |
+--- |
33 |
+ plugins/providers/virtualbox/driver/meta.rb | 1 + |
34 |
+ .../providers/virtualbox/driver/version_6_1.rb | 16 ++++++++++++++++ |
35 |
+ plugins/providers/virtualbox/plugin.rb | 1 + |
36 |
+ website/source/docs/virtualbox/index.html.md | 2 +- |
37 |
+ 4 files changed, 19 insertions(+), 1 deletion(-) |
38 |
+ create mode 100644 plugins/providers/virtualbox/driver/version_6_1.rb |
39 |
+ |
40 |
+diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb |
41 |
+index 24547b4044..ed013737b0 100644 |
42 |
+--- a/plugins/providers/virtualbox/driver/meta.rb |
43 |
++++ b/plugins/providers/virtualbox/driver/meta.rb |
44 |
+@@ -64,6 +64,7 @@ def initialize(uuid=nil) |
45 |
+ "5.1" => Version_5_1, |
46 |
+ "5.2" => Version_5_2, |
47 |
+ "6.0" => Version_6_0, |
48 |
++ "6.1" => Version_6_1, |
49 |
+ } |
50 |
+ |
51 |
+ if @@version.start_with?("4.2.14") |
52 |
+diff --git a/plugins/providers/virtualbox/driver/version_6_1.rb b/plugins/providers/virtualbox/driver/version_6_1.rb |
53 |
+new file mode 100644 |
54 |
+index 0000000000..ebe417eb91 |
55 |
+--- /dev/null |
56 |
++++ b/plugins/providers/virtualbox/driver/version_6_1.rb |
57 |
+@@ -0,0 +1,16 @@ |
58 |
++require File.expand_path("../version_6_0", __FILE__) |
59 |
++ |
60 |
++module VagrantPlugins |
61 |
++ module ProviderVirtualBox |
62 |
++ module Driver |
63 |
++ # Driver for VirtualBox 6.1.x |
64 |
++ class Version_6_1 < Version_6_0 |
65 |
++ def initialize(uuid) |
66 |
++ super |
67 |
++ |
68 |
++ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1") |
69 |
++ end |
70 |
++ end |
71 |
++ end |
72 |
++ end |
73 |
++end |
74 |
+diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb |
75 |
+index e058ec65ad..f2fbf47e55 100644 |
76 |
+--- a/plugins/providers/virtualbox/plugin.rb |
77 |
++++ b/plugins/providers/virtualbox/plugin.rb |
78 |
+@@ -59,6 +59,7 @@ module Driver |
79 |
+ autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__) |
80 |
+ autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__) |
81 |
+ autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__) |
82 |
++ autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__) |
83 |
+ end |
84 |
+ |
85 |
+ module Model |
86 |
+diff --git a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md |
87 |
+index 558ef5f5d8..e9c1e79aad 100644 |
88 |
+--- a/website/source/docs/virtualbox/index.html.md |
89 |
++++ b/website/source/docs/virtualbox/index.html.md |
90 |
+@@ -13,7 +13,7 @@ Vagrant comes with support out of the box for [VirtualBox](https://www.virtualbo |
91 |
+ a free, cross-platform consumer virtualization product. |
92 |
+ |
93 |
+ The VirtualBox provider is compatible with VirtualBox versions 4.0.x, 4.1.x, |
94 |
+-4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, and 6.0.x. Other versions are unsupported and the provider |
95 |
++4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, 6.0.x, and 6.1.x. Other versions are unsupported and the provider |
96 |
+ will display an error message. Please note that beta and pre-release versions |
97 |
+ of VirtualBox are not supported and may not be well-behaved. |
98 |
+ |
99 |
|
100 |
diff --git a/app-emulation/vagrant/vagrant-2.2.6.ebuild b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
101 |
similarity index 96% |
102 |
rename from app-emulation/vagrant/vagrant-2.2.6.ebuild |
103 |
rename to app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
104 |
index d3796ed1651..db493d1a781 100644 |
105 |
--- a/app-emulation/vagrant/vagrant-2.2.6.ebuild |
106 |
+++ b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild |
107 |
@@ -1,4 +1,4 @@ |
108 |
-# Copyright 1999-2019 Gentoo Authors |
109 |
+# Copyright 1999-2020 Gentoo Authors |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
|
112 |
EAPI=6 |
113 |
@@ -52,6 +52,8 @@ ruby_add_bdepend " |
114 |
>=dev-ruby/rake-10.5.0 |
115 |
" |
116 |
|
117 |
+PATCHES="${FILESDIR}/support-vbox-6.1.patch" |
118 |
+ |
119 |
all_ruby_prepare() { |
120 |
# remove bundler support |
121 |
sed -i '/[Bb]undler/d' Rakefile || die |