diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-emulation/vagrant | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'app-emulation/vagrant')
-rw-r--r-- | app-emulation/vagrant/Manifest | 14 | ||||
-rw-r--r-- | app-emulation/vagrant/files/vagrant-r1.in | 61 | ||||
-rw-r--r-- | app-emulation/vagrant/files/vagrant.in | 2 | ||||
-rw-r--r-- | app-emulation/vagrant/metadata.xml | 8 | ||||
-rw-r--r-- | app-emulation/vagrant/vagrant-2.1.1.ebuild | 79 | ||||
-rw-r--r-- | app-emulation/vagrant/vagrant-2.1.2.ebuild | 79 | ||||
-rw-r--r-- | app-emulation/vagrant/vagrant-2.1.5.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/vagrant/vagrant-2.2.2-r1.ebuild (renamed from app-emulation/vagrant/vagrant-2.1.2-r1.ebuild) | 31 |
8 files changed, 29 insertions, 249 deletions
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index d5877486f046..958bc2294a3e 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,10 +1,6 @@ -AUX vagrant-r1.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e971990aad3a0c89dfcb26a83e8841fc5bd6353bb1b7d525e0e6794d3192f34bef273360abad450 SHA512 983d479aafd7954ed5b3a7a7158b9b84925ff6d3d52251be52c86caa97b0f319c8d79902357d4c16822852a3bbc6db113ecf1c907a49de40c480871d906fd1d5 -AUX vagrant.in 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5 -DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 -DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 +AUX vagrant.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e971990aad3a0c89dfcb26a83e8841fc5bd6353bb1b7d525e0e6794d3192f34bef273360abad450 SHA512 983d479aafd7954ed5b3a7a7158b9b84925ff6d3d52251be52c86caa97b0f319c8d79902357d4c16822852a3bbc6db113ecf1c907a49de40c480871d906fd1d5 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 -EBUILD vagrant-2.1.1.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af -EBUILD vagrant-2.1.2-r1.ebuild 2357 BLAKE2B 069cdcd2ef93186b0c6c00e75d675f2cdbb62fb43964e8a653237ad5a811221b64409200d624255618398755112d42a7ece2258182deef4205cf96a89ae247ec SHA512 726d646c291ecd830fcbf6b7ca83ab53faac323d5ea1e75e0b32a975034416f407593abe8f5b9690c0784f3903ec75fc61e08b898ba176752f530fb3c871cca6 -EBUILD vagrant-2.1.2.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af -EBUILD vagrant-2.1.5.ebuild 2319 BLAKE2B 0a39155b56b35e1cf83f1107819e93c8debf549cad72baf964030499007951c5733dbbf5e722bd2ff05ad88c7b1f19ce45a46d57aac2532a73ad1afc19ef1b3c SHA512 9f8e12bbed08e363c9457b7620db28d77888277e2747e21fe0abb91d372120098aa0a95649f1fa6b8c646b0d6fab96df28c46fb87a5f2983d472e315a6c73e0e -MISC metadata.xml 526 BLAKE2B ccdcda8f6095d1efa5a66bd3ef549d1039c719a4aaaa89efa2e776f466e38602f636d0d538a235a29bf0a5ea581bde659d4a77b6b4231da4c51e06913269aaad SHA512 784f97e3a9e96beba6afb232c46e6c42fe318b471125e48926363d9aec430ff4d37d74c82d2ee4efd1e036f89de2fe37415121dbbdd050a56954ba12d666b328 +DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 +EBUILD vagrant-2.1.5.ebuild 2278 BLAKE2B 0f9a9e8cbab0928c7ee1042577dc83efc00d4ec50114bdf93185483e21da24f99fe575da0b2e5844a7e5a343fe99ef3c43886ad0256221feecf60a8c49ba6878 SHA512 79b2752ec86feae5c21453a021ffe90c3734a1bcb4e313512a2fc89161d85e60d7b629818468df270c0cba43049b202535c6b4a9eed45659d64ab94d31a3203c +EBUILD vagrant-2.2.2-r1.ebuild 2493 BLAKE2B 9d49d4d5fef45f55a218d031558c239d471845fcd6914cc36dda211b2e438e51408c70a4924c780fc734d8954c8b18c2de36884578bbb88881d1f2547735a032 SHA512 1f8c3b2f5de3505b134c37f1f631ab33b4c3c13d07ed6b30f25b29f4db2d6d29e517827107c5273a73e3bbadddd3e74cfe56a2946231b3fb3cebbe3ea799d9b9 +MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8 diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in deleted file mode 100644 index ee5e48c21541..000000000000 --- a/app-emulation/vagrant/files/vagrant-r1.in +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env bash -# -# This is a wrapper to properly execute Vagrant within the embedded -# Vagrant installation directory. This sets up proper environmental variables -# so that everything loads and compiles to proper directories. - -for r in ruby25 ruby24 ruby23; do - # not all ruby versions are guaranteed to be installed - if ! command -v "${r}" >/dev/null 2>&1; then - continue - fi - - 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" - - if [ -f ${VAGRANT_EXECUTABLE} ] ;then - ruby="${r}" - break - fi -done - -if [ -z ${ruby} ]; then - echo "Error: failed to find any usable ruby" - exit 1 -fi - -# 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="~/.vagrant.d" -fi -export GEM_HOME="${VAGRANT_HOME}/gems" - -# SSL certs -export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" - -# Export an environmental variable to say we're in a Vagrant -# installer created environment. -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 - -# Export the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" - -# Allow to install plugins even with deps in different slots (Bug #628648) -export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 - -# 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}" "$@" diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 134cb31f299c..ee5e48c21541 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 ruby24 ruby23 ruby22; do +for r in ruby25 ruby24 ruby23; 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/metadata.xml b/app-emulation/vagrant/metadata.xml index bc8d8897403b..b63908369576 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -2,12 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hydrapolic@gmail.com</email> - <name>Tomas Mozes</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> </maintainer> <use> <flag name="virtualbox"> diff --git a/app-emulation/vagrant/vagrant-2.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild deleted file mode 100644 index ee48d642baae..000000000000 --- a/app-emulation/vagrant/vagrant-2.1.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -USE_RUBY="ruby23 ruby24" - -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/childprocess-0.6.0 - >=dev-ruby/erubis-2.7.0 - <dev-ruby/i18n-0.8.0:* - >=dev-ruby/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 - >=dev-ruby/net-ssh-4.2.0:* - >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.2.0 - || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) - >=dev-ruby/nokogiri-1.7.1 - <dev-ruby/mime-types-3:* -" - -ruby_add_bdepend " - >=dev-ruby/rake-12.0.0 -" - -all_ruby_prepare() { - # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die - rm Gemfile || die - - # loosen dependencies - sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ - -e '/ruby_dep/s/<=/>=/' \ - -i ${PN}.gemspec || die - - # remove windows-specific gems - sed -e '/wdm\|win32-\|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() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install - - # 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 -} diff --git a/app-emulation/vagrant/vagrant-2.1.2.ebuild b/app-emulation/vagrant/vagrant-2.1.2.ebuild deleted file mode 100644 index ee48d642baae..000000000000 --- a/app-emulation/vagrant/vagrant-2.1.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -USE_RUBY="ruby23 ruby24" - -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/childprocess-0.6.0 - >=dev-ruby/erubis-2.7.0 - <dev-ruby/i18n-0.8.0:* - >=dev-ruby/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 - >=dev-ruby/net-ssh-4.2.0:* - >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.2.0 - || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) - >=dev-ruby/nokogiri-1.7.1 - <dev-ruby/mime-types-3:* -" - -ruby_add_bdepend " - >=dev-ruby/rake-12.0.0 -" - -all_ruby_prepare() { - # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die - rm Gemfile || die - - # loosen dependencies - sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ - -e '/ruby_dep/s/<=/>=/' \ - -i ${PN}.gemspec || die - - # remove windows-specific gems - sed -e '/wdm\|win32-\|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() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install - - # 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 -} diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index e147c40bcd3f..8bfe0ff326b6 100644 --- a/app-emulation/vagrant/vagrant-2.1.5.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -36,7 +36,7 @@ ruby_add_rdepend " >=dev-ruby/net-ssh-5.0.0:* >=dev-ruby/net-sftp-2.1 >=dev-ruby/net-scp-1.2.0 - || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) + dev-ruby/rest-client:2 <dev-ruby/mime-types-3:* " @@ -66,7 +66,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die } all_ruby_install() { diff --git a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild index 77b5794d5670..e8e2b858ed09 100644 --- a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" @@ -27,18 +27,21 @@ RDEPEND="${RDEPEND} 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/i18n-0.8.0:* - >=dev-ruby/listen-3.1.5 >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.1.1:* <dev-ruby/i18n-1.2.0:* + >=dev-ruby/listen-3.1.5 >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11 - >=dev-ruby/net-ssh-4.2.0:* + <dev-ruby/mime-types-3:* + >=dev-ruby/net-ssh-5.0.0:* >=dev-ruby/net-sftp-2.1 >=dev-ruby/net-scp-1.2.0 - || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 ) - >=dev-ruby/nokogiri-1.7.1 - <dev-ruby/mime-types-3:* + dev-ruby/rest-client:2 + >=dev-ruby/rubyzip-1.2.2 + >=dev-ruby/vagrant_cloud-2.0.0 " # upstream specifies rake>=12 but it apparently doesn't need something this @@ -46,7 +49,7 @@ ruby_add_rdepend " # 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.0.0 + >=dev-ruby/rake-10.5.0 " all_ruby_prepare() { @@ -60,24 +63,28 @@ all_ruby_prepare() { -i ${PN}.gemspec || die # remove windows-specific gems - sed -e '/wdm\|win32-\|winrm/d' \ + 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}-r1.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die } all_ruby_install() { - newbashcomp contrib/bash/completion.sh ${PN} 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 } |