diff options
Diffstat (limited to 'app-emulation/vagrant')
| -rw-r--r-- | app-emulation/vagrant/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/vagrant/files/vagrant.in | 2 | ||||
| -rw-r--r-- | app-emulation/vagrant/vagrant-2.4.0-r1.ebuild (renamed from app-emulation/vagrant/vagrant-2.2.18-r1.ebuild) | 73 | ||||
| -rw-r--r-- | app-emulation/vagrant/vagrant-2.4.1.ebuild (renamed from app-emulation/vagrant/vagrant-2.2.19.ebuild) | 73 |
4 files changed, 103 insertions, 49 deletions
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 75502f75960e..45b131565d44 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 -DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 +DIST vagrant-2.4.0.tar.gz 3334706 BLAKE2B 62b720a83646e94c7608a2f8aa7acf985aea0a3532e0474aa45c229b054ea40a6e0b23ccdbfdbf7e27e3da9a4db5f57407656fe103ead0f5a98dc27dae5ebb57 SHA512 94e866b012303b65d33b72034f08305fc04c12be40aeb95247b786b53d14259b7b5062b372e3c87523390f0539848a0eafd45b28ad16a27badecd8888541243b +DIST vagrant-2.4.1.tar.gz 3342333 BLAKE2B c24c7c30364cb9f03f6e43422ff05954dd877e22a5e244f62cd9ce4925bf10d064fc678dee40a7affd1b6cf49c82d2d2208ee47b92baa0cda4194419ed501be4 SHA512 12ce4a2161e99970f212f265bbc79d6af38bccc44feab95db8db3b8194e8080acb846d680d1006a4e3fb1beabac33f154a7507f43223f675ba1db09a24591893 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 5760b56839c8..21d6c0bf3c82 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -4,7 +4,7 @@ # Vagrant installation directory. This sets up proper environmental variables # so that everything loads and compiles to proper directories. -for r in ruby27 ruby26 ruby25; do +for r in ruby33 ruby32 ruby31 ruby30 ruby27 ruby26; do # not all ruby versions are guaranteed to be installed if ! command -v "${r}" >/dev/null 2>&1; then continue diff --git a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild index 3d8077b15ec7..1ed485efc094 100644 --- a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild +++ b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31 ruby32" +RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant/vagrant_ssl/extconf.rb) RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_TASK_TEST=test:unit +RUBY_FAKEGEM_RECIPE_TEST=rake inherit bash-completion-r1 optfeature ruby-fakegem @@ -16,9 +19,9 @@ 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" +LICENSE="BUSL-1.1" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RESTRICT="!test? ( test )" @@ -29,40 +32,51 @@ RDEPEND=" " ruby_add_rdepend " - >=dev-ruby/bcrypt_pbkdf-1.0.0 - >=dev-ruby/childprocess-4.0.0 - >=dev-ruby/ed25519-1.2.4 + >=dev-ruby/bcrypt_pbkdf-1.1.0 + >=dev-ruby/childprocess-4.1.0 + >=dev-ruby/ed25519-1.3.0 dev-ruby/erubi + >=dev-ruby/googleapis-common-protos-types-1.3.0 + >=dev-ruby/grpc-1.59.2 >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/i18n-1.8:1 - >=dev-ruby/listen-3.1 + >=dev-ruby/i18n-1.12:1 + >=dev-ruby/listen-3.7 + >=dev-ruby/log4r-1.1.9 <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 + >=dev-ruby/net-ftp-0.2.0 + >=dev-ruby/net-ssh-7.0.0 + >=dev-ruby/net-sftp-4.0.0 + >=dev-ruby/net-scp-4.0.0 + >=dev-ruby/rexml-3.2.0 + >=dev-ruby/rgl-0.5.10 + >=dev-ruby/rubyzip-2.3.2 + >=dev-ruby/vagrant_cloud-3.1.0 + >=dev-ruby/ipaddr-1.2.4 " ruby_add_bdepend " - >=dev-ruby/rake-12.3.3 + >=dev-ruby/rake-13.0.0 test? ( - dev-ruby/rspec - dev-ruby/rspec-its - dev-ruby/webmock + ~app-emulation/vagrant-${PV} + dev-ruby/fake_ftp + dev-ruby/rake-compiler + >=dev-ruby/rspec-3.11 + >=dev-ruby/rspec-its-1.3.0 + >=dev-ruby/webrick-1.7.0 ) " all_ruby_prepare() { # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die + sed -e '/[Bb]undler/ s:^:#:' \ + -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/^end/ s:^:#:' \ + -i Rakefile || die rm Gemfile || die rm tasks/bundler.rake || die - sed -e ':rake\|rspec\|webmock: s:~>:>=:' \ + sed -e ':rake\|rspec: s:~>:>=:' \ -e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \ -e '/fake_ftp/ s:^#*:#:' \ -e '/wdm/ s:^#*:#:' \ @@ -72,6 +86,19 @@ all_ruby_prepare() { -i ${PN}.gemspec || die sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + + sed -i -e 's/format documentation/format progress/' tasks/test.rake || die + + # Avoid tests confused by the environment + rm -f test/unit/vagrant/util/env_test.rb || die + + # Avoid tests for Windows-specific components + rm -rf test/unit/plugins/communicators/winrm || die + sed -e '/eager loads WinRM/askip "Windows component"' \ + -e '/should return the specified communicator if given/askip "Windows component"' \ + -i test/unit/vagrant/machine_test.rb || die + sed -e '/with winrm communicator/ s/context/xcontext/' \ + -i test/unit/plugins/provisioners/ansible/provisioner_test.rb || die } all_ruby_install() { diff --git a/app-emulation/vagrant/vagrant-2.2.19.ebuild b/app-emulation/vagrant/vagrant-2.4.1.ebuild index 3c99cb32357e..a64f74de084a 100644 --- a/app-emulation/vagrant/vagrant-2.2.19.ebuild +++ b/app-emulation/vagrant/vagrant-2.4.1.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31 ruby32 ruby33" +RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant/vagrant_ssl/extconf.rb) RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_TASK_TEST=test:unit +RUBY_FAKEGEM_RECIPE_TEST=rake inherit bash-completion-r1 optfeature ruby-fakegem @@ -16,9 +19,9 @@ 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" +LICENSE="BUSL-1.1" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RESTRICT="!test? ( test )" @@ -29,40 +32,51 @@ RDEPEND=" " ruby_add_rdepend " - >=dev-ruby/bcrypt_pbkdf-1.0.0 - >=dev-ruby/childprocess-4.0.0 - >=dev-ruby/ed25519-1.2.4 + >=dev-ruby/bcrypt_pbkdf-1.1.0 + >=dev-ruby/childprocess-4.1.0 + >=dev-ruby/ed25519-1.3.0 dev-ruby/erubi + >=dev-ruby/googleapis-common-protos-types-1.3.0 + >=dev-ruby/grpc-1.59.2 >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/i18n-1.8:1 - >=dev-ruby/listen-3.1 + >=dev-ruby/i18n-1.12:1 + >=dev-ruby/listen-3.7 + >=dev-ruby/log4r-1.1.9 <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 + >=dev-ruby/net-ftp-0.2.0 + >=dev-ruby/net-ssh-7.0.0 + >=dev-ruby/net-sftp-4.0.0 + >=dev-ruby/net-scp-4.0.0 + >=dev-ruby/rexml-3.2.0 + >=dev-ruby/rgl-0.5.10 + >=dev-ruby/rubyzip-2.3.2 + >=dev-ruby/vagrant_cloud-3.1.1 + >=dev-ruby/ipaddr-1.2.4 " ruby_add_bdepend " - >=dev-ruby/rake-12.3.3 + >=dev-ruby/rake-13.0.0 test? ( - dev-ruby/rspec - dev-ruby/rspec-its - dev-ruby/webmock + ~app-emulation/vagrant-${PV} + dev-ruby/fake_ftp + dev-ruby/rake-compiler + >=dev-ruby/rspec-3.11 + >=dev-ruby/rspec-its-1.3.0 + >=dev-ruby/webrick-1.7.0 ) " all_ruby_prepare() { # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die + sed -e '/[Bb]undler/ s:^:#:' \ + -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/^end/ s:^:#:' \ + -i Rakefile || die rm Gemfile || die rm tasks/bundler.rake || die - sed -e ':rake\|rspec\|webmock: s:~>:>=:' \ + sed -e ':rake\|rspec: s:~>:>=:' \ -e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \ -e '/fake_ftp/ s:^#*:#:' \ -e '/wdm/ s:^#*:#:' \ @@ -72,6 +86,19 @@ all_ruby_prepare() { -i ${PN}.gemspec || die sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + + sed -i -e 's/format documentation/format progress/' tasks/test.rake || die + + # Avoid tests confused by the environment + rm -f test/unit/vagrant/util/env_test.rb || die + + # Avoid tests for Windows-specific components + rm -rf test/unit/plugins/communicators/winrm || die + sed -e '/eager loads WinRM/askip "Windows component"' \ + -e '/should return the specified communicator if given/askip "Windows component"' \ + -i test/unit/vagrant/machine_test.rb || die + sed -e '/with winrm communicator/ s/context/xcontext/' \ + -i test/unit/plugins/provisioners/ansible/provisioner_test.rb || die } all_ruby_install() { |