[arch-commits] Commit in vagrant/trunk (PKGBUILD)

[Jonathan Steel]

    Date: Tuesday, December 22, 2015 @ 22:56:32
  Author: jsteel
Revision: 154303

upgpkg: vagrant 1.8.0-1

Modified:
  vagrant/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 21:18:04 UTC (rev 154302)
+++ PKGBUILD	2015-12-22 21:56:32 UTC (rev 154303)
@@ -10,35 +10,25 @@
 # Contributor: Steven Nance <steven at devtrw.com>
 
 pkgname=vagrant
-pkgver=1.7.4
-pkgrel=4
-_subver=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
 url="http://vagrantup.com"
 license=('MIT')
 options=('!emptydirs')
-depends=('lzo' 'libidn' 'rtmpdump')
+depends=('vagrant-substrate')
 source=($pkgname-$pkgver.tar.gz::http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz)
-source_i686+=(http://pkgbuild.com/~jsteel/$pkgname/substrate_archlinux_i686-$_subver.zip{,.sig})
-source_x86_64+=(http://pkgbuild.com/~jsteel/$pkgname/substrate_archlinux_x86_64-$_subver.zip{,.sig})
-md5sums=('556b5e5594a327d46b63c4d8024db187')
-md5sums_i686=('0c4f162b61b51331fc5d7ac63c02a1e5'
-              'SKIP')
-md5sums_x86_64=('f975756fe6e8473692a339160320fe9a'
-                'SKIP')
-validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
+md5sums=('46091e1f0ff739fc140e2fce2b42d13c')
 
 build() {
   cd $pkgname-$pkgver
 
-  EMBEDDED_DIR="$srcdir"/substrate/embedded
+  EMBEDDED_DIR=/opt/vagrant/embedded
 
-  echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version
-
   "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec
 
-  GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
+  GEM_PATH="$srcdir"/$pkgname-$pkgver/gems-$pkgver-$pkgrel GEM_HOME="$GEM_PATH" \
   GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
   LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
   SSL_CERT_FILE="$EMBEDDED_DIR"/cacert.pem \
@@ -46,15 +36,18 @@
 }
 
 package() {
-  install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
+  cd $pkgname-$pkgver
 
-  cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
+  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
+
   ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
 
-  ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
+  install -Dm644 contrib/bash/completion.sh \
     "$pkgdir"/usr/share/bash-completion/completions/$pkgname
 
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \
+  install -Dm644 LICENSE \
     "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }