From dfa1342d94972156903588d648dbbc0226e7c6e1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 2 Feb 2024 01:22:51 +0000 Subject: app-emulation/vagrant: fix LICENSE See upstream commit https://github.com/hashicorp/vagrant/commit/731e9cb6c48df71d8c3f8d2b929dd35875250d2d. Bug: https://bugs.gentoo.org/916978 Closes: https://bugs.gentoo.org/923487 Signed-off-by: Sam James --- app-emulation/vagrant/vagrant-2.4.0-r1.ebuild | 122 ++++++++++++++++++++++++++ app-emulation/vagrant/vagrant-2.4.0.ebuild | 122 -------------------------- 2 files changed, 122 insertions(+), 122 deletions(-) create mode 100644 app-emulation/vagrant/vagrant-2.4.0-r1.ebuild delete mode 100644 app-emulation/vagrant/vagrant-2.4.0.ebuild diff --git a/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild new file mode 100644 index 000000000000..70dc00e5446f --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + +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="BUSL-1.1" +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.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.12:1 + >=dev-ruby/listen-3.7 + >=dev-ruby/log4r-1.1.9 + =dev-ruby/mime-types-3.3:* + >=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-13.0.0 + test? ( + ~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 -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: 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 + + 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() { + 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.4.0.ebuild b/app-emulation/vagrant/vagrant-2.4.0.ebuild deleted file mode 100644 index 81cdd95f1a6b..000000000000 --- a/app-emulation/vagrant/vagrant-2.4.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 - -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.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.12:1 - >=dev-ruby/listen-3.7 - >=dev-ruby/log4r-1.1.9 - =dev-ruby/mime-types-3.3:* - >=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-13.0.0 - test? ( - ~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 -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: 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 - - 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() { - 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 -} -- cgit v1.2.3-65-gdbad