From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74B2F158017 for ; Tue, 28 Sep 2021 01:01:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9143AE0A6A; Tue, 28 Sep 2021 01:01:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EC51E0A6A for ; Tue, 28 Sep 2021 01:01:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7071E342E7C for ; Tue, 28 Sep 2021 01:01:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A0B6129 for ; Tue, 28 Sep 2021 01:01:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632790850.d846a14da7548f88932b2ee37f9bc54886c2adce.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/, app-emulation/vagrant/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vagrant/Manifest app-emulation/vagrant/files/vagrant.in app-emulation/vagrant/vagrant-2.2.14.ebuild X-VCS-Directories: app-emulation/vagrant/ app-emulation/vagrant/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d846a14da7548f88932b2ee37f9bc54886c2adce X-VCS-Branch: master Date: Tue, 28 Sep 2021 01:01:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a3b60dd-70e5-49bf-9cbc-58e0b057c76f X-Archives-Hash: 74a445dd68f54c2f2cdd9d2003726c11 commit: d846a14da7548f88932b2ee37f9bc54886c2adce Author: Guillaume Seren gmail com> AuthorDate: Mon Dec 14 17:11:40 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 28 01:00:50 2021 +0000 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 00000000000..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 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 + optfeature "docker support" app-emulation/docker +}