Upstream update to use system binaries

2 files changed, 51 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afbb35d33184..76a4e0b839f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,33 @@
 # Generated by mksrcinfo v8
-# Fri Sep 23 12:00:48 UTC 2016
+# Thu Nov  2 11:39:13 UTC 2017
 pkgbase = vagrant-git
 	pkgdesc = Build and distribute virtualized development environments
-	pkgver = 1.8.5.95.g7ceac14
+	pkgver = 2.0.0.101.g52824f20b
 	pkgrel = 1
-	url = http://vagrantup.com
+	url = https://vagrantup.com
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	depends = vagrant-substrate
+	makedepends = go-pie
+	depends = curl
+	depends = libarchive
+	depends = libssh2
+	depends = libxml2
+	depends = libxslt
+	depends = rsync
+	depends = ruby
+	depends = xz
+	provides = vagrant
 	conflicts = vagrant
+	conflicts = vagrant-substrate
+	conflicts = vagrant-substrate-git
+	replaces = vagrant-substrate
+	replaces = vagrant-substrate-git
 	options = !emptydirs
 	source = git://github.com/mitchellh/vagrant.git
+	source = git://github.com/mitchellh/vagrant-installers.git
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = vagrant-git
diff --git a/PKGBUILD b/PKGBUILD
index 6829dab94e78..f21ce396c60e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,23 @@
 
 _pkgname=vagrant
 pkgname=vagrant-git
-pkgver=1.8.5.95.g7ceac14
+pkgver=2.0.0.101.g52824f20b
 pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
-url="http://vagrantup.com"
+url="https://vagrantup.com"
 license=('MIT')
-conflicts=('vagrant')
 options=('!emptydirs')
-makedepends=('git')
-depends=('vagrant-substrate')
-source=(git://github.com/mitchellh/$_pkgname.git)
-md5sums=('SKIP')
+depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
+         'ruby' 'xz')
+makedepends=('git' 'go-pie')
+provides=('vagrant')
+conflicts=('vagrant' 'vagrant-substrate' 'vagrant-substrate-git')
+replaces=('vagrant-substrate' 'vagrant-substrate-git')
+source=(git://github.com/mitchellh/$_pkgname.git
+        git://github.com/mitchellh/vagrant-installers.git)
+md5sums=('SKIP'
+         'SKIP')
 
 pkgver() {
   cd $_pkgname
@@ -24,28 +29,36 @@ pkgver() {
 build() {
   cd $_pkgname
 
-  EMBEDDED_DIR=/opt/vagrant/embedded
+  INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
+
+  gem build $_pkgname.gemspec
 
-  "$EMBEDDED_DIR"/bin/gem build $_pkgname.gemspec
   cp vagrant-*.gem vagrant.gem
 
-  GEM_PATH="$srcdir"/$_pkgname/gems-$pkgver-$pkgrel GEM_HOME="$GEM_PATH" \
-  GEMRC="$EMBEDDED_DIR"/etc/gemrc \
-  CPPFLAGS="-I$EMBEDDED_DIR/include -I${EMBEDDED_DIR}/include/libxml2" \
-  CFLAGS="${CPPFLAGS}" \
-  LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
-  SSL_CERT_FILE="$EMBEDDED_DIR"/cacert.pem \
-  NOKOGIRI_USE_SYSTEM_LIBRARIES=1 \
-    "$EMBEDDED_DIR"/bin/gem install $_pkgname.gem --no-ri --no-rdoc
+  cd "$INSTALLERS_DIR"/vagrant_substrate/files/launcher
+  go get github.com/mitchellh/osext
+  go build -o vagrant
 }
 
 package() {
   cd $_pkgname
 
+  INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
+  EMBEDDED_DIR="$pkgdir"/opt/vagrant/embedded
+
   install -d "$pkgdir"/usr/{bin,share/bash-completion/completions}
-  install -d "$pkgdir"/opt/vagrant/embedded
 
-  cp -r gems-$pkgver-$pkgrel "$pkgdir"/opt/vagrant/embedded/gems
+  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.gem --no-ri --no-rdoc
+
+  install -Dm755 "$INSTALLERS_DIR"/vagrant_substrate/files/launcher/vagrant \
+    "$pkgdir"/opt/$_pkgname/bin/$_pkgname
 
   ln -s /opt/$_pkgname/bin/$_pkgname "$pkgdir"/usr/bin/$_pkgname