app-emulation/vagrant: bump to 1.9.7, drop old #5353
Conversation
gentoo-repo-qa-bot
added
self-maintained
|
Pull Request assignment Areas affected: ebuilds app-emulation/vagrant: @hydrapolic, @gentoo/proxy-maint |
| # This needs to be set because Bundler includes gem paths | ||
| # from RubyGems' Gem.paths. | ||
| if [ -z $VAGRANT_HOME ]; then | ||
| VAGRANT_HOME=$(eval echo "~/.vagrant.d") |
There was a problem hiding this comment.
What's this monster? Are you trying to force tilde substitution here? Isn't
VAGRANT_HOME=~/.vagrant.d
much simpler? :-P
| export VAGRANT_INSTALLER_VERSION="2" | ||
|
|
||
| # Determine the OS that we're on, which is used in some later checks. | ||
| # It is very important we do this _before_ setting the PATH below |
There was a problem hiding this comment.
Where is the PATH set? I feel like this comment is no longer relevant.
|
|
||
| # Export the OS as an environmental variable that Vagrant can access | ||
| # so that it can behave better. | ||
| export VAGRANT_DETECTED_OS="${OS}" |
There was a problem hiding this comment.
Why not inline the unused ${OS} variable in here?
| # | ||
| # This needs to be set because Bundler includes gem paths | ||
| # from RubyGems' Gem.paths. | ||
| if [ -z $VAGRANT_HOME ]; then |
There was a problem hiding this comment.
It'd be nice to use ${foo} consistently everywhere.
| VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" | ||
|
|
||
| # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit | ||
| export VAGRANT_EXECUTABLE |
There was a problem hiding this comment.
Squash exporting and setting into a single line.
| # Copyright 1999-2017 Gentoo Foundation | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI="5" |
| ruby_add_rdepend " | ||
| >=dev-ruby/childprocess-0.6.0 | ||
| >=dev-ruby/erubis-2.7.0 | ||
| >=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:* |
There was a problem hiding this comment.
This can install two different versions in separate slots. I doubt that's what you want. Since there is no version older than 0.6.0, you can just leave the < part.
| >=dev-ruby/net-scp-1.2.0 | ||
| || ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) | ||
| >=dev-ruby/nokogiri-1.7.1 | ||
| >=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:* |
| # Vagrant installation directory. This sets up proper environmental variables | ||
| # so that everything loads and compiles to proper directories. | ||
|
|
||
| VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.7"' )" |
There was a problem hiding this comment.
By the way, are you really going to introduce a new script with different version number for every version? This is a real waste of space. How about using vagrant.in and using sed to substitute the version?
There was a problem hiding this comment.
Yes, good point.
| if [ -z ${VAGRANT_HOME} ]; then | ||
| VAGRANT_HOME="~/.vagrant.d" | ||
| fi | ||
| export GEM_HOME="$VAGRANT_HOME/gems" |
| >=dev-ruby/net-ssh-4.1.0:* | ||
| >=dev-ruby/net-sftp-2.1 | ||
| >=dev-ruby/net-scp-1.2.0 | ||
| || ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) |
There was a problem hiding this comment.
Isn't the newest version preferred? In || we tend to put option from most preferred to least preferred.
There was a problem hiding this comment.
Yes, forgot we need to inverse the logic.
Package-Manager: Portage-2.3.7, Repoman-2.3.2
Package-Manager: Portage-2.3.7, Repoman-2.3.2
|
😞 The QA check for this pull request has found the following issues: Issues inherited from Gentoo (may be modified by PR): |
|
Thanks |
Package-Manager: Portage-2.3.6, Repoman-2.3.2