From c84cb3e2f078a4337448827f19c29e31b4906d7d Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Thu, 12 Mar 2020 22:42:24 -0700 Subject: app-emulation/vagrant: revbump, fix ruby_dep dep Closes: https://github.com/gentoo/gentoo/pull/14938 Closes: https://bugs.gentoo.org/711576 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev --- app-emulation/vagrant/vagrant-2.2.7-r1.ebuild | 93 +++++++++++++++++++++++++++ app-emulation/vagrant/vagrant-2.2.7.ebuild | 90 -------------------------- 2 files changed, 93 insertions(+), 90 deletions(-) create mode 100644 app-emulation/vagrant/vagrant-2.2.7-r1.ebuild delete mode 100644 app-emulation/vagrant/vagrant-2.2.7.ebuild (limited to 'app-emulation/vagrant') diff --git a/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild new file mode 100644 index 000000000000..19daab60aa2d --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild @@ -0,0 +1,93 @@ +# 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/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 +} diff --git a/app-emulation/vagrant/vagrant-2.2.7.ebuild b/app-emulation/vagrant/vagrant-2.2.7.ebuild deleted file mode 100644 index d81979d0d04a..000000000000 --- a/app-emulation/vagrant/vagrant-2.2.7.ebuild +++ /dev/null @@ -1,90 +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/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/~>/>=/' \ - -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}.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 -} -- cgit v1.2.3-65-gdbad