[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: dfa1342d94972156903588d648dbbc0226e7c6e1 Author: Sam James gentoo org> AuthorDate: Fri Feb 2 01:22:51 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 2 01:22:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa1342d 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 gentoo.org> app-emulation/vagrant/{vagrant-2.4.0.ebuild => vagrant-2.4.0-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.4.0.ebuild b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild similarity index 99% rename from app-emulation/vagrant/vagrant-2.4.0.ebuild rename to app-emulation/vagrant/vagrant-2.4.0-r1.ebuild index 81cdd95f1a6b..70dc00e5446f 100644 --- a/app-emulation/vagrant/vagrant-2.4.0.ebuild +++ b/app-emulation/vagrant/vagrant-2.4.0-r1.ebuild @@ -19,7 +19,7 @@ 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" +LICENSE="BUSL-1.1" SLOT="0" KEYWORDS="~amd64" IUSE="test"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 53a7376efa22aeee0473bd5d16cdefcc1ccb19ab Author: Guillaume Seren gmail com> AuthorDate: Wed Nov 29 21:07:50 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jan 31 12:54:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a7376e app-emulation/vagrant: Bump to 2.4.0 Closes: https://bugs.gentoo.org/916978 Signed-off-by: Guillaume Seren gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34054 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.4.0.ebuild | 122 + 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 9f3c8b22cca7..ee40ff4269b4 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2 +DIST vagrant-2.4.0.tar.gz 3334706 BLAKE2B 62b720a83646e94c7608a2f8aa7acf985aea0a3532e0474aa45c229b054ea40a6e0b23ccdbfdbf7e27e3da9a4db5f57407656fe103ead0f5a98dc27dae5ebb57 SHA512 94e866b012303b65d33b72034f08305fc04c12be40aeb95247b786b53d14259b7b5062b372e3c87523390f0539848a0eafd45b28ad16a27badecd541243b diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 0dfd12d10148..21d6c0bf3c82 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 ruby32 ruby31 ruby30 ruby27 ruby26; do +for r in ruby33 ruby32 ruby31 ruby30 ruby27 ruby26; 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/vagrant-2.4.0.ebuild b/app-emulation/vagrant/vagrant-2.4.0.ebuild new file mode 100644 index ..225878aa2fc9 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.4.0.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 ruby33" + +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 ~arm64" +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:^#*:#:' \ +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: eec3dae74f38b650b76fa997c10139ce827c8f06 Author: Joonas Niilola gentoo org> AuthorDate: Wed Jan 31 12:53:25 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jan 31 12:54:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec3dae7 app-emulation/vagrant: unkeyword 2.4.0 for ~arm64 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/vagrant/vagrant-2.4.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.4.0.ebuild b/app-emulation/vagrant/vagrant-2.4.0.ebuild index 225878aa2fc9..81cdd95f1a6b 100644 --- a/app-emulation/vagrant/vagrant-2.4.0.ebuild +++ b/app-emulation/vagrant/vagrant-2.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -USE_RUBY="ruby31 ruby32 ruby33" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant/vagrant_ssl/extconf.rb) RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" @@ -21,7 +21,7 @@ SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: be692cabe9ce10193d984caabfa3f29920a267cf Author: Hans de Graaff gentoo org> AuthorDate: Sun Sep 10 10:47:39 2023 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Sep 10 11:41:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be692cab app-emulation/vagrant: drop 2.2.19-r2 Signed-off-by: Hans de Graaff gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-2.2.19-r2.ebuild | 96 -- 2 files changed, 97 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index afc31a73f05b..9f3c8b22cca7 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1 @@ -DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2 diff --git a/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild b/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild deleted file mode 100644 index 0fd0e7381a92.. --- a/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby27 ruby30" - -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 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 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${RDEPEND} - app-arch/libarchive - net-misc/curl -" - -ruby_add_rdepend " - >=dev-ruby/bcrypt_pbkdf-1.0.0 - >=dev-ruby/childprocess-4.0.0 - >=dev-ruby/ed25519-1.2.4 - dev-ruby/erubi - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/i18n-1.8:1 - >=dev-ruby/listen-3.6 - =dev-ruby/mime-types-3.3:* - >=dev-ruby/rubyzip-2.0 - >=dev-ruby/net-scp-3.0.0 - >=dev-ruby/net-sftp-3.0 - >=dev-ruby/net-ssh-6.1.0:6 - =dev-ruby/vagrant_cloud-3.0.5 - >=dev-ruby/rexml-3.2.5 -" - -ruby_add_bdepend " - >=dev-ruby/rake-12.3.3 - test? ( - dev-ruby/rspec - dev-ruby/rspec-its - dev-ruby/webmock - ) -" - -all_ruby_prepare() { - # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die - rm Gemfile || die - rm tasks/bundler.rake || die - - sed -e ':rake\|rspec\|webmock: 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 -} - -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 -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: cf97de63824198e340d2d462dd81839d11a600c4 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Aug 27 18:55:52 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Aug 27 18:55:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf97de63 app-emulation/vagrant: Keyword 2.3.7 arm64, #913117 Signed-off-by: Arthur Zamarin gentoo.org> app-emulation/vagrant/vagrant-2.3.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.3.7.ebuild b/app-emulation/vagrant/vagrant-2.3.7.ebuild index 3225ddf513bd..7778433218ed 100644 --- a/app-emulation/vagrant/vagrant-2.3.7.ebuild +++ b/app-emulation/vagrant/vagrant-2.3.7.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: e419db21acd6e588b8d12b7f59e48aff873917fb Author: Hans de Graaff gentoo org> AuthorDate: Sun Aug 27 16:57:48 2023 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Aug 27 16:58:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e419db21 app-emulation/vagrant: add 2.3.7 Closes: https://bugs.gentoo.org/867943 Closes: https://bugs.gentoo.org/912592 Signed-off-by: Hans de Graaff gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.3.7.ebuild | 121 + 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 5d7e68811a33..afc31a73f05b 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 +DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index d77c39d06045..0dfd12d10148 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 ruby30 ruby27 ruby26; do +for r in ruby32 ruby31 ruby30 ruby27 ruby26; 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/vagrant-2.3.7.ebuild b/app-emulation/vagrant/vagrant-2.3.7.ebuild new file mode 100644 index ..3225ddf513bd --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.3.7.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31" + +RUBY_FAKEGEM_EXTENSIONS=(ext/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 + >=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.0.5 + >=dev-ruby/ipaddr-1.2.4 +" + +ruby_add_bdepend " + >=dev-ruby/rake-13.0.0 + test? ( + ~app-emulation/vagrant-${PV} + 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}" ||
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: eb3cf3a39a5030a0a5f31d7427749c40099c9eca Author: Sam James gentoo org> AuthorDate: Sat Mar 18 00:58:53 2023 + Commit: Sam James gentoo org> CommitDate: Sat Mar 18 01:19:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3cf3a3 app-emulation/vagrant: fix net-ssh dep Closes: https://bugs.gentoo.org/880209 Signed-off-by: Sam James gentoo.org> .../vagrant/{vagrant-2.2.19-r1.ebuild => vagrant-2.2.19-r2.ebuild} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild similarity index 96% rename from app-emulation/vagrant/vagrant-2.2.19-r1.ebuild rename to app-emulation/vagrant/vagrant-2.2.19-r2.ebuild index b9dfc5890e75..0fd0e7381a92 100644 --- a/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.19-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -USE_RUBY="ruby26 ruby27 ruby30" +USE_RUBY="ruby27 ruby30" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -41,7 +41,8 @@ ruby_add_rdepend " >=dev-ruby/rubyzip-2.0 >=dev-ruby/net-scp-3.0.0 >=dev-ruby/net-sftp-3.0 - >=dev-ruby/net-ssh-6.1.0 + >=dev-ruby/net-ssh-6.1.0:6 + =dev-ruby/vagrant_cloud-3.0.5 >=dev-ruby/rexml-3.2.5
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 4c9db83593638c20fb473c6714f4888b900eae62 Author: Sam James gentoo org> AuthorDate: Sat Mar 18 00:56:47 2023 + Commit: Sam James gentoo org> CommitDate: Sat Mar 18 01:19:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9db835 app-emulation/vagrant: drop 2.2.18-r1, 2.2.19 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-2.2.18-r1.ebuild | 95 -- app-emulation/vagrant/vagrant-2.2.19.ebuild| 95 -- 3 files changed, 191 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 75502f75960e..5d7e68811a33 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1 @@ -DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 diff --git a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild deleted file mode 100644 index ddb8fa90f82a.. --- a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby26 ruby27 ruby30" - -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 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.0.0 - >=dev-ruby/childprocess-4.0.0 - >=dev-ruby/ed25519-1.2.4 - dev-ruby/erubi - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/i18n-1.8:1 - >=dev-ruby/listen-3.1 - =dev-ruby/mime-types-3.3:* - >=dev-ruby/rubyzip-2.0 - >=dev-ruby/net-scp-3.0.0 - >=dev-ruby/net-sftp-3.0 - >=dev-ruby/net-ssh-6.1.0 - dev-ruby/rest-client:2 - >=dev-ruby/vagrant_cloud-3.0.5 - >=dev-ruby/rexml-3.2.5 -" - -ruby_add_bdepend " - >=dev-ruby/rake-12.3.3 - test? ( - dev-ruby/rspec - dev-ruby/rspec-its - dev-ruby/webmock - ) -" - -all_ruby_prepare() { - # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die - rm Gemfile || die - rm tasks/bundler.rake || die - - sed -e ':rake\|rspec\|webmock: 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 -} - -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.2.19.ebuild b/app-emulation/vagrant/vagrant-2.2.19.ebuild deleted file mode 100644 index 3dde73808665.. --- a/app-emulation/vagrant/vagrant-2.2.19.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: b24cde270cb200da9f222e306e8cf7062ea7bfc2 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Wed Dec 28 20:22:15 2022 + Commit: Sam James gentoo org> CommitDate: Wed Dec 28 20:36:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24cde27 app-emulation/vagrant: Depend on >=dev-ruby/listen-3.6 Bug: https://bugs.gentoo.org/888787 Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> Closes: https://github.com/gentoo/gentoo/pull/28877 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/vagrant-2.2.19-r1.ebuild | 95 ++ 1 file changed, 95 insertions(+) diff --git a/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild new file mode 100644 index ..bb916546e995 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.19-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby26 ruby27" + +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 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 ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${RDEPEND} + app-arch/libarchive + net-misc/curl +" + +ruby_add_rdepend " + >=dev-ruby/bcrypt_pbkdf-1.0.0 + >=dev-ruby/childprocess-4.0.0 + >=dev-ruby/ed25519-1.2.4 + dev-ruby/erubi + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.6 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/rubyzip-2.0 + >=dev-ruby/net-scp-3.0.0 + >=dev-ruby/net-sftp-3.0 + >=dev-ruby/net-ssh-6.1.0 + dev-ruby/rest-client:2 + >=dev-ruby/vagrant_cloud-3.0.5 + >=dev-ruby/rexml-3.2.5 +" + +ruby_add_bdepend " + >=dev-ruby/rake-12.3.3 + test? ( + dev-ruby/rspec + dev-ruby/rspec-its + dev-ruby/webmock + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec\|webmock: 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 +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: e3fd6e4af3d11f7c22b913f881b9fe12f57692af Author: Sam James gentoo org> AuthorDate: Wed Aug 17 15:39:10 2022 + Commit: Sam James gentoo org> CommitDate: Wed Aug 17 15:39:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fd6e4a app-emulation/vagrant: Keyword 2.2.19 arm64, #851081 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/vagrant-2.2.19.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.2.19.ebuild b/app-emulation/vagrant/vagrant-2.2.19.ebuild index 3c99cb32357e..064cab439b20 100644 --- a/app-emulation/vagrant/vagrant-2.2.19.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.19.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 2910753e98fafe576c5d61ac49acce6649c3673e Author: Matt Jolly footclan ninja> AuthorDate: Fri May 13 23:38:22 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri May 20 08:38:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2910753e app-emulation/vagrant: drop 2.2.7-r1, 2.2.9-r1 Signed-off-by: Matt Jolly footclan.ninja> Closes: https://github.com/gentoo/gentoo/pull/25475 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/vagrant/Manifest| 2 - app-emulation/vagrant/vagrant-2.2.7-r1.ebuild | 93 --- app-emulation/vagrant/vagrant-2.2.9-r1.ebuild | 93 --- 3 files changed, 188 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 2d06053d9a70..75502f75960e 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 -DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 -DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild deleted file mode 100644 index 19daab60aa2d.. --- a/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild +++ /dev/null @@ -1,93 +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/~>/>=/' \ - -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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 4c7ff09928b6f9020dc6f8362175b62c355458fe Author: Matt Jolly footclan ninja> AuthorDate: Fri May 13 23:16:54 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri May 20 08:37:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7ff099 app-emulation/vagrant: add 2.2.19 Signed-off-by: Matt Jolly footclan.ninja> Signed-off-by: Joonas Niilola gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/metadata.xml | 5 -- app-emulation/vagrant/vagrant-2.2.19.ebuild | 95 + 3 files changed, 96 insertions(+), 5 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 61ef4925d306..2d06053d9a70 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 +DIST vagrant-2.2.19.tar.gz 1838272 BLAKE2B cb707254379f52db8571bfe132e5b852a11998d86b43ee707e03d442ca1313da7b2612af027a58f806e0b551a6f415d121dab51cf7ea5da4292e5c2afd198ab9 SHA512 24a2e5baeac5cf8c45c012cf70dd4132b1dc7a6a5bab19d1046c91cc88e669356e2e5676d96eda6ed7293ff19ada974954969a4a59b9e4a30e2d95de27fa64e4 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index 74e70057d3ea..1ca87553dc86 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -9,11 +9,6 @@ proxy-ma...@gentoo.org Proxy Maintainers - - - Use VirtualBox provider. - - hashicorp/vagrant diff --git a/app-emulation/vagrant/vagrant-2.2.19.ebuild b/app-emulation/vagrant/vagrant-2.2.19.ebuild new file mode 100644 index ..3c99cb32357e --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.19.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby26 ruby27" + +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 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.0.0 + >=dev-ruby/childprocess-4.0.0 + >=dev-ruby/ed25519-1.2.4 + dev-ruby/erubi + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.1 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/rubyzip-2.0 + >=dev-ruby/net-scp-3.0.0 + >=dev-ruby/net-sftp-3.0 + >=dev-ruby/net-ssh-6.1.0 + dev-ruby/rest-client:2 + >=dev-ruby/vagrant_cloud-3.0.5 + >=dev-ruby/rexml-3.2.5 +" + +ruby_add_bdepend " + >=dev-ruby/rake-12.3.3 + test? ( + dev-ruby/rspec + dev-ruby/rspec-its + dev-ruby/webmock + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec\|webmock: 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 +} + +all_ruby_install() { +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 5e41813dc0345eee7f0b59aa50df17d2c88bdbd7 Author: RockyBukake <35773324+RockyBukake users noreply github com> AuthorDate: Sat Oct 2 17:23:55 2021 + Commit: Sam James gentoo org> CommitDate: Wed Oct 20 03:02:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e41813d app-emulation/vagrant: Add "rexml" dependency Current ebuild causes ruby to complain about missing "rexml" dependency: ``` /usr/lib64/ruby/site_ruby/2.6.0/rubygems/dependency.rb:313:in `to_specs': Could not find 'rexml' (>= 3.2) - did find: [rexml-3.1.9.1] (Gem::MissingSpecVersionError) Checked in 'GEM_PATH=/home/*/.local/share/gem/ruby/2.6.0:/usr/lib64/ruby/gems/2.6.0:/usr/local/lib64/ruby/gems/2.6.0' , execute `gem env` for more information from /usr/lib64/ruby/site_ruby/2.6.0/rubygems/dependency.rb:323:in `to_spec' from /usr/lib64/ruby/site_ruby/2.6.0/rubygems/core_ext/kernel_gem.rb:62:in `gem' from /usr/lib64/ruby/gems/2.6.0/gems/vagrant-2.2.18/bin/vagrant:95:in `block (2 levels) in ' from /usr/lib64/ruby/gems/2.6.0/gems/vagrant-2.2.18/bin/vagrant:94:in `each' from /usr/lib64/ruby/gems/2.6.0/gems/vagrant-2.2.18/bin/vagrant:94:in `block in ' from /usr/lib64/ruby/gems/2.6.0/gems/vagrant-2.2.18/bin/vagrant:105:in `' ``` [sam: revbumped with git mv because it's broken at runtime and we're changing/ fixing a runtime dependency.] Closes: https://bugs.gentoo.org/816216 Closes: https://github.com/gentoo/gentoo/pull/22467 Signed-off-by: Sam James gentoo.org> .../vagrant/{vagrant-2.2.18.ebuild => vagrant-2.2.18-r1.ebuild} | 1 + 1 file changed, 1 insertion(+) diff --git a/app-emulation/vagrant/vagrant-2.2.18.ebuild b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild similarity index 98% rename from app-emulation/vagrant/vagrant-2.2.18.ebuild rename to app-emulation/vagrant/vagrant-2.2.18-r1.ebuild index 208e7ee1537..2b6991ee84d 100644 --- a/app-emulation/vagrant/vagrant-2.2.18.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild @@ -44,6 +44,7 @@ ruby_add_rdepend " >=dev-ruby/net-ssh-6.1.0 dev-ruby/rest-client:2 >=dev-ruby/vagrant_cloud-3.0.5 + >=dev-ruby/rexml-3.2.5 " ruby_add_bdepend "
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: e4f9c379cd74b0f883db5479a49eb4218ecdd4c5 Author: Sam James gentoo org> AuthorDate: Tue Sep 28 19:44:30 2021 + Commit: Sam James gentoo org> CommitDate: Tue Sep 28 19:46:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f9c379 app-emulation/vagrant: drop 2.2.14 Closes: https://bugs.gentoo.org/812770 Closes: https://bugs.gentoo.org/815228 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-2.2.14.ebuild | 93 - 2 files changed, 94 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 7dd0548ecca..61ef4925d30 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-2.2.14.tar.gz 2522944 BLAKE2B 21980ab11fb7477518a40839715b6b207e9a2268e19df2ded0042a7d3d32cd45db02acfeb528c89869e54e9f4358b200f831150ada43c062513d864896eb7895 SHA512 540457c23ff52faef10774ac2d0da7a8c30682a19964f5ce805d5013eb27a6538468fcd511610d4bef539df14cbc4cf3a3dcdd9c96ba303ecf538028dc4aa659 DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/vagrant-2.2.14.ebuild b/app-emulation/vagrant/vagrant-2.2.14.ebuild deleted file mode 100644 index 850c675b347..000 --- a/app-emulation/vagrant/vagrant-2.2.14.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27" - -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 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.0.0 - >=dev-ruby/childprocess-4.0.0 - >=dev-ruby/ed25519-1.2.4 - dev-ruby/erubi - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/i18n-1.8:1 - >=dev-ruby/listen-3.1 - =dev-ruby/mime-types-3.3:* - >=dev-ruby/rubyzip-2.0 - >=dev-ruby/net-scp-3.0.0 - >=dev-ruby/net-sftp-3.0 - >=dev-ruby/net-ssh-6.1.0 - dev-ruby/rest-client:2 - >=dev-ruby/vagrant_cloud-3.0.2 -" - -ruby_add_bdepend " - >=dev-ruby/rake-12.3.3 - test? ( - dev-ruby/rspec - dev-ruby/rspec-its - dev-ruby/webmock - ) -" - -all_ruby_prepare() { - # remove bundler support - sed -i '/[Bb]undler/d' Rakefile || die - rm Gemfile || die - rm tasks/bundler.rake || die - - sed -e ':rake\|rspec\|webmock: 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 -} - -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 - - elog "Optional dependencies:" - optfeature "virtualbox support" app-emulation/virtualbox -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 892f6c39ef11c8de7e7d6387956b8789487a1414 Author: Sam James gentoo org> AuthorDate: Tue Sep 28 19:44:26 2021 + Commit: Sam James gentoo org> CommitDate: Tue Sep 28 19:46:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892f6c39 app-emulation/vagrant: add 2.2.18 Closes: https://bugs.gentoo.org/812770 Closes: https://bugs.gentoo.org/815228 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.18.ebuild | 94 + 2 files changed, 95 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index b59e046f1a2..7dd0548ecca 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.2.14.tar.gz 2522944 BLAKE2B 21980ab11fb7477518a40839715b6b207e9a2268e19df2ded0042a7d3d32cd45db02acfeb528c89869e54e9f4358b200f831150ada43c062513d864896eb7895 SHA512 540457c23ff52faef10774ac2d0da7a8c30682a19964f5ce805d5013eb27a6538468fcd511610d4bef539df14cbc4cf3a3dcdd9c96ba303ecf538028dc4aa659 +DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/vagrant-2.2.18.ebuild b/app-emulation/vagrant/vagrant-2.2.18.ebuild new file mode 100644 index 000..208e7ee1537 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.18.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby26 ruby27" + +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 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.0.0 + >=dev-ruby/childprocess-4.0.0 + >=dev-ruby/ed25519-1.2.4 + dev-ruby/erubi + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.1 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/rubyzip-2.0 + >=dev-ruby/net-scp-3.0.0 + >=dev-ruby/net-sftp-3.0 + >=dev-ruby/net-ssh-6.1.0 + dev-ruby/rest-client:2 + >=dev-ruby/vagrant_cloud-3.0.5 +" + +ruby_add_bdepend " + >=dev-ruby/rake-12.3.3 + test? ( + dev-ruby/rspec + dev-ruby/rspec-its + dev-ruby/webmock + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec\|webmock: 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 +} + +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"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: d846a14da7548f88932b2ee37f9bc54886c2adce Author: Guillaume Seren gmail com> AuthorDate: Mon Dec 14 17:11:40 2020 + Commit: Sam James gentoo org> CommitDate: Tue Sep 28 01:00:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d846a14d app-emulation/vagrant: Bump to version 2.2.14 Closes: https://bugs.gentoo.org/765253 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Guillaume Seren gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19053 Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 2 +- app-emulation/vagrant/vagrant-2.2.14.ebuild | 93 + 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index d686f4587be..b59e046f1a2 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ +DIST vagrant-2.2.14.tar.gz 2522944 BLAKE2B 21980ab11fb7477518a40839715b6b207e9a2268e19df2ded0042a7d3d32cd45db02acfeb528c89869e54e9f4358b200f831150ada43c062513d864896eb7895 SHA512 540457c23ff52faef10774ac2d0da7a8c30682a19964f5ce805d5013eb27a6538468fcd511610d4bef539df14cbc4cf3a3dcdd9c96ba303ecf538028dc4aa659 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index fd35177c6fe..5760b56839c 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 ruby26 ruby25 ruby24; do +for r in ruby27 ruby26 ruby25; 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/vagrant-2.2.14.ebuild b/app-emulation/vagrant/vagrant-2.2.14.ebuild new file mode 100644 index 000..850c675b347 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.14.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby25 ruby26 ruby27" + +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 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.0.0 + >=dev-ruby/childprocess-4.0.0 + >=dev-ruby/ed25519-1.2.4 + dev-ruby/erubi + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.1 + =dev-ruby/mime-types-3.3:* + >=dev-ruby/rubyzip-2.0 + >=dev-ruby/net-scp-3.0.0 + >=dev-ruby/net-sftp-3.0 + >=dev-ruby/net-ssh-6.1.0 + dev-ruby/rest-client:2 + >=dev-ruby/vagrant_cloud-3.0.2 +" + +ruby_add_bdepend " + >=dev-ruby/rake-12.3.3 + test? ( + dev-ruby/rspec + dev-ruby/rspec-its + dev-ruby/webmock + ) +" + +all_ruby_prepare() { + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + rm tasks/bundler.rake || die + + sed -e ':rake\|rspec\|webmock: 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 +} + +all_ruby_install() { + all_fakegem_install + + newbashcomp contrib/bash/completion.sh ${PN} + + # provide
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 2ebab8acf4d658898f5e98d84c38a9e4975d91ea Author: Guillaume Seren gmail com> AuthorDate: Thu Dec 10 15:45:13 2020 + Commit: Sam James gentoo org> CommitDate: Tue Sep 28 01:00:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebab8ac app-emulation/vagrant: Add myself to the maintainer Closes: https://bugs.gentoo.org/765253 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Guillaume Seren gmail.com> Signed-off-by: Sam James gentoo.org> app-emulation/vagrant/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index c6c277270f0..74e70057d3e 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -1,7 +1,14 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + + guillaumese...@gmail.com + Guillaume Seren + + + proxy-ma...@gentoo.org + Proxy Maintainers + Use VirtualBox provider.
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 4ab2a2441008f6ec7616694715dcdaae4967c6ec Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jul 11 05:49:27 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jul 11 06:02:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab2a244 app-emulation/vagrant: drop to maintainer-needed Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index b6390836957..4f92768cfae 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - gyakov...@gentoo.org - Georgy Yakovlev - + Use VirtualBox provider.
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: ddbae95dfdf8595cf326b00f7513d0f267cc8256 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu May 21 06:58:20 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu May 21 06:58:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbae95d app-emulation/vagrant: revbump 2.2.9, relax net-sftp dep version 3 is compatible with 2.x Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/{vagrant-2.2.9.ebuild => vagrant-2.2.9-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.2.9.ebuild b/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild similarity index 98% rename from app-emulation/vagrant/vagrant-2.2.9.ebuild rename to app-emulation/vagrant/vagrant-2.2.9-r1.ebuild index 8dddc89d151..9e265ce73a4 100644 --- a/app-emulation/vagrant/vagrant-2.2.9.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.9-r1.ebuild @@ -58,7 +58,7 @@ all_ruby_prepare() { rm Gemfile || die # loosen dependencies - sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ + sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|rake\|childprocess/s/~>/>=/' \ -i ${PN}.gemspec || die # remove windows-specific gems
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: ff3405ff6ce995c680819e26126d6718e8e1e3eb Author: Georgy Yakovlev gentoo org> AuthorDate: Tue May 19 03:27:46 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue May 19 03:27:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3405ff app-emulation/vagrant: drop 2.2.6 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/support-vbox-6.1.patch | 75 -- app-emulation/vagrant/vagrant-2.2.6-r1.ebuild | 92 -- 3 files changed, 168 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 826fa92c652..d686f4587be 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/files/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch deleted file mode 100644 index 59a54630279..000 --- a/app-emulation/vagrant/files/support-vbox-6.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001 -From: Brian Cain -Date: Wed, 11 Dec 2019 13:25:11 -0800 -Subject: [PATCH] Fixes #11249: Add VirtualBox provider support for version - 6.1.x - -This commit adds support for VirtualBox version 6.1.x. It simply -inherits from the base 6.0.x provider class. - plugins/providers/virtualbox/driver/meta.rb | 1 + - .../providers/virtualbox/driver/version_6_1.rb | 16 - plugins/providers/virtualbox/plugin.rb | 1 + - website/source/docs/virtualbox/index.html.md | 2 +- - 4 files changed, 19 insertions(+), 1 deletion(-) - create mode 100644 plugins/providers/virtualbox/driver/version_6_1.rb - -diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb -index 24547b4044..ed013737b0 100644 a/plugins/providers/virtualbox/driver/meta.rb -+++ b/plugins/providers/virtualbox/driver/meta.rb -@@ -64,6 +64,7 @@ def initialize(uuid=nil) - "5.1" => Version_5_1, - "5.2" => Version_5_2, - "6.0" => Version_6_0, -+"6.1" => Version_6_1, - } - - if @@version.start_with?("4.2.14") -diff --git a/plugins/providers/virtualbox/driver/version_6_1.rb b/plugins/providers/virtualbox/driver/version_6_1.rb -new file mode 100644 -index 00..ebe417eb91 /dev/null -+++ b/plugins/providers/virtualbox/driver/version_6_1.rb -@@ -0,0 +1,16 @@ -+require File.expand_path("../version_6_0", __FILE__) -+ -+module VagrantPlugins -+ module ProviderVirtualBox -+module Driver -+ # Driver for VirtualBox 6.1.x -+ class Version_6_1 < Version_6_0 -+def initialize(uuid) -+ super -+ -+ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1") -+end -+ end -+end -+ end -+end -diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb -index e058ec65ad..f2fbf47e55 100644 a/plugins/providers/virtualbox/plugin.rb -+++ b/plugins/providers/virtualbox/plugin.rb -@@ -59,6 +59,7 @@ module Driver - autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__) - autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__) - autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__) -+ autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__) - end - - module Model -diff --git a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md -index 558ef5f5d8..e9c1e79aad 100644 a/website/source/docs/virtualbox/index.html.md -+++ b/website/source/docs/virtualbox/index.html.md -@@ -13,7 +13,7 @@ Vagrant comes with support out of the box for [VirtualBox](https://www.virtualbo - a free, cross-platform consumer virtualization product. - - The VirtualBox provider is
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 2008e1f3134cba311a262a2d60e6da7e26698e06 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue May 19 03:24:55 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue May 19 03:25:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2008e1f3 app-emulation/vagrant: bump to 2.2.9 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.9.ebuild | 93 ++ 2 files changed, 94 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 1f6359608f6..826fa92c652 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 +DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260 diff --git a/app-emulation/vagrant/vagrant-2.2.9.ebuild b/app-emulation/vagrant/vagrant-2.2.9.ebuild new file mode 100644 index 000..8dddc89d151 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.9.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-3.0.0 + >=dev-ruby/ed25519-1.2.4 + >=dev-ruby/erubis-2.7.0 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/i18n-1.8:1 + >=dev-ruby/listen-3.1.5 + =dev-ruby/net-ssh-5.2.0:* + >=dev-ruby/net-sftp-2.1 + >=dev-ruby/net-scp-1.2.0 + dev-ruby/rest-client:2 + dev-ruby/rubyzip:2 + >=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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: c84cb3e2f078a4337448827f19c29e31b4906d7d Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Mar 13 05:42:24 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Mar 13 05:42:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84cb3e2 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 gentoo.org> .../vagrant/{vagrant-2.2.7.ebuild => vagrant-2.2.7-r1.ebuild}| 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.2.7.ebuild b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild similarity index 94% rename from app-emulation/vagrant/vagrant-2.2.7.ebuild rename to app-emulation/vagrant/vagrant-2.2.7-r1.ebuild index d81979d0d04..19daab60aa2 100644 --- a/app-emulation/vagrant/vagrant-2.2.7.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild @@ -59,7 +59,6 @@ all_ruby_prepare() { # 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 @@ -70,6 +69,10 @@ all_ruby_prepare() { 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 }
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 24361253d3594b77b418096c2542c3ea1ebc3d69 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jan 28 19:58:46 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jan 28 19:59:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24361253 app-emulation/vagrant: bump to 2.2.7 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.7.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index b063bb21fc8..1f6359608f6 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a +DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87 diff --git a/app-emulation/vagrant/vagrant-2.2.7.ebuild b/app-emulation/vagrant/vagrant-2.2.7.ebuild new file mode 100644 index 000..d81979d0d04 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.7.ebuild @@ -0,0 +1,90 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 02cfdf5d067ff904b95725f75e70f6250e4ab6fe Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jan 1 06:12:58 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jan 1 06:13:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cfdf5d app-emulation/vagrant: drop old Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest| 4 -- app-emulation/vagrant/files/vagrant-r1.in | 61 -- app-emulation/vagrant/files/vagrant.in| 2 +- app-emulation/vagrant/vagrant-2.1.5.ebuild| 82 app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 90 --- app-emulation/vagrant/vagrant-2.2.4.ebuild| 90 --- app-emulation/vagrant/vagrant-2.2.5.ebuild| 90 --- app-emulation/vagrant/vagrant-2.2.6-r1.ebuild | 2 +- 8 files changed, 2 insertions(+), 419 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 307430a6bf1..b063bb21fc8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,5 +1 @@ -DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 -DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 -DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a -DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272 DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in deleted file mode 100644 index fd35177c6fe..000 --- 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 ruby26 ruby25 ruby24; 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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 2a65bfb72e82ecf9184130a6c627e11007663293 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jan 1 04:47:36 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jan 1 04:49:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a65bfb7 app-emulation/vagrant: add virtualbox-6.1 support to 2.2.6 Closes: https://bugs.gentoo.org/704372 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/support-vbox-6.1.patch | 75 ++ ...agrant-2.2.6.ebuild => vagrant-2.2.6-r1.ebuild} | 4 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/files/support-vbox-6.1.patch b/app-emulation/vagrant/files/support-vbox-6.1.patch new file mode 100644 index 000..59a54630279 --- /dev/null +++ b/app-emulation/vagrant/files/support-vbox-6.1.patch @@ -0,0 +1,75 @@ +From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001 +From: Brian Cain +Date: Wed, 11 Dec 2019 13:25:11 -0800 +Subject: [PATCH] Fixes #11249: Add VirtualBox provider support for version + 6.1.x + +This commit adds support for VirtualBox version 6.1.x. It simply +inherits from the base 6.0.x provider class. +--- + plugins/providers/virtualbox/driver/meta.rb | 1 + + .../providers/virtualbox/driver/version_6_1.rb | 16 + plugins/providers/virtualbox/plugin.rb | 1 + + website/source/docs/virtualbox/index.html.md | 2 +- + 4 files changed, 19 insertions(+), 1 deletion(-) + create mode 100644 plugins/providers/virtualbox/driver/version_6_1.rb + +diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb +index 24547b4044..ed013737b0 100644 +--- a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb +@@ -64,6 +64,7 @@ def initialize(uuid=nil) + "5.1" => Version_5_1, + "5.2" => Version_5_2, + "6.0" => Version_6_0, ++"6.1" => Version_6_1, + } + + if @@version.start_with?("4.2.14") +diff --git a/plugins/providers/virtualbox/driver/version_6_1.rb b/plugins/providers/virtualbox/driver/version_6_1.rb +new file mode 100644 +index 00..ebe417eb91 +--- /dev/null b/plugins/providers/virtualbox/driver/version_6_1.rb +@@ -0,0 +1,16 @@ ++require File.expand_path("../version_6_0", __FILE__) ++ ++module VagrantPlugins ++ module ProviderVirtualBox ++module Driver ++ # Driver for VirtualBox 6.1.x ++ class Version_6_1 < Version_6_0 ++def initialize(uuid) ++ super ++ ++ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1") ++end ++ end ++end ++ end ++end +diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb +index e058ec65ad..f2fbf47e55 100644 +--- a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb +@@ -59,6 +59,7 @@ module Driver + autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__) + autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__) + autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__) ++ autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__) + end + + module Model +diff --git a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md +index 558ef5f5d8..e9c1e79aad 100644 +--- a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md +@@ -13,7 +13,7 @@ Vagrant comes with support out of the box for [VirtualBox](https://www.virtualbo + a free, cross-platform consumer virtualization product. + + The VirtualBox provider is compatible with VirtualBox versions 4.0.x, 4.1.x, +-4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, and 6.0.x. Other versions are unsupported and the provider ++4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, 6.0.x, and 6.1.x. Other versions are unsupported and the provider + will display an error message. Please note that beta and pre-release versions + of VirtualBox are not supported and may not be well-behaved. + diff --git a/app-emulation/vagrant/vagrant-2.2.6.ebuild b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild similarity index 96% rename from app-emulation/vagrant/vagrant-2.2.6.ebuild rename to app-emulation/vagrant/vagrant-2.2.6-r1.ebuild index d3796ed1651..db493d1a781 100644 --- a/app-emulation/vagrant/vagrant-2.2.6.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,6 +52,8 @@ ruby_add_bdepend " >=dev-ruby/rake-10.5.0 " +PATCHES="${FILESDIR}/support-vbox-6.1.patch" + all_ruby_prepare() { # remove bundler support sed -i
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: c983495ad3116f3c02c2ec0abbd3a6e1697e61de Author: Guillaume Seren gmail com> AuthorDate: Thu Oct 17 09:56:57 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Oct 25 20:38:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c983495a app-emulation/vagrant: Add version bump 2.2.6 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Guillaume Seren gmail.com> Closes: https://bugs.gentoo.org/697920 Closes: https://github.com/gentoo/gentoo/pull/13323 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.6.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 2f96176657b..307430a6bf1 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -2,3 +2,4 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce45 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272 +DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a diff --git a/app-emulation/vagrant/vagrant-2.2.6.ebuild b/app-emulation/vagrant/vagrant-2.2.6.ebuild new file mode 100644 index 000..d3796ed1651 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.6.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 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.2.2:* + >=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}-r1.in" > "${PN}" || die +} + +all_ruby_install() { + all_fakegem_install + + newbashcomp contrib/bash/completion.sh ${PN} + + # provide executable similar to upstream: + #
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: f7a9cbaad18da57da658090e1702a16762324f8d Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jun 26 19:03:13 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 26 19:03:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a9cbaa app-emulation/vagrant: bump to 2.2.5 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.5.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 2c306e2fcd8..2f96176657b 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a +DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272 diff --git a/app-emulation/vagrant/vagrant-2.2.5.ebuild b/app-emulation/vagrant/vagrant-2.2.5.ebuild new file mode 100644 index 000..150022d0426 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 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.2.2 + >=dev-ruby/vagrant_cloud-2.0.2 +" + +# 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}-r1.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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: f28c2f8bb72fad3d9ff11719b386d6a32fc20f13 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon May 20 18:58:09 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 20 18:58:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28c2f8b app-emulation/vagrant: drop ruby23 comepletely Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/vagrant.in| 2 +- app-emulation/vagrant/vagrant-2.1.5.ebuild| 4 ++-- app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index ee5e48c2154..86fa86fe591 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 ruby25 ruby24 ruby23; do +for r in ruby25 ruby24; 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/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index 8bfe0ff326b..509b0117225 100644 --- a/app-emulation/vagrant/vagrant-2.1.5.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" diff --git a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild index a2515b61584..92052b88307 100644 --- a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 1a6f7f9c3dc4d51c3428d05f408a867fe9089427 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon May 20 18:56:08 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 20 18:56:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6f7f9c app-emulation/vagrant: drop 2.2.3 Closes: https://bugs.gentoo.org/686388 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-2.2.3.ebuild | 90 -- 2 files changed, 91 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 5269083a903..2c306e2fcd8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 -DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a diff --git a/app-emulation/vagrant/vagrant-2.2.3.ebuild b/app-emulation/vagrant/vagrant-2.2.3.ebuild deleted file mode 100644 index a55cc3486a2..000 --- a/app-emulation/vagrant/vagrant-2.2.3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -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.2.2 - >=dev-ruby/vagrant_cloud-2.0.2 -" - -# 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 - -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: e77645c70239367394dca3cca2030cb27b6d2e6a Author: Nick H gmail com> AuthorDate: Sun May 19 19:08:19 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 20 18:56:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77645c7 app-emulation/vagrant: add ruby 2.6 Signed-off-by: Nick Herman gmail.com> Bug: https://bugs.gentoo.org/686388 Closes: https://github.com/gentoo/gentoo/pull/12057 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/vagrant-r1.in | 61 ++ app-emulation/vagrant/vagrant-2.2.4.ebuild | 4 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in new file mode 100644 index 000..fd35177c6fe --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-r1.in @@ -0,0 +1,61 @@ +#!/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 ruby26 ruby25 ruby24; 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/vagrant-2.2.4.ebuild b/app-emulation/vagrant/vagrant-2.2.4.ebuild index a55cc3486a2..150022d0426 100644 --- a/app-emulation/vagrant/vagrant-2.2.4.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -70,7 +70,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die } all_ruby_install() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 34b9b8e33bd2f60981fa94ad8104f9e63f0b57dd Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 27 19:26:25 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 27 19:29:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b9b8e3 app-emulation/vagrant: bump to 2.2.4 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.4.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 9ca5ca456a2..5269083a903 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c +DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a diff --git a/app-emulation/vagrant/vagrant-2.2.4.ebuild b/app-emulation/vagrant/vagrant-2.2.4.ebuild new file mode 100644 index 000..a55cc3486a2 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.4.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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.2.2 + >=dev-ruby/vagrant_cloud-2.0.2 +" + +# 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/
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: a67d546f66283b1eff62d55ee081b93d4b1fdbed Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jan 10 03:31:31 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 10 03:32:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67d546f app-emulation/vagrant: bump to 2.2.3 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.3.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 9b2e5b6e9d4..9ca5ca456a2 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 +DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c diff --git a/app-emulation/vagrant/vagrant-2.2.3.ebuild b/app-emulation/vagrant/vagrant-2.2.3.ebuild new file mode 100644 index 000..a55cc3486a2 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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.2.2 + >=dev-ruby/vagrant_cloud-2.0.2 +" + +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 39b5c5814accad3ad2739d8f283ce89f7de9f533 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Dec 30 20:53:21 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Dec 30 20:53:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b5c581 app-emulation/vagrant: drop old Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/vagrant-2.2.2-r1.ebuild | 90 --- 1 file changed, 90 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild deleted file mode 100644 index e8e2b858ed0..000 --- a/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -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:* =dev-ruby/listen-3.1.5 - >=dev-ruby/log4r-1.1.9 =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/rubyzip-1.2.2 - >=dev-ruby/vagrant_cloud-2.0.0 -" - -# 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\|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 -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 36639d91c3ffede7e52fae2205b78507c458fd7d Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Dec 30 20:17:49 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Dec 30 20:53:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36639d91 app-emulation/vagrant: revbump, loosen deps Closes: https://bugs.gentoo.org/674008 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/vagrant-2.2.2-r2.ebuild | 90 +++ 1 file changed, 90 insertions(+) diff --git a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild new file mode 100644 index 000..a2515b61584 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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.0.0:* + >=dev-ruby/net-sftp-2.1 + >=dev-ruby/net-scp-1.2.0 + 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 +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 3abd3e9edcf0ed831050f1cf93872f6bea09e8d0 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Dec 13 00:39:00 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Dec 13 00:41:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3abd3e9e app-emulation/vagrant: drop 2.2.2 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/vagrant-2.2.2.ebuild | 90 -- 1 file changed, 90 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.2.2.ebuild b/app-emulation/vagrant/vagrant-2.2.2.ebuild deleted file mode 100644 index daa937e2241..000 --- a/app-emulation/vagrant/vagrant-2.2.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -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:* - >=dev-ruby/listen-3.1.5 - >=dev-ruby/log4r-1.1.9 =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/rubyzip-1.2.2 - >=dev-ruby/vagrant_cloud-2.0.0 -" - -# 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\|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 -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: ffc10f0d42e0cdd9f3456a696b2f09aee64937ab Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Dec 13 00:33:20 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Dec 13 00:41:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc10f0d app-emulation/vagrant: tighten deps on i18n Closes: https://bugs.gentoo.org/673042 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/vagrant-2.2.2-r1.ebuild | 90 +++ 1 file changed, 90 insertions(+) diff --git a/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild new file mode 100644 index 000..e8e2b858ed0 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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:* =dev-ruby/listen-3.1.5 + >=dev-ruby/log4r-1.1.9 =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/rubyzip-1.2.2 + >=dev-ruby/vagrant_cloud-2.0.0 +" + +# 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\|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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 239d0fe54a58359506a3d2b9d29086b412d527f6 Author: Hans de Graaff gentoo org> AuthorDate: Wed Dec 12 10:17:24 2018 + Commit: Hans de Graaff gentoo org> CommitDate: Wed Dec 12 10:19:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239d0fe5 app-emulation/vagrant: remove version to be masked Signed-off-by: Hans de Graaff gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-emulation/vagrant/vagrant-2.1.5.ebuild | 2 +- app-emulation/vagrant/vagrant-2.2.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index f30a07577a8..8bfe0ff326b 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/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/rubyzip-1.2.2 >=dev-ruby/vagrant_cloud-2.0.0 "
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: be1b9590db51c709dfd721ca9bfbc49efeee91e3 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Dec 1 03:20:36 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Dec 1 03:20:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1b9590 app-emulation/vagrant: drop old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest| 2 - app-emulation/vagrant/files/vagrant.in| 61 app-emulation/vagrant/vagrant-2.1.1.ebuild| 79 - app-emulation/vagrant/vagrant-2.1.2-r1.ebuild | 83 --- app-emulation/vagrant/vagrant-2.1.2.ebuild| 79 - 5 files changed, 304 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 03a22b8ca6d..9b2e5b6e9d4 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 -DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in deleted file mode 100644 index 134cb31f299..000 --- a/app-emulation/vagrant/files/vagrant.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 ruby24 ruby23 ruby22; 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/vagrant-2.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild deleted file mode 100644 index ee48d642baa..000 --- 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=""
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 5bc81fcd52b66b6988178bd35bbf456d68a133a3 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Dec 1 03:22:07 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Dec 1 03:22:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc81fcd app-emulation/vagrant: cleanup ./files Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/files/{vagrant-r1.in => vagrant.in} | 0 app-emulation/vagrant/vagrant-2.1.5.ebuild| 2 +- app-emulation/vagrant/vagrant-2.2.2.ebuild| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant.in similarity index 100% rename from app-emulation/vagrant/files/vagrant-r1.in rename to app-emulation/vagrant/files/vagrant.in diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild index e147c40bcd3..f30a07577a8 100644 --- a/app-emulation/vagrant/vagrant-2.1.5.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -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.2.2.ebuild b/app-emulation/vagrant/vagrant-2.2.2.ebuild index ebed665ac9a..c294b5ac584 100644 --- a/app-emulation/vagrant/vagrant-2.2.2.ebuild +++ b/app-emulation/vagrant/vagrant-2.2.2.ebuild @@ -70,7 +70,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() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: ca761d4a7e63b3b15a48ee541e3d15c9cef3463a Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Nov 16 05:50:55 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Nov 30 05:28:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca761d4a app-emulation/vagrant: version bump to 2.2.2 Closes: https://github.com/gentoo/gentoo/pull/10429 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.2.2.ebuild | 90 ++ 2 files changed, 91 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 45ea3ce1c32..03a22b8ca6d 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 +DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957 diff --git a/app-emulation/vagrant/vagrant-2.2.2.ebuild b/app-emulation/vagrant/vagrant-2.2.2.ebuild new file mode 100644 index 000..ebed665ac9a --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.2.2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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:* + >=dev-ruby/listen-3.1.5 + >=dev-ruby/log4r-1.1.9 =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/rubyzip-1.2.2 + >=dev-ruby/vagrant_cloud-2.0.0 +" + +# 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\|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}-r1.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}" + +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: f85162be1250e22a6f77cb8879c5cd3696fe39f8 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Nov 16 06:15:34 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Nov 30 05:28:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85162be app-emulation/vagrant: take over maintainership Package-Manager: Portage-2.3.51, Repoman-2.3.12 Acked-by: Tomáš Mózes gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/vagrant/metadata.xml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index bc8d8897403..b6390836957 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -2,12 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - hydrapo...@gmail.com - Tomas Mozes - - - proxy-ma...@gentoo.org - Proxy Maintainers + gyakov...@gentoo.org + Georgy Yakovlev
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: be36252abd3dfee169bf5d7e828a0fa40504051d Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Sep 25 05:58:34 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Sep 26 19:56:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be36252a app-emulation/vagrant: version bump to 2.1.15 Cleaned up deps a bit. Closes: https://bugs.gentoo.org/667012 Signed-off-by: Georgy Yakovlev gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.1.5.ebuild | 82 ++ 2 files changed, 83 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 393f07e9cb3..45ea3ce1c32 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 +DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238 diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild new file mode 100644 index 000..e147c40bcd3 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby23 ruby24 ruby25" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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 ) + =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.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\|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 +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 465c1f053f5a57479b24716de7edd6c9d1f5727e Author: Virgil Dupras gentoo org> AuthorDate: Tue Jul 24 18:54:00 2018 + Commit: Virgil Dupras gentoo org> CommitDate: Tue Jul 24 18:54:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465c1f05 app-emulation/vagrant: loosen requirement on rake In the interest of stabilizing vagrant soon, we loosen requirement on dev-ruby/rake so it depends on its current stable version. Vagrant builds fine even with rake 10. See comment in code. Package-Manager: Portage-2.3.43, Repoman-2.3.10 app-emulation/vagrant/vagrant-2.1.2-r1.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild index c41ac30accb..77b5794d567 100644 --- a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild +++ b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild @@ -41,8 +41,12 @@ ruby_add_rdepend " =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-12.0.0 + >=dev-ruby/rake-10.0.0 " all_ruby_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a55d71b7959c1c24b95b90b00ff1c56e72940288 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jul 8 08:11:03 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jul 8 08:54:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55d71b7 app-emulation/vagrant: add ruby25 support Closes: https://github.com/gentoo/gentoo/pull/9117 Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-emulation/vagrant/files/vagrant-r1.in | 61 + app-emulation/vagrant/vagrant-2.1.2-r1.ebuild | 79 +++ 2 files changed, 140 insertions(+) diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in new file mode 100644 index 000..ee5e48c2154 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-r1.in @@ -0,0 +1,61 @@ +#!/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/vagrant-2.1.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild new file mode 100644 index 000..c41ac30accb --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby23 ruby24 ruby25" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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/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}-r1.in" > "${PN}" || die +} + +all_ruby_install() { + newbashcomp
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 01b42754f9116fbf009eed9cf845595d3d8a5a4a Author: Tomas Mozes gmail com> AuthorDate: Wed Jun 27 09:52:37 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 27 16:57:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b42754 app-emulation/vagrant: bump to 2.1.2 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.1.2.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index e9dc30b7d40..cf6a0e38e94 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 +DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 diff --git a/app-emulation/vagrant/vagrant-2.1.2.ebuild b/app-emulation/vagrant/vagrant-2.1.2.ebuild new file mode 100644 index 000..5778c6f947c --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.1.2.ebuild @@ -0,0 +1,79 @@ +# 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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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/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-r1" > "${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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: c3f9cb5fc88cdabde1b509c8c86fd3d7b5e2cca8 Author: Tomas Mozes gmail com> AuthorDate: Wed Jun 27 09:54:26 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 27 16:57:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f9cb5f app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/8987 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-emulation/vagrant/Manifest | 2 - .../vagrant/files/{vagrant.in-r1 => vagrant.in}| 0 app-emulation/vagrant/vagrant-2.0.2.ebuild | 79 -- app-emulation/vagrant/vagrant-2.0.3.ebuild | 79 -- app-emulation/vagrant/vagrant-2.1.1.ebuild | 2 +- app-emulation/vagrant/vagrant-2.1.2.ebuild | 2 +- 6 files changed, 2 insertions(+), 162 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index cf6a0e38e94..393f07e9cb3 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a -DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751 diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in similarity index 100% rename from app-emulation/vagrant/files/vagrant.in-r1 rename to app-emulation/vagrant/files/vagrant.in diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild deleted file mode 100644 index ff7a205039a..000 --- a/app-emulation/vagrant/vagrant-2.0.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="ruby22 ruby23" - -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/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.5 - >=dev-ruby/log4r-1.1.9 =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/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\|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-r1" > "${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}" - -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 3b3fb3393f40b6dadd4009310943c0d472557932 Author: Georgy Yakovlev sysdump net> AuthorDate: Wed May 2 04:56:36 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri May 11 10:09:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3fb339 app-emulation/vagrant: update github repo url Package-Manager: Portage-2.3.33, Repoman-2.3.9 app-emulation/vagrant/metadata.xml | 2 +- app-emulation/vagrant/vagrant-2.0.2.ebuild | 4 ++-- app-emulation/vagrant/vagrant-2.0.3.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index 43ec8038040..bc8d8897403 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -15,6 +15,6 @@ - mitchellh/vagrant + hashicorp/vagrant diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild index 09af0d9c740..9b87a6f0597 100644 --- a/app-emulation/vagrant/vagrant-2.0.2.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.2.ebuild @@ -13,7 +13,7 @@ inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" HOMEPAGE="http://vagrantup.com/; -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" @@ -71,7 +71,7 @@ all_ruby_install() { all_fakegem_install # provide executable similar to upstream: - # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb dobin "${PN}" # directory for plugins.json diff --git a/app-emulation/vagrant/vagrant-2.0.3.ebuild b/app-emulation/vagrant/vagrant-2.0.3.ebuild index 09af0d9c740..9b87a6f0597 100644 --- a/app-emulation/vagrant/vagrant-2.0.3.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.3.ebuild @@ -13,7 +13,7 @@ inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" HOMEPAGE="http://vagrantup.com/; -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" @@ -71,7 +71,7 @@ all_ruby_install() { all_fakegem_install # provide executable similar to upstream: - # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb dobin "${PN}" # directory for plugins.json
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: c09d7926b2815238a41db29739299c48970a2193 Author: Georgy Yakovlev sysdump net> AuthorDate: Wed May 9 23:11:56 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri May 11 10:11:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09d7926 app-emulation/vagrant: add version 2.1.1 Closes: https://bugs.gentoo.org/643876 Closes: https://bugs.gentoo.org/655344 Closes: https://github.com/gentoo/gentoo/pull/8239 Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.1.1.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 24c601035a8..e9dc30b7d40 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 +DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5 diff --git a/app-emulation/vagrant/vagrant-2.1.1.ebuild b/app-emulation/vagrant/vagrant-2.1.1.ebuild new file mode 100644 index 000..5778c6f947c --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.1.1.ebuild @@ -0,0 +1,79 @@ +# 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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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/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-r1" > "${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 +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 0dc8492a47898dc9b18e4c5ea5fc0b7c3ea0d893 Author: Georgy Yakovlev sysdump net> AuthorDate: Wed May 2 05:01:42 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri May 11 10:09:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc8492a app-emulation/vagrant: use HTTPS Package-Manager: Portage-2.3.33, Repoman-2.3.9 app-emulation/vagrant/vagrant-2.0.2.ebuild | 2 +- app-emulation/vagrant/vagrant-2.0.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild index 9b87a6f0597..ff7a205039a 100644 --- a/app-emulation/vagrant/vagrant-2.0.2.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.2.ebuild @@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="" inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" -HOMEPAGE="http://vagrantup.com/; +HOMEPAGE="https://vagrantup.com/; SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" diff --git a/app-emulation/vagrant/vagrant-2.0.3.ebuild b/app-emulation/vagrant/vagrant-2.0.3.ebuild index 9b87a6f0597..ff7a205039a 100644 --- a/app-emulation/vagrant/vagrant-2.0.3.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.3.ebuild @@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="" inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" -HOMEPAGE="http://vagrantup.com/; +HOMEPAGE="https://vagrantup.com/; SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: b73eaf0a93e7b94adebdda786d6a933614f3eaf4 Author: Tomas Mozes gmail com> AuthorDate: Fri Apr 20 07:49:49 2018 + Commit: Amy Liffey gentoo org> CommitDate: Fri Apr 20 08:59:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73eaf0a app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/8079 Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-emulation/vagrant/Manifest | 2 - .../vagrant-1.8.1-disable-embedded-cacert.patch| 17 - app-emulation/vagrant/files/vagrant.in | 44 app-emulation/vagrant/vagrant-2.0.0.ebuild | 81 -- app-emulation/vagrant/vagrant-2.0.1-r1.ebuild | 78 - 5 files changed, 222 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 5722b113a3b..24c601035a8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,2 @@ -DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 -DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch b/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch deleted file mode 100644 index afcb6f707f5..000 --- a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb -index 8756fc3..7fb2be8 100644 a/lib/vagrant/util/downloader.rb -+++ b/lib/vagrant/util/downloader.rb -@@ -215,8 +215,9 @@ module Vagrant - # If we're in Vagrant, then we use the packaged CA bundle - if Vagrant.in_installer? - subprocess_options[:env] ||= {} -- subprocess_options[:env]["CURL_CA_BUNDLE"] = --File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) -+ # Use system certificates. -+ # subprocess_options[:env]["CURL_CA_BUNDLE"] = -+ # File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) - end - - return [options, subprocess_options] - diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in deleted file mode 100644 index 761753208a7..000 --- a/app-emulation/vagrant/files/vagrant.in +++ /dev/null @@ -1,44 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" - -# 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)" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export 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 - -#
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 7aec299b96a3a5991b8db4cf0b3251251500b01a Author: Tomas Mozes gmail com> AuthorDate: Fri Apr 20 07:46:57 2018 + Commit: Amy Liffey gentoo org> CommitDate: Fri Apr 20 08:56:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aec299b app-emulation/vagrant: bump to 2.0.3 Closes: https://bugs.gentoo.org/653510 Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.0.3.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 55ab92d80b0..5722b113a3b 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a +DIST vagrant-2.0.3.tar.gz 1181697 BLAKE2B fa33063b52e6b9c9a1212a8833ee70c1d45dc4d09f039882337e2571bac5fcb2c5cf5199c7a39ea539873cc445ec768946a12c0a8bb7b03f51e133d56388bf15 SHA512 c62366c2e2b190a19efeae3379573c9e534b296db68152f284f3d80e9fdff4260e246c40206076e222bda3cf8f4ecbd02656c65aa35c15606b8638d7a8fca200 diff --git a/app-emulation/vagrant/vagrant-2.0.3.ebuild b/app-emulation/vagrant/vagrant-2.0.3.ebuild new file mode 100644 index 000..09af0d9c740 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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/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\|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-r1" > "${PN}" || die +} + +all_ruby_install() { + newbashcomp contrib/bash/completion.sh ${PN} + all_fakegem_install + + # provide executable similar to upstream: + # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + dobin "${PN}" + + # directory for plugins.json + keepdir /var/lib/vagrant +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 2fb5899a43170b46d47b29e5b462d02d8aad7674 Author: Tomas Mozes gmail com> AuthorDate: Fri Feb 9 12:14:42 2018 + Commit: Michał Górny gentoo org> CommitDate: Tue Feb 13 15:53:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb5899a app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/7131 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-1.9.8.ebuild | 81 -- 2 files changed, 82 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index dfc4b7365d7..55ab92d80b0 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.9.8.tar.gz 1127560 BLAKE2B efb6c8b985e92dcf0f933a24480934ec09b990f6cd1ea0ed373eb72c3d41f343cfcfef99ff77f39e5a40ee010dca8c45db68c07db106a73078d2841d65e2e3c0 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a diff --git a/app-emulation/vagrant/vagrant-1.9.8.ebuild b/app-emulation/vagrant/vagrant-1.9.8.ebuild deleted file mode 100644 index 7d133f044eb..000 --- a/app-emulation/vagrant/vagrant-1.9.8.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -USE_RUBY="ruby22 ruby23" - -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 eutils - -DESCRIPTION="A tool for building and distributing development environments" -HOMEPAGE="http://vagrantup.com/; -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+virtualbox" - -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/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.1 - >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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/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\|winrm/d' \ - -i ${PN}.gemspec || die - - # remove bsd-specific gems - 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 - - 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/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb - dobin "${PN}" - - # directory for plugins.json - dodir /var/lib/vagrant -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 07e8c10bdaff2a3579682674f56f0201ceab2569 Author: Tomas Mozes gmail com> AuthorDate: Fri Feb 9 06:40:10 2018 + Commit: Michał Górny gentoo org> CommitDate: Tue Feb 13 15:53:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e8c10b app-emulation/vagrant: bump to 2.0.2 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.0.2.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 6cecd140c6f..dfc4b7365d7 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.9.8.tar.gz 1127560 BLAKE2B efb6c8b985e92dcf0f933a24480934ec09b990f6cd1ea0ed373eb72c3d41f343cfcfef99ff77f39e5a40ee010dca8c45db68c07db106a73078d2841d65e2e3c0 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd +DIST vagrant-2.0.2.tar.gz 113 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild new file mode 100644 index 000..09af0d9c740 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.5 + >=dev-ruby/log4r-1.1.9 =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/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\|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-r1" > "${PN}" || die +} + +all_ruby_install() { + newbashcomp contrib/bash/completion.sh ${PN} + all_fakegem_install + + # provide executable similar to upstream: + # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + dobin "${PN}" + + # directory for plugins.json + keepdir /var/lib/vagrant +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 2f902a36a4952856f4b7737c3ec94159be772d2d Author: Tomas Mozes gmail com> AuthorDate: Thu Nov 30 06:55:54 2017 + Commit: Patrice Clement gentoo org> CommitDate: Tue Dec 12 20:34:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f902a36 app-emulation/vagrant: improve ruby version discovery. Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6352 app-emulation/vagrant/files/vagrant.in-r1 | 15 +-- .../{vagrant-2.0.1.ebuild => vagrant-2.0.1-r1.ebuild} | 0 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in-r1 index 7c0405e8a83..134cb31f299 100644 --- a/app-emulation/vagrant/files/vagrant.in-r1 +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -5,16 +5,27 @@ # so that everything loads and compiles to proper directories. for r in ruby24 ruby23 ruby22; 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" - "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null - if [ $? -eq 0 ]; then + + 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 diff --git a/app-emulation/vagrant/vagrant-2.0.1.ebuild b/app-emulation/vagrant/vagrant-2.0.1-r1.ebuild similarity index 100% rename from app-emulation/vagrant/vagrant-2.0.1.ebuild rename to app-emulation/vagrant/vagrant-2.0.1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 23d7aa2282f6b16c508738d31eb90d0334d8c602 Author: Tomáš Mózes gmail com> AuthorDate: Sat Nov 4 22:05:10 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Nov 6 07:35:38 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d7aa22 app-emulation/vagrant: bump to 2.0.1 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in-r1 | 50 +++ app-emulation/vagrant/vagrant-2.0.1.ebuild | 78 ++ 3 files changed, 129 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 34dfc7b9412..c626066ee4a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 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 +DIST vagrant-2.0.1.tar.gz 1153702 SHA256 212b91c45f60a825fcfc656424021e2550833778a6d4ebe13458676201a04eba SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd WHIRLPOOL 7c66469b1fc0078524b62dd62dd66ae45f6527602df650dbe755bbbe12d4d4b04d6e0964606705a2c9ef4113d5b6abdc5619d223f4913cb9425d4032921ec0d9 diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in-r1 new file mode 100644 index 000..7c0405e8a83 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -0,0 +1,50 @@ +#!/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 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="~/.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/vagrant-2.0.1.ebuild b/app-emulation/vagrant/vagrant-2.0.1.ebuild new file mode 100644 index 000..a496014e0f4 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a87aeea90cf92a816a21ab18304296075f753922 Author: Tomáš Mózes gmail com> AuthorDate: Sat Nov 4 22:06:35 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Nov 6 07:37:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87aeea9 app-emulation/vagrant: drop old Closes:#6126 app-emulation/vagrant/Manifest | 1 - .../vagrant/files/vagrant-1.8.1-rvm.patch | 11 --- app-emulation/vagrant/files/vagrant-1.9.6 | 45 app-emulation/vagrant/vagrant-1.9.7.ebuild | 84 -- 4 files changed, 141 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c626066ee4a..6608809f83d 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 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 DIST vagrant-2.0.1.tar.gz 1153702 SHA256 212b91c45f60a825fcfc656424021e2550833778a6d4ebe13458676201a04eba SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd WHIRLPOOL 7c66469b1fc0078524b62dd62dd66ae45f6527602df650dbe755bbbe12d4d4b04d6e0964606705a2c9ef4113d5b6abdc5619d223f4913cb9425d4032921ec0d9 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 81d17be010e..000 --- 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-1.9.6 deleted file mode 100644 index ef264888f3f..000 --- a/app-emulation/vagrant/files/vagrant-1.9.6 +++ /dev/null @@ -1,45 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.6"' )" - -# 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") -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" - -# 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 the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" - -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.7.ebuild b/app-emulation/vagrant/vagrant-1.9.7.ebuild deleted file mode 100644 index b6b67db26be..000 ---
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 1411589ad05f44a6ec3fd7748c4a58769e7db364 Author: Guillaume Seren gmail com> AuthorDate: Sat Sep 9 16:58:17 2017 + Commit: Amy Liffey gentoo org> CommitDate: Thu Sep 21 14:50:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1411589a app-emulation/vagrant: add version bump 2.0.0 Closes:#5673 Closes: https://bugs.gentoo.org/630498 Gentoo-Bug: 630498 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/vagrant-2.0.0.ebuild | 81 ++ 2 files changed, 82 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 32e8cdd095b..34dfc7b9412 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 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 diff --git a/app-emulation/vagrant/vagrant-2.0.0.ebuild b/app-emulation/vagrant/vagrant-2.0.0.ebuild new file mode 100644 index 000..5b4b6f8b77d --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+virtualbox" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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/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\|winrm/d' \ + -i ${PN}.gemspec || die + + # remove bsd-specific gems + sed -e '/rb-kqueue/d' \ + -i ${PN}.gemspec || die + + # disable embedded CA certs and use system ones + eapply "${FILESDIR}/${PN}-1.8.1-disable-embedded-cacert.patch" + + 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/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + dobin "${PN}" + + # directory for plugins.json + dodir /var/lib/vagrant +}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 15758dabbd97c62c6e2572a9e237041469d7aa1f Author: Tomas Mozes gmail com> AuthorDate: Fri Sep 8 05:07:59 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 10 21:24:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15758dab app-emulation/vagrant: version bump to 1.9.8. Package-Manager: Portage-2.3.8, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5657 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 8 ++- app-emulation/vagrant/vagrant-1.9.8.ebuild | 81 ++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 0e014b61a7a..1bfe5d16690 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 +DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in index 0da39caea41..761753208a7 100644 --- a/app-emulation/vagrant/files/vagrant.in +++ b/app-emulation/vagrant/files/vagrant.in @@ -25,7 +25,7 @@ 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 VAGRANT_INSTALLER_VERSION=2 # Export the OS as an environmental variable that Vagrant can access # so that it can behave better. @@ -34,5 +34,11 @@ export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit export 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 + +# 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/vagrant-1.9.8.ebuild b/app-emulation/vagrant/vagrant-1.9.8.ebuild new file mode 100644 index 000..7d133f044eb --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.8.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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 eutils + +DESCRIPTION="A tool for building and distributing development environments" +HOMEPAGE="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+virtualbox" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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/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
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 39aab8301defc2dde171b86b96b4f7babd2fab2a Author: Tomas Mozes gmail com> AuthorDate: Fri Sep 8 05:12:13 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sun Sep 10 21:24:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39aab830 app-emulation/vagrant: drop old. Package-Manager: Portage-2.3.8, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5657 app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/vagrant-1.9.6.ebuild | 82 -- 2 files changed, 83 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 1bfe5d16690..32e8cdd095b 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee diff --git a/app-emulation/vagrant/vagrant-1.9.6.ebuild b/app-emulation/vagrant/vagrant-1.9.6.ebuild deleted file mode 100644 index b8c4920bc85..000 --- a/app-emulation/vagrant/vagrant-1.9.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -USE_RUBY="ruby22 ruby23" - -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 eutils - -DESCRIPTION="A tool for building and distributing development environments" -HOMEPAGE="http://vagrantup.com/; -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+virtualbox" - -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.6.0:* =dev-ruby/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.1 - >=dev-ruby/log4r-1.1.9 =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 ) - >=dev-ruby/nokogiri-1.7.1 - >=dev-ruby/mime-types-2.6.2:* =dev-ruby/rake-11.3.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\|winrm/d' \ - -i ${PN}.gemspec || die - - # remove bsd-specific gems - 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 -} - -all_ruby_install() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install - - # provide executable similar to upstream: - # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb - newbin "${FILESDIR}/${P}" "${PN}" - - # directory for plugins.json - dodir /var/lib/vagrant -}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 6943dced0c6ac2d304ae45860c76ff550dd50b9a Author: Tomas Mozes gmail com> AuthorDate: Wed Aug 16 09:54:40 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 16 14:24:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6943dced app-emulation/vagrant: drop old Closes: https://github.com/gentoo/gentoo/pull/5353 Package-Manager: Portage-2.3.7, Repoman-2.3.2 app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/vagrant-1.9.5 | 45 app-emulation/vagrant/vagrant-1.9.5.ebuild | 82 -- 3 files changed, 128 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 521a17e4ad7..0e014b61a7a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208 DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 diff --git a/app-emulation/vagrant/files/vagrant-1.9.5 b/app-emulation/vagrant/files/vagrant-1.9.5 deleted file mode 100644 index 17041e56575..000 --- a/app-emulation/vagrant/files/vagrant-1.9.5 +++ /dev/null @@ -1,45 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.5"' )" - -# 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") -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" - -# 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 the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" - -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.5.ebuild b/app-emulation/vagrant/vagrant-1.9.5.ebuild deleted file mode 100644 index b8c4920bc85..000 --- a/app-emulation/vagrant/vagrant-1.9.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -USE_RUBY="ruby22 ruby23" - -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 eutils - -DESCRIPTION="A tool for building and distributing development environments" -HOMEPAGE="http://vagrantup.com/; -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+virtualbox" - -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 -
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 255a7731dbaf1aa9967a0719993def3395631630 Author: Tomas Mozes gmail com> AuthorDate: Wed Aug 16 09:53:46 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 16 14:24:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255a7731 app-emulation/vagrant: bump to 1.9.7 Package-Manager: Portage-2.3.7, Repoman-2.3.2 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant.in | 38 ++ app-emulation/vagrant/vagrant-1.9.7.ebuild | 84 ++ 3 files changed, 123 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c93dba623e6..521a17e4ad7 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208 DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 +DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in new file mode 100644 index 000..0da39caea41 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant.in @@ -0,0 +1,38 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" + +# 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)" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.7.ebuild b/app-emulation/vagrant/vagrant-1.9.7.ebuild new file mode 100644 index 000..b6b67db26be --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.7.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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 eutils + +DESCRIPTION="A tool for building and distributing development environments" +HOMEPAGE="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+virtualbox" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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 ) +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 356593d8f2e0951c3dd4571e2af59f9fcfe460d7 Author: Tomas Mozes gmail com> AuthorDate: Thu Jul 6 05:54:18 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sun Jul 16 21:52:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356593d8 app-emulation/vagrant: version bump to 1.9.6, drop old. Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5049 app-emulation/vagrant/Manifest | 2 +- .../files/vagrant-1.9.3-thread-deadlock.patch | 98 -- .../vagrant/files/{vagrant-1.9.3 => vagrant-1.9.6} | 2 +- .../{vagrant-1.9.3.ebuild => vagrant-1.9.6.ebuild} | 14 ++-- 4 files changed, 7 insertions(+), 109 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 91e43dc13dd..c93dba623e6 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208 +DIST vagrant-1.9.6.tar.gz 1115853 SHA256 08cde24b5def90e7674d333149ca9d9aec585bdb54ca41598e16ea91a56675bb SHA512 d8ed38a1fcffe31d974e94cf48b8dc4902a8005747dfe7311faa21ab53d838c88974c4c200dcbc0fb27fd50f2e3278e1fd21856e4afa37eaf4ef8602e0f5ca5d WHIRLPOOL cb8f1334f9db55be65fb5fd6dc670535681ed0b5457f15f86599fc2ca37fa791304665b913e5085d78012af7b7bd56c6281b78b70e4f054abb5d460cc14a1174 diff --git a/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch b/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch deleted file mode 100644 index 75cb63a2fb1..000 --- a/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch +++ /dev/null @@ -1,98 +0,0 @@ -From bfc2af4cf9c5e9280f0e7d74de226b7af7c18a2a Mon Sep 17 00:00:00 2001 -From: Chris Roberts-Date: Mon, 27 Mar 2017 12:55:15 -0700 -Subject: [PATCH] Always provide timeout on thread join to prevent deadlock - errors - - lib/vagrant/batch_action.rb | 6 -- - lib/vagrant/environment.rb| 2 +- - lib/vagrant/shared_helpers.rb | 6 ++ - lib/vagrant/ui.rb | 6 +++--- - 4 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/lib/vagrant/batch_action.rb b/lib/vagrant/batch_action.rb -index 9b6900f..d27e87d 100644 a/lib/vagrant/batch_action.rb -+++ b/lib/vagrant/batch_action.rb -@@ -123,7 +123,9 @@ def run - # Set some attributes on the thread for later - thread[:machine] = machine - --thread.join if !par -+if !par -+ thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive? -+end - threads << thread - end - -@@ -131,7 +133,7 @@ def run - - threads.each do |thread| - # Wait for the thread to complete --thread.join -+thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive? - - # If the thread had an error, then store the error to show later - if thread[:error] -diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb -index 8fad272..125070f 100644 a/lib/vagrant/environment.rb -+++ b/lib/vagrant/environment.rb -@@ -295,7 +295,7 @@ def batch(parallel=true) - # - # @return [Hash] - def checkpoint -- @checkpoint_thr.join -+ @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT) - return @checkpoint_thr[:result] - end - -diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb -index c5d6ea6..5522272 100644 a/lib/vagrant/shared_helpers.rb -+++ b/lib/vagrant/shared_helpers.rb -@@ -12,6 +12,12 @@ module Vagrant - # @return [String] - DEFAULT_SERVER_URL = "https://atlas.hashicorp.com; - -+ # Max number of seconds to wait for joining an active thread. -+ # -+ # @return [Integer] -+ # @note This is not the maxium time for a thread to complete. -+ THREAD_MAX_JOIN_TIMEOUT = 60 -+ - # This holds a global lock for the duration of the block. This should - # be invoked around anything that is modifying process state (such as - # environmental variables). -diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb -index 8092493..2a52c90 100644 a/lib/vagrant/ui.rb -+++ b/lib/vagrant/ui.rb -@@ -53,7 +53,7 @@ def initialize_copy(original) - # We're being called in a trap-context. Wrap in a
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 703f15e18a5635eef6d2029e1786f4b87daf0729 Author: Tomas Mozes gmail com> AuthorDate: Mon May 22 08:59:22 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 13:20:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703f15e1 app-emulation/vagrant: bump to 1.9.5, drop old Closes: https://github.com/gentoo/gentoo/pull/4709 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-emulation/vagrant/Manifest| 2 +- app-emulation/vagrant/files/{vagrant-1.9.2 => vagrant-1.9.5} | 2 +- .../vagrant/{vagrant-1.9.2.ebuild => vagrant-1.9.5.ebuild}| 11 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 1eca1c22ef8..91e43dc13dd 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76 DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d +DIST vagrant-1.9.5.tar.gz 1100561 SHA256 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a SHA512 8d2ace3cbac5b08d3d046a254ef617fead3677e9243da47c4b5131cef783244f403e4771e05075d1f5e9308edcfd52e9a7d792f89f4f39aefc9a949c79c64697 WHIRLPOOL b5e3a8f433c5637c85834900adfc43aaec2c740424e7250da02cf3a5de6f0d553113aa3f386eb74ef5402e0205238f6024b33a55db495d8f21eef19db84b2208 diff --git a/app-emulation/vagrant/files/vagrant-1.9.2 b/app-emulation/vagrant/files/vagrant-1.9.5 similarity index 98% rename from app-emulation/vagrant/files/vagrant-1.9.2 rename to app-emulation/vagrant/files/vagrant-1.9.5 index 060bf9e059e..17041e56575 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.2 +++ b/app-emulation/vagrant/files/vagrant-1.9.5 @@ -4,7 +4,7 @@ # 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.2"' )" +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.5"' )" # Export GEM_HOME based on VAGRANT_HOME # diff --git a/app-emulation/vagrant/vagrant-1.9.2.ebuild b/app-emulation/vagrant/vagrant-1.9.5.ebuild similarity index 92% rename from app-emulation/vagrant/vagrant-1.9.2.ebuild rename to app-emulation/vagrant/vagrant-1.9.5.ebuild index 6e5ff4a2b6c..b8c4920bc85 100644 --- a/app-emulation/vagrant/vagrant-1.9.2.ebuild +++ b/app-emulation/vagrant/vagrant-1.9.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="5" -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby22 ruby23" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -26,17 +26,17 @@ RDEPEND="${RDEPEND} virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" ruby_add_rdepend " - >=dev-ruby/childprocess-0.5.0 + >=dev-ruby/childprocess-0.6.0 >=dev-ruby/erubis-2.7.0 >=dev-ruby/i18n-0.6.0:* =dev-ruby/listen-3.1.5 >=dev-ruby/hashicorp-checkpoint-0.1.1 >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-3.0.1:* + >=dev-ruby/net-ssh-4.1.0:* >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.1.0 + >=dev-ruby/net-scp-1.2.0 || ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) - >=dev-ruby/nokogiri-1.6.7.1 + >=dev-ruby/nokogiri-1.7.1 >=dev-ruby/mime-types-2.6.2:* />=/' \ -e '/ruby_dep/s/<=/>=/' \ - -e '/nokogiri/s/=/>=/' \ -i ${PN}.gemspec || die # remove windows-specific gems
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 798fcf4b562821ec149b7b549dc0b72d9909974f Author: Tomas Mozes gmail com> AuthorDate: Mon Apr 24 06:33:48 2017 + Commit: Amy Liffey gentoo org> CommitDate: Mon Apr 24 14:50:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798fcf4b app-emulation/vagrant: bump to 1.9.3, drop old Closes:#4460 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-emulation/vagrant/Manifest | 2 +- .../vagrant/files/{vagrant-1.9.1 => vagrant-1.9.3} | 2 +- .../files/vagrant-1.9.3-thread-deadlock.patch | 98 ++ ...agrant-1.9.1-r1.ebuild => vagrant-1.9.3.ebuild} | 3 + 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 3efc9763881..1eca1c22ef8 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,2 @@ -DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76 +DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d diff --git a/app-emulation/vagrant/files/vagrant-1.9.1 b/app-emulation/vagrant/files/vagrant-1.9.3 similarity index 98% rename from app-emulation/vagrant/files/vagrant-1.9.1 rename to app-emulation/vagrant/files/vagrant-1.9.3 index 40a91d63e96..a8018a64446 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.1 +++ b/app-emulation/vagrant/files/vagrant-1.9.3 @@ -4,7 +4,7 @@ # 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.1"' )" +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.3"' )" # Export GEM_HOME based on VAGRANT_HOME # diff --git a/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch b/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch new file mode 100644 index 000..75cb63a2fb1 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch @@ -0,0 +1,98 @@ +From bfc2af4cf9c5e9280f0e7d74de226b7af7c18a2a Mon Sep 17 00:00:00 2001 +From: Chris Roberts+Date: Mon, 27 Mar 2017 12:55:15 -0700 +Subject: [PATCH] Always provide timeout on thread join to prevent deadlock + errors + +--- + lib/vagrant/batch_action.rb | 6 -- + lib/vagrant/environment.rb| 2 +- + lib/vagrant/shared_helpers.rb | 6 ++ + lib/vagrant/ui.rb | 6 +++--- + 4 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/lib/vagrant/batch_action.rb b/lib/vagrant/batch_action.rb +index 9b6900f..d27e87d 100644 +--- a/lib/vagrant/batch_action.rb b/lib/vagrant/batch_action.rb +@@ -123,7 +123,9 @@ def run + # Set some attributes on the thread for later + thread[:machine] = machine + +-thread.join if !par ++if !par ++ thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive? ++end + threads << thread + end + +@@ -131,7 +133,7 @@ def run + + threads.each do |thread| + # Wait for the thread to complete +-thread.join ++thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive? + + # If the thread had an error, then store the error to show later + if thread[:error] +diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb +index 8fad272..125070f 100644 +--- a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb +@@ -295,7 +295,7 @@ def batch(parallel=true) + # + # @return [Hash] + def checkpoint +- @checkpoint_thr.join ++ @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT) + return @checkpoint_thr[:result] + end + +diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb +index c5d6ea6..5522272 100644 +--- a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb +@@ -12,6 +12,12 @@ module Vagrant + # @return [String] +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 2dd1e81d3eae8232a2710435c19ea2d2f5d905bf Author: Tomas Mozes gmail com> AuthorDate: Mon Mar 6 06:43:26 2017 + Commit: Amy Liffey gentoo org> CommitDate: Wed Mar 15 21:07:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd1e81d app-emulation/vagrant: bump to 1.9.2, drop old Closes: #4135 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-emulation/vagrant/Manifest | 3 +- ...agrant-1.8.4-install-plugins-in-isolation.patch | 114 - app-emulation/vagrant/files/vagrant-1.8.7 | 46 - .../vagrant/files/{vagrant-1.8.6 => vagrant-1.9.2} | 5 +- app-emulation/vagrant/vagrant-1.8.7.ebuild | 87 app-emulation/vagrant/vagrant-1.9.1-r1.ebuild | 2 +- .../{vagrant-1.8.6.ebuild => vagrant-1.9.2.ebuild} | 16 ++- 7 files changed, 10 insertions(+), 263 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 7172e250aea..3efc9763881 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,2 @@ -DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b -DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 +DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76 diff --git a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch deleted file mode 100644 index 76730733eb6..000 --- a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch +++ /dev/null @@ -1,114 +0,0 @@ bin/vagrant -+++ bin/vagrant -@@ -69,6 +69,11 @@ - require "bundler" - begin - $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) -+# Invalidate the cached Gemfile.lock if necessary and try again -+rescue Bundler::GemNotFound -+ FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile") if File.exists? File.expand_path("~/.vagrant.d/Gemfile") -+ FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile.lock") if File.exists? File.expand_path("~/.vagrant.d/Gemfile.lock") -+ $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) - rescue Bundler::GemNotFound - $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins," - $stderr.puts "is reporting that a plugin or its dependency can't be found." lib/vagrant/bundler.rb2016-06-13 10:21:40.0 +0200 -+++ lib/vagrant/bundler.rb 2016-06-23 08:19:22.466039136 +0200 -@@ -65,6 +65,13 @@ - @configfile = tempfile("vagrant-configfile") - @configfile.close - -+ # Ensure the path to user's Gemfile exists -+ gemfile = Vagrant.user_data_path.join("Gemfile") -+ unless File.exists? gemfile -+FileUtils.mkdir_p(File.dirname(gemfile)) -+File.open(gemfile, 'w') {} -+ end -+ - # Build up the Gemfile for our Bundler context. We make sure to - # lock Vagrant to our current Vagrant version. In addition to that, - # we add all our plugin dependencies. -@@ -151,7 +158,7 @@ - - # Clean removes any unused gems. - def clean(plugins) -- gemfile= build_gemfile(plugins) -+ gemfile= build_gemfile(plugins, false, true) - lockfile = "#{gemfile.path}.lock" - definition = ::Bundler::Definition.build(gemfile, lockfile, nil) - root = File.dirname(gemfile.path) -@@ -182,11 +189,23 @@ - # Builds a valid Gemfile for use with Bundler given the list of - # plugins. - # -+# @param [Hash|Bool] update Hash of gems to update or true for all -+#
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: f567303257d9f0d0db70b37f053ea65bb3af3ef8 Author: Tomas Mozes sygic com> AuthorDate: Wed Feb 8 07:28:05 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Feb 11 11:33:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5673032 app-emulation/vagrant: loosen dep on dev-ruby/childprocess Gentoo-bug: 608522 .../vagrant/{vagrant-1.9.1.ebuild => vagrant-1.9.1-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.9.1.ebuild b/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild similarity index 92% rename from app-emulation/vagrant/vagrant-1.9.1.ebuild rename to app-emulation/vagrant/vagrant-1.9.1-r1.ebuild index 7e87339fa8..de188aa351 100644 --- a/app-emulation/vagrant/vagrant-1.9.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby21 ruby22 ruby23" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" @@ -51,7 +51,7 @@ all_ruby_prepare() { rm Gemfile || die # loosen dependencies - sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake/s/~>/>=/' \ + sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \ -e '/ruby_dep/s/<=/>=/' \ -e '/nokogiri/s/=/>=/' \ -i ${PN}.gemspec || die
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 426344635861bb968335ccdb0d7a4f3ea1f4b101 Author: Tomas Mozes gmail com> AuthorDate: Wed Dec 21 11:38:36 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 22 09:28:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42634463 app-emulation/vagrant: version bump to 1.9.1. Gentoo-Bug: https://bugs.gentoo.org/601930 Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3201 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.9.1 | 45 app-emulation/vagrant/vagrant-1.9.1.ebuild | 84 ++ 3 files changed, 130 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index cb9c46a..0490e5a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 +DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 diff --git a/app-emulation/vagrant/files/vagrant-1.9.1 b/app-emulation/vagrant/files/vagrant-1.9.1 new file mode 100644 index ..40a91d6 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.9.1 @@ -0,0 +1,45 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.1"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.1.ebuild b/app-emulation/vagrant/vagrant-1.9.1.ebuild new file mode 100644 index ..7e87339 --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.9.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +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 eutils + +DESCRIPTION="A tool for building and distributing development environments"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 12f8906f9a5b8f652c5d153c859c6d6444dfc161 Author: Tomas Mozes gmail com> AuthorDate: Wed Dec 21 11:39:46 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 22 09:28:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f8906f app-emulation/vagrant: drop old. Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3201 app-emulation/vagrant/Manifest| 1 - app-emulation/vagrant/files/vagrant-1.8.5 | 46 -- app-emulation/vagrant/vagrant-1.8.5-r1.ebuild | 91 --- 3 files changed, 138 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 0490e5a..7172e25 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9 diff --git a/app-emulation/vagrant/files/vagrant-1.8.5 b/app-emulation/vagrant/files/vagrant-1.8.5 deleted file mode 100644 index 0742cc2.. --- a/app-emulation/vagrant/files/vagrant-1.8.5 +++ /dev/null @@ -1,46 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.5"' )" - -# 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") -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" - -# 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 the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" - -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" -VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild b/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild deleted file mode 100644 index 63e8ad6.. --- a/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -USE_RUBY="ruby20 ruby21 ruby22" - -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 eutils - -DESCRIPTION="A tool for building and distributing development
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 858920a09a10d24538d90159016a325148c3315d Author: Tomas Mozes gmail com> AuthorDate: Tue Nov 15 06:38:54 2016 + Commit: David Seifert gentoo org> CommitDate: Tue Nov 15 22:28:23 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858920a0 app-emulation/vagrant: drop old Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2837 Signed-off-by: David Seifert gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/vagrant-1.8.4 | 46 app-emulation/vagrant/vagrant-1.8.4.ebuild | 87 -- 3 files changed, 134 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index e1078af..cb9c46a 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 diff --git a/app-emulation/vagrant/files/vagrant-1.8.4 b/app-emulation/vagrant/files/vagrant-1.8.4 deleted file mode 100644 index 7306d3b.. --- a/app-emulation/vagrant/files/vagrant-1.8.4 +++ /dev/null @@ -1,46 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.4"' )" - -# 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") -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" - -# 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 the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" - -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" -VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.4.ebuild b/app-emulation/vagrant/vagrant-1.8.4.ebuild deleted file mode 100644 index f1b2602.. --- a/app-emulation/vagrant/vagrant-1.8.4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -USE_RUBY="ruby20 ruby21" - -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 eutils - -DESCRIPTION="A tool for building and distributing
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 5f3c7b29b4a9a51246a170cf071c42126dba3cef Author: Tomas Mozes gmail com> AuthorDate: Tue Nov 15 06:33:05 2016 + Commit: David Seifert gentoo org> CommitDate: Tue Nov 15 22:28:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3c7b29 app-emulation/vagrant: version bump to 1.8.7 Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2837 Signed-off-by: David Seifert gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.7 | 46 app-emulation/vagrant/vagrant-1.8.7.ebuild | 88 ++ 3 files changed, 135 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index ee34b31..e1078af 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b +DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393 diff --git a/app-emulation/vagrant/files/vagrant-1.8.7 b/app-emulation/vagrant/files/vagrant-1.8.7 new file mode 100644 index ..aa744d5e --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.7 @@ -0,0 +1,46 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.7"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.7.ebuild b/app-emulation/vagrant/vagrant-1.8.7.ebuild new file mode 100644 index ..7a735d7 --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.7.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +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 eutils + +DESCRIPTION="A tool for building
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 4e47762ac4ee5f896d0c7880b0cc6f947e30b751 Author: Tomas Mozes gmail com> AuthorDate: Fri Oct 7 05:14:43 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 8 12:45:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e47762a app-emulation/vagrant: version bump to 1.8.6. Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2500 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.6 | 46 app-emulation/vagrant/vagrant-1.8.6.ebuild | 88 ++ 3 files changed, 135 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 6fcc7eb..f1eb49f 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,3 +1,4 @@ DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c +DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b diff --git a/app-emulation/vagrant/files/vagrant-1.8.6 b/app-emulation/vagrant/files/vagrant-1.8.6 new file mode 100644 index ..d4db0de --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.6 @@ -0,0 +1,46 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.6"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.6.ebuild b/app-emulation/vagrant/vagrant-1.8.6.ebuild new file mode 100644 index ..fda85cc --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.6.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22" + +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 eutils + +DESCRIPTION="A tool for building and
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: 3cc12b63fe4209ba7ea87de6d76fcfe78d94634f Author: Tomas Mozes gmail com> AuthorDate: Fri Oct 7 05:16:25 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 8 12:45:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc12b63 app-emulation/vagrant: drop old. Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2500 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 - app-emulation/vagrant/files/vagrant-1.8.1 | 46 ...agrant-1.8.1-install-plugins-in-isolation.patch | 122 - app-emulation/vagrant/vagrant-1.8.1.ebuild | 87 --- 4 files changed, 256 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index f1eb49f..ee34b31 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,4 +1,3 @@ -DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b diff --git a/app-emulation/vagrant/files/vagrant-1.8.1 b/app-emulation/vagrant/files/vagrant-1.8.1 deleted file mode 100644 index 760db56.. --- a/app-emulation/vagrant/files/vagrant-1.8.1 +++ /dev/null @@ -1,46 +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. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.1"' )" - -# 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") -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" - -# 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 the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" - -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" -VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch deleted file mode 100644 index c6934ab.. --- a/app-emulation/vagrant/files/vagrant-1.8.1-install-plugins-in-isolation.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/bin/vagrant b/bin/vagrant -index fce68c8..781fc63 100755 a/bin/vagrant -+++ b/bin/vagrant -@@ -69,6 +69,11 @@ end - require "bundler" - begin - $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) -+# Invalidate the
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: d49b89d131b5ef87af37c02f4cb280cf5d339147 Author: Tomas Mozes gmail com> AuthorDate: Fri Sep 16 06:51:49 2016 + Commit: Amy Winston gentoo org> CommitDate: Tue Sep 27 14:54:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49b89d1 app-emulation/vagrant: set permissions on authorized_keys, fixes #592996 Closes: #2339 Bugs: #592996 Package-Manager: portage-2.3.0 .../vagrant/{vagrant-1.8.5.ebuild => vagrant-1.8.5-r1.ebuild} | 4 1 file changed, 4 insertions(+) diff --git a/app-emulation/vagrant/vagrant-1.8.5.ebuild b/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild similarity index 92% rename from app-emulation/vagrant/vagrant-1.8.5.ebuild rename to app-emulation/vagrant/vagrant-1.8.5-r1.ebuild index 52460de..63e8ad6 100644 --- a/app-emulation/vagrant/vagrant-1.8.5.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.5-r1.ebuild @@ -72,6 +72,10 @@ all_ruby_prepare() { # fix rvm issue (bug #474476) epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch + + # https://github.com/mitchellh/vagrant/issues/7610 (#592996) + sed -e 's/bsd/linux/g ; 57i \ chmod 0600 ~/.ssh/authorized_keys' \ + -i plugins/guests/linux/cap/public_key.rb || die } all_ruby_install() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 3cd1709b6bc9a23a7cdd75ea60e2f2073b5e0f2b Author: Sebastian Pipping gentoo org> AuthorDate: Sat Aug 6 13:12:59 2016 + Commit: Sebastian Pipping gentoo org> CommitDate: Sat Aug 6 13:12:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd1709b app-emulation/vagrant: Require VirtualBox <5.1 (bug #590592) Package-Manager: portage-2.2.28 app-emulation/vagrant/vagrant-1.8.1.ebuild | 2 +- app-emulation/vagrant/vagrant-1.8.4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index f1c98c3..da6f4fd 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -24,7 +24,7 @@ IUSE="+virtualbox" RDEPEND="${RDEPEND} app-arch/libarchive net-misc/curl - virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" + virtualbox? ( || ( =dev-ruby/bundler-1.5.2 <=dev-ruby/bundler-1.10.6 diff --git a/app-emulation/vagrant/vagrant-1.8.4.ebuild b/app-emulation/vagrant/vagrant-1.8.4.ebuild index 4bdd5af..f1b2602 100644 --- a/app-emulation/vagrant/vagrant-1.8.4.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.4.ebuild @@ -24,7 +24,7 @@ IUSE="+virtualbox" RDEPEND="${RDEPEND} app-arch/libarchive net-misc/curl - virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" + virtualbox? ( || ( =dev-ruby/bundler-1.12.5
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 47d6f359a7140696445fcd559317b692aaba845c Author: Sebastian Pipping gentoo org> AuthorDate: Sat Aug 6 12:50:54 2016 + Commit: Sebastian Pipping gentoo org> CommitDate: Sat Aug 6 13:05:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d6f359 app-emulation/vagrant: Specify dev-ruby/rest-client slots Package-Manager: portage-2.2.28 app-emulation/vagrant/vagrant-1.8.1.ebuild | 2 +- app-emulation/vagrant/vagrant-1.8.4.ebuild | 2 +- app-emulation/vagrant/vagrant-1.8.5.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index 766211a..f1c98c3 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -37,7 +37,7 @@ ruby_add_rdepend " >=dev-ruby/net-ssh-3.0.1 >=dev-ruby/net-sftp-2.1 >=dev-ruby/net-scp-1.1.0 - >=dev-ruby/rest-client-1.6.0 =dev-ruby/rest-client-1.6.0:0 >=dev-ruby/nokogiri-1.6.3.1 >=dev-ruby/mime-types-2.6.2:* =dev-ruby/net-ssh-3.0.1 >=dev-ruby/net-sftp-2.1 >=dev-ruby/net-scp-1.1.0 - >=dev-ruby/rest-client-1.6.0 =dev-ruby/rest-client-1.6.0:0 >=dev-ruby/nokogiri-1.6.7.1 >=dev-ruby/mime-types-2.6.2:* =dev-ruby/net-ssh-3.0.1 >=dev-ruby/net-sftp-2.1 >=dev-ruby/net-scp-1.1.0 - >=dev-ruby/rest-client-1.6.0 =dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 ) >=dev-ruby/nokogiri-1.6.7.1 >=dev-ruby/mime-types-2.6.2:*
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: 94ceab2786452c2d0c444023ad95f02e0f785c1c Author: Tomas Mozes gmail com> AuthorDate: Tue Aug 2 10:13:41 2016 + Commit: Sebastian Pipping gentoo org> CommitDate: Tue Aug 2 10:13:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ceab27 app-emulation/vagrant: bump to 1.8.5 Package-Manager: portage-2.3.0 app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.5 | 46 app-emulation/vagrant/vagrant-1.8.5.ebuild | 87 ++ 3 files changed, 134 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index c72fb6d..6fcc7eb 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,2 +1,3 @@ DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 +DIST vagrant-1.8.5.tar.gz 1738399 SHA256 e6882f9b44a52888760c34d6c43e3fa3f118e9eb96730bcd466cd8ae948c3126 SHA512 b1e162b870fb991c42c98704cf7ad10ebe6090bacb00376e5b5684734508300847e9065393c33b49699ec884f12f8c48150b3cea2e17ba009917578817dd2f6b WHIRLPOOL bb535b3598e7224112326e3033fe38fccea54b18527954a5849e8cbdc1ebc9521294c6699335eacc0d32476731bb3e522a52e071e620c72c12c546fb62c4583c diff --git a/app-emulation/vagrant/files/vagrant-1.8.5 b/app-emulation/vagrant/files/vagrant-1.8.5 new file mode 100644 index 000..0742cc2 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.5 @@ -0,0 +1,46 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.5"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.8.5.ebuild b/app-emulation/vagrant/vagrant-1.8.5.ebuild new file mode 100644 index 000..1c156ab --- /dev/null +++ b/app-emulation/vagrant/vagrant-1.8.5.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +USE_RUBY="ruby20 ruby21 ruby22" + +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 eutils + +DESCRIPTION="A tool for building and distributing development environments" +HOMEPAGE="http://vagrantup.com/; +SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+virtualbox" + +RDEPEND="${RDEPEND} + app-arch/libarchive + net-misc/curl + virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )" + +ruby_add_rdepend " + >=dev-ruby/bundler-1.12.5 + >=dev-ruby/childprocess-0.5.0 +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/
commit: 318613da2ec71e8aff565fa89c879edd68f96ae7 Author: Tomas Mozes gmail com> AuthorDate: Thu Jun 23 10:21:22 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Jun 23 21:18:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318613da app-emulation/vagrant: remove unnecessary executable bit Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1728 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/files/vagrant-1.8.1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-emulation/vagrant/files/vagrant-1.8.1 b/app-emulation/vagrant/files/vagrant-1.8.1 old mode 100755 new mode 100644
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/files/, app-emulation/vagrant/
commit: a48f6b99381ac753738bec83430df4f96267c25b Author: Tomas Mozes gmail com> AuthorDate: Thu Jun 23 10:29:14 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Jun 23 21:18:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48f6b99 app-emulation/vagrant: version bump to 1.8.4 Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1728 Signed-off-by: Patrice Clement gentoo.org> app-emulation/vagrant/Manifest | 1 + app-emulation/vagrant/files/vagrant-1.8.4 | 46 + ...agrant-1.8.4-install-plugins-in-isolation.patch | 114 + app-emulation/vagrant/vagrant-1.8.4.ebuild | 87 4 files changed, 248 insertions(+) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index 24578f1..c72fb6d 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1,2 @@ DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 +DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9 diff --git a/app-emulation/vagrant/files/vagrant-1.8.4 b/app-emulation/vagrant/files/vagrant-1.8.4 new file mode 100644 index 000..7306d3b --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.4 @@ -0,0 +1,46 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.4"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our arguments +exec ruby "${VAGRANT_LAUNCHER}" "$@" diff --git a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch new file mode 100644 index 000..7673073 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch @@ -0,0 +1,114 @@ +--- bin/vagrant bin/vagrant +@@ -69,6 +69,11 @@ + require "bundler" + begin + $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) ++# Invalidate the cached Gemfile.lock if necessary and try again ++rescue Bundler::GemNotFound ++ FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile") if File.exists? File.expand_path("~/.vagrant.d/Gemfile") ++ FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile.lock") if File.exists? File.expand_path("~/.vagrant.d/Gemfile.lock") ++ $vagrant_bundler_runtime = Bundler.setup(:default, :plugins) + rescue Bundler::GemNotFound + $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins," + $stderr.puts "is reporting that a plugin or its dependency can't be found." +--- lib/vagrant/bundler.rb2016-06-13 10:21:40.0 +0200 lib/vagrant/bundler.rb 2016-06-23 08:19:22.466039136 +0200 +@@ -65,6 +65,13 @@ + @configfile = tempfile("vagrant-configfile") + @configfile.close + ++ # Ensure the path
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 5dcc92a493b3307d9f2c7276a1a37de492bf0a5f Author: Tomas Mozes gmail com> AuthorDate: Wed Jan 20 08:42:48 2016 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jan 20 08:59:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dcc92a4 app-emulation/vagrant: set slot operator for deps Package-Manager: portage-2.2.26 app-emulation/vagrant/vagrant-1.8.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index 2992f55..766211a 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -30,7 +30,7 @@ ruby_add_rdepend " >=dev-ruby/bundler-1.5.2 <=dev-ruby/bundler-1.10.6 >=dev-ruby/childprocess-0.5.0 >=dev-ruby/erubis-2.7.0 - >=dev-ruby/i18n-0.6.0 =dev-ruby/i18n-0.6.0:* =dev-ruby/listen-3.0.2 >=dev-ruby/hashicorp-checkpoint-0.1.1 >=dev-ruby/log4r-1.1.9 =dev-ruby/net-scp-1.1.0 >=dev-ruby/rest-client-1.6.0 =dev-ruby/nokogiri-1.6.3.1 - >=dev-ruby/mime-types-2.6.2 =dev-ruby/mime-types-2.6.2:*
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 0351658f502b14b7677346c5bc5e1a0850a067b2 Author: Tomas Mozes gmail com> AuthorDate: Wed Jan 20 08:39:48 2016 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jan 20 08:59:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0351658f app-emulation/vagrant: drop ruby22 as dev-ruby/rest-client does not support it yet Package-Manager: portage-2.2.26 app-emulation/vagrant/vagrant-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index 50fcdce..2992f55 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI="5" -USE_RUBY="ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/
commit: ffce965ba1e2096a8807a21be7e59b4955bdca66 Author: Tomas Mozes gmail com> AuthorDate: Mon Jan 18 17:02:31 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon Jan 18 17:02:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffce965b app-emulation/vagrant: version bump to 1.8.1 Package-Manager: portage-2.2.26 app-emulation/vagrant/Manifest | 2 +- .../vagrant/files/vagrant-1.2.1-no-warning.patch | 12 -- .../vagrant/files/vagrant-1.2.2-rvm.patch | 12 -- app-emulation/vagrant/files/vagrant-1.8.1 | 46 .../vagrant-1.8.1-disable-embedded-cacert.patch| 17 +++ ...agrant-1.8.1-install-plugins-in-isolation.patch | 122 + .../vagrant/files/vagrant-1.8.1-rvm.patch | 11 ++ app-emulation/vagrant/metadata.xml | 20 +++- app-emulation/vagrant/vagrant-1.4.3-r2.ebuild | 69 app-emulation/vagrant/vagrant-1.8.1.ebuild | 84 ++ 10 files changed, 295 insertions(+), 100 deletions(-) diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index a495574..24578f1 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1 +1 @@ -DIST vagrant-1.4.3.tar.gz 2391973 SHA256 09ccc0d87999a3c133b9ef52a5cff58402745ee64af6080b2a5d304eb06c9c58 SHA512 93fd1cfa263004cadbf670fac4dc318db9719d2a86afe188857cbc97c1317e6ef2387be498ef9278ca95cdda6bd41400426e3bf52448eb59c31877c9fd0624e4 WHIRLPOOL e581e8488e0b1e75bcdd75f4572b89f9c23338e422d3acb57b1d5d513d9357ec0b061371d926ad0bb1087bf890e70422d4e3527dfd518329ba910f42f0733673 +DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261 diff --git a/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch b/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch deleted file mode 100644 index 08d1d35..000 --- a/app-emulation/vagrant/files/vagrant-1.2.1-no-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ vagrant-1.2.1/bin/vagrant -+++ vagrant-1.2.1/bin/vagrant -@@ -74,9 +74,6 @@ - warned = true - end - end -- --# If we're not in the installer, warn. --env.ui.warn(I18n.t("vagrant.general.not_in_installer")) if !warned - end - - begin diff --git a/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch b/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch deleted file mode 100644 index 99265a2..000 --- a/app-emulation/vagrant/files/vagrant-1.2.2-rvm.patch +++ /dev/null @@ -1,12 +0,0 @@ vagrant-1.2.2/bin/vagrant -+++ vagrant-1.2.2/bin/vagrant -@@ -5,6 +5,9 @@ - # initializing which have historically resulted in stack traces. - Signal.trap("INT") { exit 1 } - -+ENV.delete('GEM_HOME') -+ENV.delete('GEM_PATH') -+ - require 'log4r' - require 'vagrant' - require 'vagrant/cli' diff --git a/app-emulation/vagrant/files/vagrant-1.8.1 b/app-emulation/vagrant/files/vagrant-1.8.1 new file mode 100755 index 000..760db56 --- /dev/null +++ b/app-emulation/vagrant/files/vagrant-1.8.1 @@ -0,0 +1,46 @@ +#!/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. + +VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.1"' )" + +# 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") +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" + +# 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 the OS as an environmental variable that Vagrant can access +# so that it can behave better. +export VAGRANT_DETECTED_OS="${OS}" + +VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb" + +# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit +export VAGRANT_EXECUTABLE + +# Call the actual Vagrant bin with our
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/
commit: 272c55f203cbdc60a6d4b8004422ec606585ee0f Author: Tomas Mozes gmail com> AuthorDate: Tue Jan 19 15:59:51 2016 + Commit: Ian Delaney gentoo org> CommitDate: Tue Jan 19 15:59:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272c55f2 app-emulation/vagrant: remove rb-kqueue, loosen net-scp Package-Manager: portage-2.2.26 app-emulation/vagrant/vagrant-1.8.1.ebuild | 55 -- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index 7989b4d..50fcdce 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -36,49 +36,52 @@ ruby_add_rdepend " >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-3.0.1 >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.1.0 =dev-ruby/rb-kqueue-0.2.0 + >=dev-ruby/net-scp-1.1.0 >=dev-ruby/rest-client-1.6.0 =dev-ruby/nokogiri-1.6.3.1 >=dev-ruby/mime-types-2.6.2 />=/' \ --e '/nokogiri/s/=/>=/' \ --i ${PN}.gemspec || die - -# remove windows-specific gems -sed -e '/wdm\|winrm/d' \ --i ${PN}.gemspec || die - -# see https://github.com/mitchellh/vagrant/pull/5877 -epatch "${FILESDIR}"/${P}-install-plugins-in-isolation.patch - + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + + # loosen dependencies + sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \ + -e '/nokogiri/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 + + # see https://github.com/mitchellh/vagrant/pull/5877 + epatch "${FILESDIR}"/${P}-install-plugins-in-isolation.patch + # disable embedded CA certs and use system ones -epatch "${FILESDIR}"/${P}-disable-embedded-cacert.patch + epatch "${FILESDIR}"/${P}-disable-embedded-cacert.patch # fix rvm issue (bug #474476) -epatch "${FILESDIR}"/${P}-rvm.patch + epatch "${FILESDIR}"/${P}-rvm.patch } all_ruby_install() { -newbashcomp contrib/bash/completion.sh ${PN} -all_fakegem_install + newbashcomp contrib/bash/completion.sh ${PN} + all_fakegem_install # provide executable similar to upstream: # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb -newbin "${FILESDIR}/${P}" "${PN}" + newbin "${FILESDIR}/${P}" "${PN}" -# directory for plugins.json -dodir /var/lib/vagrant + # directory for plugins.json + dodir /var/lib/vagrant }