5 files changed, 8 insertions, 89 deletions
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 234771d07d31..7aaf828211a2 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,8 +1,6 @@
-AUX vagrant.in-r1 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
-DIST vagrant-2.0.2.tar.gz 1177773 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a
-DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200
+AUX vagrant.in 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
 DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5
-EBUILD vagrant-2.0.2.ebuild 2070 BLAKE2B c6f3f3662b50365fa21079b32141cbc39c2a584dc79e84e12f47453c12f8b82b1d5ff2bf6dfda06b51677e36e1b79dd4120bda4cfd07b29f209652966027f0f6 SHA512 a2f82e70982f30e02b9d924439e80da723163104ef723b887d78486140690e9f19fd170bd9a57c38c7cc7436728376839022c27c7d6c7c55ef682c2827e5dfa5
-EBUILD vagrant-2.0.3.ebuild 2070 BLAKE2B c6f3f3662b50365fa21079b32141cbc39c2a584dc79e84e12f47453c12f8b82b1d5ff2bf6dfda06b51677e36e1b79dd4120bda4cfd07b29f209652966027f0f6 SHA512 a2f82e70982f30e02b9d924439e80da723163104ef723b887d78486140690e9f19fd170bd9a57c38c7cc7436728376839022c27c7d6c7c55ef682c2827e5dfa5
-EBUILD vagrant-2.1.1.ebuild 2078 BLAKE2B 0ac87b9628bbda5055b8891a8f2e9b9e5b0d5a6cf30b8f5e392477d7f342c38e071f200e225ee8a1d3800380195fbba185b0c366cb0ff0db0d266cc4016e9d2c SHA512 178b8fd6cc0dbbfa79aa1ccf006710e7f6bf7db789b6b50d025b43f9799469401e357b43c9632191fda3958c1350722f7df0362a9ade9fcd88bc74482f7b219e
+DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751
+EBUILD vagrant-2.1.1.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
+EBUILD vagrant-2.1.2.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
 MISC metadata.xml 526 BLAKE2B ccdcda8f6095d1efa5a66bd3ef549d1039c719a4aaaa89efa2e776f466e38602f636d0d538a235a29bf0a5ea581bde659d4a77b6b4231da4c51e06913269aaad SHA512 784f97e3a9e96beba6afb232c46e6c42fe318b471125e48926363d9aec430ff4d37d74c82d2ee4efd1e036f89de2fe37415121dbbdd050a56954ba12d666b328
diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in
index 134cb31f299c..134cb31f299c 100644
--- a/app-emulation/vagrant/files/vagrant.in-r1
+++ b/app-emulation/vagrant/files/vagrant.in
diff --git a/app-emulation/vagrant/vagrant-2.0.3.ebuild b/app-emulation/vagrant/vagrant-2.0.3.ebuild
deleted file mode 100644
index ff7a205039aa..000000000000
--- a/app-emulation/vagrant/vagrant-2.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/erubis-2.7.0
-	<dev-ruby/i18n-0.8.0:*
-	>=dev-ruby/listen-3.1.5
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-4.2.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
-	>=dev-ruby/nokogiri-1.7.1
-	<dev-ruby/mime-types-3:*
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-12.0.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die
-}
-
-all_ruby_install() {
-	newbashcomp contrib/bash/completion.sh ${PN}
-	all_fakegem_install
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-}
diff --git a/app-emulation/vagrant/vagrant-2.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild
index 5778c6f947c5..ee48d642baae 100644
--- a/app-emulation/vagrant/vagrant-2.1.1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.1.1.ebuild
@@ -63,7 +63,7 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die
 
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
 }
 
 all_ruby_install() {
diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.1.2.ebuild
index ff7a205039aa..ee48d642baae 100644
--- a/app-emulation/vagrant/vagrant-2.0.2.ebuild
+++ b/app-emulation/vagrant/vagrant-2.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@@ -56,14 +56,14 @@ all_ruby_prepare() {
 		-i ${PN}.gemspec || die
 
 	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
+	sed -e '/wdm\|win32-\|winrm/d' \
 		-i ${PN}.gemspec || die
 
 	# remove bsd-specific gems
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die
 
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
 }
 
 all_ruby_install() {