gentoo resync : 03.11.2019

2 files changed, 92 insertions, 0 deletions

diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index ff99a771d86e..1727b68c7edc 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -4,8 +4,10 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce45
 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
 DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
 DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272
+DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a
 EBUILD vagrant-2.1.5.ebuild 2271 BLAKE2B 559c5a681c251d29f0c5605011340c4b05c3ae42e56afe5d283a802b20294bf2c61c47083a065b3d327c2e108efa370172866275f5177a18186dc84208904c17 SHA512 c92cbf8aa76f82c44dff2533b3f18758f4f601cb876bcca54b849547d35275993abb852845724c4d6ccb5c7eca86069cf88281c12f715c8480998aec63d15028
 EBUILD vagrant-2.2.2-r2.ebuild 2446 BLAKE2B 544a0481a24fac8e077ec9c264b238293978d5c855c8febfe731e0e780568aa80a72534b2bcbfe46908dcaf38d34c39c5e640a48ccb9015ceee4262e892a98bb SHA512 88ca23b220a1b37665beb29b4bb8988fcba5dc9c966de7d3b0d72c2c53f13e6c7b5f4fb13525984a9dcdd69add3c72a2aef1ebf16d1f6e195506c9f2b762b8c7
 EBUILD vagrant-2.2.4.ebuild 2456 BLAKE2B 9f2a1be02b05d423e136ebc500c84640380c850dab5b739ae15c5f1aaed73880c46324811ba8bc8d6b78d57387a9355fed5868669348419f24b3500d4e69eeb3 SHA512 1009cea7c291b1790e6c56f385f32812715c0e2ead2412502eb7d5753d73eed5320ad4bf7b4e28d79684f0b652cd15c6bf7d77f4d0cc87875da25d5c6805da84
 EBUILD vagrant-2.2.5.ebuild 2456 BLAKE2B 9f2a1be02b05d423e136ebc500c84640380c850dab5b739ae15c5f1aaed73880c46324811ba8bc8d6b78d57387a9355fed5868669348419f24b3500d4e69eeb3 SHA512 1009cea7c291b1790e6c56f385f32812715c0e2ead2412502eb7d5753d73eed5320ad4bf7b4e28d79684f0b652cd15c6bf7d77f4d0cc87875da25d5c6805da84
+EBUILD vagrant-2.2.6.ebuild 2458 BLAKE2B ceb701deed9427174ce31dd82b77923e3be3a019c3cea599d8cd73a6764022744416323815a321e7d303349c86ba73b34662fb8cd75da244116750345bcb0638 SHA512 5d633b46cffa56f0b991ed6e181e29b6af54b5bf44bc34b9f5ed4ddbf536eb6c37f83a5f2a92bfff26c4d6f8e050f50700a5f8afc003c91ad94f5bd7a75efb58
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/vagrant-2.2.6.ebuild b/app-emulation/vagrant/vagrant-2.2.6.ebuild
new file mode 100644
index 000000000000..d3796ed1651a
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+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/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/ed25519-1.2.4
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.1.1:1
+	>=dev-ruby/listen-3.1.5
+	<dev-ruby/log4r-1.1.11
+	<dev-ruby/mime-types-3:*
+	>=dev-ruby/net-ssh-5.1.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/rubyzip-1.2.2:*
+	>=dev-ruby/vagrant_cloud-2.0.3
+"
+
+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
+ruby_add_bdepend "
+	>=dev-ruby/rake-10.5.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|i18n\|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}-r1.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# 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
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+}