diff options
Diffstat (limited to 'app-emulation/vagrant')
| -rw-r--r-- | app-emulation/vagrant/Manifest | 7 | ||||
| -rw-r--r-- | app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch | 11 | ||||
| -rw-r--r-- | app-emulation/vagrant/files/vagrant.in-r1 (renamed from app-emulation/vagrant/files/vagrant-1.9.6) | 35 | ||||
| -rw-r--r-- | app-emulation/vagrant/vagrant-2.0.1.ebuild (renamed from app-emulation/vagrant/vagrant-1.9.7.ebuild) | 12 |
4 files changed, 26 insertions, 39 deletions
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index e218d8dab737..fa2157c17828 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,13 +1,12 @@ AUX vagrant-1.8.1-disable-embedded-cacert.patch 742 SHA256 564864e3b8fa7b16439bf074736836c3fbd61d61d9850c3f0c0716be106d3637 SHA512 a3c791490f2b34965a3f3303ce064be76c86a6321d3d5616837b104e2db9a318c57ded7c59a925de7c79e6a5dce9a35ca0d90ef37cf8012d257f3e4e03d84508 WHIRLPOOL baf540cda2633286b38e585a365881c1fa52d4222982a96d976dbcf8c95169b713db20fd838bf7bf1b22aa5a4ea0a0b8c52b075ba5117d48923520c51c8757c5 -AUX vagrant-1.8.1-rvm.patch 302 SHA256 00fbfe62a4985ccc2015423e893b738a4bc674fa5a983e7c6f696287ce989a9f SHA512 23178e36c808fb240236d6fb3c86df738fa5d2aedfc1d64bc7669f0807645863b8571818e58bb59160541f81141cbf124f2aeb2113225b094e19a5a852e2784c WHIRLPOOL 75809426fee843220e9ce3f56e0b36822bf9d58f5c6603780dc4e7626fb2016ffc96147c377791c8df178d617a1073287fe9b99c0f3680e74596dc97ddc8bec8 -AUX vagrant-1.9.6 1564 SHA256 e83061cd295206997c000677e222c9e53faf65e0e615f84267b96c9e2626b462 SHA512 4a4ed00d90a24919a6528b8fa10b309c31e5d5bd83ab43ddf042b9afcc814895a2259faf46e9d186da65d0b825ba4a848d2421e98e2e9616b67d3f4ff5d99ff2 WHIRLPOOL 6774119816f24bed3bcac49e22ba20ff6a22e8067cbe6339211a4356f0176ad0fda90a92901c0df6dc54d2aa8739deab243adb0d7aeb07fe1bfad4d552cbcdfa AUX vagrant.in 1541 SHA256 c09cc8ed50c9b770101563b73c1791c5ad2185385aeded6aa341719a2f7a8de6 SHA512 05b6c08eab0f4d5f523cfb4231db673ed66052fc72c27e97228be06a5f881da301538b8ff2e4872e8190ca996b994820a468c54b26759e2ca4036da409ca1a82 WHIRLPOOL e987e9b0565d752859904e60a30b76c8aa27b3873ccdeb455961717a8dd03a1a1dbeb7aba957bba7736b5c356282a9802c2b5d8185f28972502911243fa5626e -DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 +AUX vagrant.in-r1 1703 SHA256 b718eba95bbfc806bfab8985979cd33650c50b2fc1c87bb786e4393b4799ba14 SHA512 44ec9c2a18c336baf152ea812d30b8413fc6d3e2a63004563f2becda9487212f3f17ee13e9d54486654f06c2d8ea9a3c778f9ed38f185923eb1f17a41ad20b6d WHIRLPOOL 92eea16c78ce4c5b12705fb33e03b25f076f99625999990ba61bbab5260f9c44ff1c8b32c5fe6b5360485210946c1915b3a249b2c8e2dccf14d60f234f627a23 DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee DIST vagrant-2.0.0.tar.gz 1142850 SHA256 c25d3a5f18abdf349047f4d80bb74e6cb526959536e4bef5aa771de9d39cb260 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 WHIRLPOOL 8337800f6c5cc88081dc6f8630de60ecba8c851687d14143f34dc41b62cbd67b1e463f7351ecc0e1c764742004fdba389bc33c0bb2a5c043d1fbf6dde352171c -EBUILD vagrant-1.9.7.ebuild 2245 SHA256 5e97589630d665e2dcc26db5bf1705e7c4bf806fda8787f5aabe6a5bb114858c SHA512 1ce490a033e9afc4f56ff266f066c9e5d348b89ef957e64aaf749338d68635989504f803840b707bc4ffbf8f7352ce603246c39a9c8e0226c594908bb4e492b1 WHIRLPOOL d359ed94862b957cdfc8f27a9cba698e2b1ff6b37669961d80ec6945ca49ca32d05f8cfd10c547d2b048eb7c162a2aec65fafcbdcf2d5f92e386996d79df2e25 +DIST vagrant-2.0.1.tar.gz 1153702 SHA256 212b91c45f60a825fcfc656424021e2550833778a6d4ebe13458676201a04eba SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd WHIRLPOOL 7c66469b1fc0078524b62dd62dd66ae45f6527602df650dbe755bbbe12d4d4b04d6e0964606705a2c9ef4113d5b6abdc5619d223f4913cb9425d4032921ec0d9 EBUILD vagrant-1.9.8.ebuild 2169 SHA256 85dac8cc6a0fc46541c6ac55cc1600f2d4f1db6106f45ad7bc4b97b8bdc45e24 SHA512 ece9364b5437f22a2f441408c0811d14dd93138e7d9cce5ed785847b9e38982c880c808a1ba7668ca24fdeadfdd59a77a931461897eb54266aec4c834549f6b2 WHIRLPOOL 3c9521dfdcda46b7f28fa24a16bb975122eec57fd013c273b3a831551585a4899b829af40da7ea3bc629f87d8d429e0d73b7293cfa6ebd08800fd7200876b7c1 EBUILD vagrant-2.0.0.ebuild 2162 SHA256 a306f15d034fb2dc1d280efdea71fc74fd9934aaaf3509781e7ea204efdd913d SHA512 149763cc4f924a7879e0ad2da42f1d8dd74ff2679b44ad4fc3f16be588dab3794a7415decb089a73c15f4a86d44102d4fa58198c49106dc1e58dead8ba8bdea4 WHIRLPOOL 071ce0a575507a9598b20b8e4e9ab9829a655f4ba8963c634422ea31341541cbe141334d4ced98bfbbdcbcf097e679da70fe524a207a3fd00e46074ae0de0a04 +EBUILD vagrant-2.0.1.ebuild 2051 SHA256 9b3fd88afc9617b84988fd372ef0ef2ea08ea31bd97e3bf93e1942149312e24e SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39 WHIRLPOOL 796fcfd52c5b7896d5ef37a7b3f41f2309d82a41938b8a47164c178edc7ba8bf58cce6254cf18899795666d219f48169237f19a69e013e2115c1120a47625c8b MISC ChangeLog 6375 SHA256 28dba9e48cdcb83898cdf4ab42121ea70fafc2aad540ce1f32cee1ee175706e3 SHA512 b72a0c371ba71fb0338b87b6d9e57c401672a422012670a7fede13f4a6bcc4ff8ac3270f844880a75b3fa792cf9d47c2845a8cbc6093a0f737a0907cfeebea89 WHIRLPOOL fda114ad8209f062e240d88dcc592af434ca678780550c8612f2b7d34b19aa2a9611fd9277d13f56ff92ca1671116a1251bee68db842ff9b1637625b7279cceb MISC ChangeLog-2015 5872 SHA256 e34883a45cf43c4dc5f1e70fe05237c1b2dfd516c521d1ef1133d2a85250d610 SHA512 28e0390fb222950479e87991ed877731aff7d1fe78177bdf1043036af7f792d44114ab86d8af947f9c80bd539f275a6516b1f9894cd140f4658aa3f05641506d WHIRLPOOL 55c00413ec85340e8fbf7f7b86550a1de8dcba1f2cfe6b0813e57a3f84c67a77fdc2b90ae4bfef37335e4ec86d028413bc00798d1c7bd8221f9b767759c3ac65 MISC metadata.xml 572 SHA256 68069b04e6eb7838158806e4163fcf8c9fd885d20d2a1c5f3078ad321cbf5fd0 SHA512 37ddaa8e7b99b2b9e1487254af11c2201db8469da1a63e26c64b4cb3499867bd3d15b6e2c8871a1550a92722e76c0509408b148e993592b733fd8d14299aeddc WHIRLPOOL 7f744885f8f48ee98e53552454ef90a8e036819676e71a8c3ced62cb2ecfd7cf12c48b7c7107bc81c39d522531b6c6c45958fc4da286f2226a64e270bced3dcf diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch b/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch deleted file mode 100644 index 81d17be010e3..000000000000 --- a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vagrant-1.8.1/bin/vagrant -+++ vagrant-1.8.1/bin/vagrant -@@ -5,6 +5,8 @@ - # initializing which have historically resulted in stack traces. - Signal.trap("INT") { abort } - -+ENV.delete('GEM_PATH') -+ - # Split arguments by "--" if its there, we'll recombine them later - argv = ARGV.dup - argv_extra = [] diff --git a/app-emulation/vagrant/files/vagrant-1.9.6 b/app-emulation/vagrant/files/vagrant.in-r1 index ef264888f3ff..7c0405e8a835 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.6 +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -4,16 +4,25 @@ # 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.6"' )" +for r in ruby24 ruby23 ruby22; do + VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" + # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit + export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" + "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null + if [ $? -eq 0 ]; then + ruby="${r}" + break + fi +done # Export GEM_HOME based on VAGRANT_HOME # # 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") +if [ -z ${VAGRANT_HOME} ]; then + VAGRANT_HOME="~/.vagrant.d" fi -export GEM_HOME="$VAGRANT_HOME/gems" +export GEM_HOME="${VAGRANT_HOME}/gems" # SSL certs export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" @@ -25,21 +34,17 @@ export VAGRANT_INSTALLER_ENV=1 # This is currently used only in Vagrant::Plugin::Manager.system_plugins_file # to locate plugins configuration file. export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" -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 -# because uname dependencies can conflict on some platforms. -OS=$(uname -s 2>/dev/null) +export VAGRANT_INSTALLER_VERSION=2 # Export the OS as an environmental variable that Vagrant can access # so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" +export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +# Allow to install plugins even with deps in different slots (Bug #628648) +export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE +# Make it work with rvm (Bugs #474476 #628648) +unset GEM_HOME GEM_PATH # Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" +exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.7.ebuild b/app-emulation/vagrant/vagrant-2.0.1.ebuild index b6b67db26be1..a496014e0f41 100644 --- a/app-emulation/vagrant/vagrant-1.9.7.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.1.ebuild @@ -9,7 +9,7 @@ RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" RUBY_FAKEGEM_TASK_DOC="" -inherit bash-completion-r1 ruby-fakegem eutils +inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" HOMEPAGE="http://vagrantup.com/" @@ -41,7 +41,7 @@ ruby_add_rdepend " " ruby_add_bdepend " - >=dev-ruby/rake-11.3.0 + >=dev-ruby/rake-12.0.0 " all_ruby_prepare() { @@ -62,13 +62,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - # disable embedded CA certs and use system ones - epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch - - # fix rvm issue (bug #474476) - epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch - - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die } all_ruby_install() { |