gentoo auto-resync : 18:03:2023 - 06:30:37

4 files changed, 4 insertions, 196 deletions

diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index f1850eec5ac5..ac587c50cb67 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,7 +1,4 @@
 AUX vagrant.in 1872 BLAKE2B 691c0f55c937eb895b26a95f34053f547ce7511c2ba21cbc1c58f14578559bac91cb33a47dd401dcbada0c34f8ba89be379bb294ba2e7e3efa08cccf8fdf01b9 SHA512 89ff931b4fe4ebc58d026f3af17e2bcbef008e50d3b52d7aa7c56b6f51a24d4408767f09b34a7d231643da59b54e3949d4b010ce9f4b1c3b639ba3ba4785a776
-DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64
 DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4
-EBUILD vagrant-2.2.18-r1.ebuild 2383 BLAKE2B abeb7b34317c99883cdc4a4901f7d46b901d6510521c8ba1385b2bfb8afe5f1507a82a3b3e1936c74c4e3c9bfbd75a45b520dbd927966fd9fb06090982a093a1 SHA512 0640629efef626dc21868785973413d0e9dfd9d3bdc90ae38027ce5f43ae9e40bff9c4ce545bb1598f0e8ea98b3de31b6271a43acd27aad7a80a6e67e1154713
-EBUILD vagrant-2.2.19-r1.ebuild 2390 BLAKE2B af7f52e89caf58282549b9821e67220845c929c291801496b96609892e8fd1e2c1e07e1559606c406dd3bd09e94873a4e7c2731cdc63a8be910b23bba4d55659 SHA512 94b6b56e26108ed540040debb6d84457a2076b2b1d6e96aa78f657eaa2d1c0b149e0e90a3bb17352c1c5d63c2ee60aaf9b59727c49f7af3c4fa69e92e072a588
-EBUILD vagrant-2.2.19.ebuild 2390 BLAKE2B 383d01ad976a14ca41c435293c98013ed479d54ab8cc040a0a111087a204a5d84a7de402b3709e5a4454cab945c62535fdc001abf5b47e2c922241da04ef92f9 SHA512 04c1cfc5b20c5a78a6b644f39bc790f07b859fd9a043d3287444e3e69f89ee4f6bc5cfbfe4886b053e49a9ceed0d95a5f4d1f1939e19cd6fe54a4c4a5e9e6772
+EBUILD vagrant-2.2.19-r2.ebuild 2412 BLAKE2B fc275e640f5924fd75d15a156cec8ce8fcf229ff2c99ce65232041c4dc4c0186e1dab8c2c1875aab74762388acfad47f21aa87ea3387090c75f5dda3feceba8d SHA512 a3c367f6292d503fc92af7fac79cb40a17d6f2ff9d00e6e706cbc987cfbb45ecad36ffc6b32371ce7b7b29840908a91d835eb252eeca323507c9d6c35bc38c96
 MISC metadata.xml 455 BLAKE2B 01bf09c745e55dcdf7241dfdae1349fbb403f61249c0b05944347cb2f5cdf7d6a5fc7807a3f351145a41e4a5a94a5ba22195acee7c352539144277fff4696faf SHA512 1117ae7aca289842ab10ec2cf4443bf36ef7bdcd9efd0b6d1df1879f253cc137fea027a939c52f8d6990cae7a83bffafeb69f7b10660f27d278f19578ecccabd
diff --git a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild
deleted file mode 100644
index ddb8fa90f82a..000000000000
--- a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 optfeature 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="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-4.0.0
-	>=dev-ruby/ed25519-1.2.4
-	dev-ruby/erubi
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.8:1
-	>=dev-ruby/listen-3.1
-	<dev-ruby/log4r-1.1.11
-	>=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/vagrant_cloud-3.0.5
-	>=dev-ruby/rexml-3.2.5
-"
-
-ruby_add_bdepend "
-	>=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
-	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
-}
-
-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
-
-	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.19-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild
index b9dfc5890e75..0fd0e7381a92 100644
--- a/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@@ -41,7 +41,8 @@ ruby_add_rdepend "
 	>=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/net-ssh-6.1.0:6
+	<dev-ruby/net-ssh-6.2.0:6
 	dev-ruby/rest-client:2
 	>=dev-ruby/vagrant_cloud-3.0.5
 	>=dev-ruby/rexml-3.2.5
diff --git a/app-emulation/vagrant/vagrant-2.2.19.ebuild b/app-emulation/vagrant/vagrant-2.2.19.ebuild
deleted file mode 100644
index 3dde73808665..000000000000
--- a/app-emulation/vagrant/vagrant-2.2.19.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 optfeature 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 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-4.0.0
-	>=dev-ruby/ed25519-1.2.4
-	dev-ruby/erubi
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.8:1
-	>=dev-ruby/listen-3.1
-	<dev-ruby/log4r-1.1.11
-	>=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/vagrant_cloud-3.0.5
-	>=dev-ruby/rexml-3.2.5
-"
-
-ruby_add_bdepend "
-	>=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
-	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
-}
-
-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
-
-	optfeature_header "Optional emulation/container backends:"
-	optfeature "VirtualBox support" app-emulation/virtualbox
-	optfeature "Docker support" app-containers/docker
-}