gentoo resync : 29.12.2022

4 files changed, 42 insertions, 140 deletions

diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 7b6ece82d3de..74995b637d71 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,8 +1,6 @@
 AUX vagrant.in 1872 BLAKE2B c3c5acf65ef1187061609837ab7c3df429763b6561ec462f9ce92b6d262bc148f809f17fe83147b4f2e79b6f0f7473b675e3f31234f510c2e3bb5a729b43acac SHA512 04f686e4bc9990afc7b5dd23a4165dba9e7abe1196a349c54c5b1148c1d0140b6fe0c4dfe2774d34440e6b812d186e72d6cb70095d7eccef4ff337dd04bf56b6
 DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64
-DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87
-DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
+DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4
 EBUILD vagrant-2.2.18-r1.ebuild 2376 BLAKE2B bdc88c6507dc11cd55ea195dea180b49ead6fd603c5c64e49536af33406eb3d9f33701a922f441ad93ca498cf6ded0a25d62cca1c7faec5d85acba6778ffaf48 SHA512 a653040505f69b6c026cf568f014c174ff4d200a0b23d1589e7778b39345495a385eb01c77a24da70528e16e80d401be52cef0c59edbd809bc393c52c31d7667
-EBUILD vagrant-2.2.7-r1.ebuild 2559 BLAKE2B dcb267f7c75f4bd744f2a83e416aa7005c8576f8d36326efd38b6dc634034b366ddf99016f24b5ced6a8ee87d8b7247db5c16e362f171be98ecd81c46d7d133f SHA512 e4f0a36c8b36625ad0ae660ed1eb4987f1a12f0d9c96316734cdcc31975f75621ea1e3f7a18162d780dc3d33e266e66f4fdd9014be557d50fbc1894ba602d852
-EBUILD vagrant-2.2.9-r1.ebuild 2561 BLAKE2B 4b510524099dddaa98fcc3a5df7a92b16e5ec2bc9983e55699a3d31689a5b1cc83c9467c248f25309ca9d9f226763664a33b4f9e4594a7e7459894586d1697a2 SHA512 e7ca458227e86b43cf01d3c76bd20342560256f8f35a483767a0e65ebd0a34d513de35d93f1b83c3e94441b5657c7bf5185127f85061eadaaeafbf0798a1eec5
-MISC metadata.xml 535 BLAKE2B 203604a2a73e7fcefba9bd8feed9886cb76fea74972704966b3d2a7577e6f1ae5787f38bf0fa6b5d843a3df56d1642c568c88a1b09141a0a083af014fd1af5d3 SHA512 1a6056d30f74a608af168120dcccaff027e67b63560152146909f0ecfb48863defcdf824e07c88d60bb70249107647e1bd0dc0502715e841c4d5237234783335
+EBUILD vagrant-2.2.19.ebuild 2376 BLAKE2B a9605f9c2627341c615fe815dbd5e0570c78dbc3d0973dbf9fc47cf9a08c08aa2f71c3c48dd15b47a249680e3b0589056fb2d025eb76389ee39469843c2ca560 SHA512 b213458909c391d646858a0e81cc6645cae97427f2ccc8056d97305d61245c3c7cb818bfcddc553cbd089b810dee5e77de97c7b242468505cb06ef0dc5f53bfe
+MISC metadata.xml 455 BLAKE2B 01bf09c745e55dcdf7241dfdae1349fbb403f61249c0b05944347cb2f5cdf7d6a5fc7807a3f351145a41e4a5a94a5ba22195acee7c352539144277fff4696faf SHA512 1117ae7aca289842ab10ec2cf4443bf36ef7bdcd9efd0b6d1df1879f253cc137fea027a939c52f8d6990cae7a83bffafeb69f7b10660f27d278f19578ecccabd
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index 74e70057d3ea..1ca87553dc86 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="virtualbox">
-			Use VirtualBox provider.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">hashicorp/vagrant</remote-id>
 	</upstream>
diff --git a/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.19.ebuild
index 9e265ce73a47..3c99cb32357e 100644
--- a/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.19.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
 
 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
+inherit bash-completion-r1 optfeature ruby-fakegem
 
 DESCRIPTION="A tool for building and distributing development environments"
 HOMEPAGE="https://vagrantup.com/"
@@ -18,59 +19,56 @@ SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="${RDEPEND}
+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-3.0.0
+	>=dev-ruby/childprocess-4.0.0
 	>=dev-ruby/ed25519-1.2.4
-	>=dev-ruby/erubis-2.7.0
+	dev-ruby/erubi
 	>=dev-ruby/hashicorp-checkpoint-0.1.5
 	>=dev-ruby/i18n-1.8:1
-	>=dev-ruby/listen-3.1.5
+	>=dev-ruby/listen-3.1
 	<dev-ruby/log4r-1.1.11
-	<dev-ruby/mime-types-3:*
-	>=dev-ruby/net-ssh-5.2.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
+	>=dev-ruby/mime-types-3.3:*
+	>=dev-ruby/rubyzip-2.0
+	>=dev-ruby/net-scp-3.0.0
+	>=dev-ruby/net-sftp-3.0
+	>=dev-ruby/net-ssh-6.1.0
 	dev-ruby/rest-client:2
-	dev-ruby/rubyzip:2
-	>=dev-ruby/vagrant_cloud-2.0.3
+	>=dev-ruby/vagrant_cloud-3.0.5
+	>=dev-ruby/rexml-3.2.5
 "
 
-# 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
+	>=dev-ruby/rake-12.3.3
+	test? (
+		dev-ruby/rspec
+		dev-ruby/rspec-its
+		dev-ruby/webmock
+	)
 "
 
 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\|net-sftp\|rake\|childprocess/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
-
-	# remove ruby_dep, it's unused and only listed to loosen ruby implementation deps
-	sed -e '/ruby_dep/d' \
+	rm tasks/bundler.rake || die
+
+	sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
+		-e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
+		-e '/fake_ftp/ s:^#*:#:' \
+		-e '/wdm/ s:^#*:#:' \
+		-e '/winrm/ s:^#*:#:' \
+		-e '/rb-kqueue/ s:^#*:#:' \
+		-e '/ruby_dep/ s:^#*:#:' \
 		-i ${PN}.gemspec || die
 
 	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
@@ -90,4 +88,8 @@ all_ruby_install() {
 
 	insinto /usr/share/vim/vimfiles/syntax/
 	doins contrib/vim/vagrantfile.vim
+
+	optfeature_header "Optional emulation/container backends:"
+	optfeature "VirtualBox support" app-emulation/virtualbox
+	optfeature "Docker support" app-containers/docker
 }
diff --git a/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild
deleted file mode 100644
index 19daab60aa2d..000000000000
--- a/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 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.3:1
-	>=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/~>/>=/' \
-		-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
-
-	# remove ruby_dep, it's unused and only listed to loosen ruby implementation deps
-	sed -e '/ruby_dep/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.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
-}