[arch-commits] Commit in vagrant/repos (3 files)

[Felix Yan]

    Date: Wednesday, January 9, 2019 @ 19:52:34
  Author: felixonmars
Revision: 421303

archrelease: copy trunk to community-staging-x86_64

Added:
  vagrant/repos/community-staging-x86_64/
  vagrant/repos/community-staging-x86_64/PKGBUILD
    (from rev 421302, vagrant/trunk/PKGBUILD)
  vagrant/repos/community-staging-x86_64/ruby26.patch
    (from rev 421302, vagrant/trunk/ruby26.patch)

--------------+
 PKGBUILD     |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ruby26.patch |   35 ++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)

Copied: vagrant/repos/community-staging-x86_64/PKGBUILD (from rev 421302, vagrant/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-01-09 19:52:34 UTC (rev 421303)
@@ -0,0 +1,76 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Ido Rosen <ido at kernel.org>
+# Contributor: Brett Hoerner <brett at bretthoerner.com>
+# Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
+# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
+# Contributor: helios <aur at wiresphere.de>
+# Contributor: George Ornbo <gornbo at gmail.com>
+# Contributor: Niklas Heer <niklas.heer at me.com>
+# Contributor: Steven Nance <steven at devtrw.com>
+
+pkgname=vagrant
+pkgver=2.2.2
+pkgrel=2
+pkgdesc="Build and distribute virtualized development environments"
+arch=('x86_64')
+url="https://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
+         'ruby' 'xz')
+makedepends=('git' 'go-pie')
+conflicts=('vagrant-substrate')
+replaces=('vagrant-substrate')
+source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
+        ruby26.patch
+        "git+https://github.com/mitchellh/vagrant-installers.git#commit=7b7fb86")
+md5sums=('3c9ef6fbbf1b36f7e98a1e2495e50101'
+         '16d1ca112b51345c47d2f6d899670e37'
+         'SKIP')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # https://github.com/hashicorp/vagrant/issues/10577
+  patch -Np1 -i ../ruby26.patch
+
+  INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
+
+  gem build $pkgname.gemspec
+
+  cd "$INSTALLERS_DIR"/vagrant_substrate/files/launcher
+  go get github.com/mitchellh/osext
+  go build -o vagrant
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
+  EMBEDDED_DIR="$pkgdir"/opt/vagrant/embedded
+
+  install -d "$pkgdir"/usr/{bin,share/bash-completion/completions}
+
+  install -Dm644 "$INSTALLERS_DIR"/vagrant_substrate/templates/gemrc.erb \
+    "$EMBEDDED_DIR"/etc/gemrc
+
+  cp -r "$INSTALLERS_DIR"/rubyencoder/files/rgloader "$EMBEDDED_DIR"
+
+  GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
+  GEMRC="$EMBEDDED_DIR"/etc/gemrc \
+    gem install $pkgname-$pkgver.gem --no-document
+
+  install -Dm755 "$INSTALLERS_DIR"/vagrant_substrate/files/launcher/vagrant \
+    "$pkgdir"/opt/$pkgname/bin/$pkgname
+
+  ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+  install -Dm644 contrib/bash/completion.sh \
+    "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+  install -Dm644 contrib/vim/vagrantfile.vim \
+    "$pkgdir"/usr/share/vim/vimfiles/ftdetect/vagrantfile.vim
+
+  install -Dm644 LICENSE \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Copied: vagrant/repos/community-staging-x86_64/ruby26.patch (from rev 421302, vagrant/trunk/ruby26.patch)
===================================================================
--- community-staging-x86_64/ruby26.patch	                        (rev 0)
+++ community-staging-x86_64/ruby26.patch	2019-01-09 19:52:34 UTC (rev 421303)
@@ -0,0 +1,35 @@
+From 5445c6c79fca6ef5751375e18a344382ffce50df Mon Sep 17 00:00:00 2001
+From: Chris Roberts <croberts at hashicorp.com>
+Date: Wed, 9 Jan 2019 09:56:23 -0800
+Subject: [PATCH] Update ruby version support to include 2.6
+
+---
+ .travis.yml     | 1 +
+ vagrant.gemspec | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index e024bed1a5..9ae52c7022 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -13,6 +13,7 @@ rvm:
+   - 2.3.8
+   - 2.4.5
+   - 2.5.3
++  - 2.6.0
+ 
+ branches:
+   only:
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index 7ff8dca95e..7bfb47e500 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
+   s.summary       = "Build and distribute virtualized development environments."
+   s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
+ 
+-  s.required_ruby_version     = "~> 2.2", "< 2.6"
++  s.required_ruby_version     = "~> 2.2", "< 2.7"
+   s.required_rubygems_version = ">= 1.3.6"
+   s.rubyforge_project         = "vagrant"
+