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

[Jonathan Steel]

    Date: Thursday, March 20, 2014 @ 21:53:49
  Author: jsteel
Revision: 108009

archrelease: copy trunk to community-x86_64

Added:
  vagrant/repos/community-x86_64/PKGBUILD
    (from rev 108008, vagrant/trunk/PKGBUILD)
  vagrant/repos/community-x86_64/plugins.patch
    (from rev 108008, vagrant/trunk/plugins.patch)
Deleted:
  vagrant/repos/community-x86_64/plugins.patch

---------------+
 PKGBUILD      |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 plugins.patch |   62 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 87 insertions(+), 31 deletions(-)

Copied: vagrant/repos/community-x86_64/PKGBUILD (from rev 108008, vagrant/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-03-20 20:53:49 UTC (rev 108009)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at aur.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=1.5.1
+pkgrel=5
+pkgdesc="Build and distribute virtualized development environments"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+makedepends=('git')
+depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
+source=(git://github.com/mitchellh/$pkgname.git
+        git://github.com/mitchellh/$pkgname-installers.git
+        plugins.patch
+        http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
+md5sums=('SKIP' 'SKIP'
+         'c73455203b22aaf89e3a7779ebbe81ed')
+[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
+[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
+
+prepare() {
+  # Remove proprietary plugins
+  patch -Np1 -i "$srcdir"/plugins.patch
+}
+
+build() {
+  cd "$srcdir"/$pkgname
+    REV=$( git log --grep ^v$pkgver$ --pretty=format:"%H" | head -n 1 )
+
+  "$srcdir"/$pkgname-installers/package/support/install_$pkgname.sh \
+    "$srcdir"/substrate/ $REV "$srcdir"/substrate/${pkgname}_version
+}
+
+package() {
+  install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
+
+  cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
+
+  ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+  ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
+    "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+  install -Dm644 "$srcdir"/$pkgname/LICENSE \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: plugins.patch
===================================================================
--- plugins.patch	2014-03-20 20:39:49 UTC (rev 108008)
+++ plugins.patch	2014-03-20 20:53:49 UTC (rev 108009)
@@ -1,31 +0,0 @@
---- src/vagrant-installers/package/support/install_vagrant.sh.orig	2014-03-20 19:49:56.853976851 +0000
-+++ src/vagrant-installers/package/support/install_vagrant.sh	2014-03-20 19:53:25.921123996 +0000
-@@ -55,28 +55,6 @@
- export PATH="${EMBEDDED_DIR}/bin:${PATH}"
- ${GEM_COMMAND} install vagrant.gem --no-ri --no-rdoc
- 
--# Install extensions
--${GEM_COMMAND} install vagrant-login --no-ri --no-rdoc --source "http://gems.hashicorp.com"
--${GEM_COMMAND} install vagrant-share --no-ri --no-rdoc --source "http://gems.hashicorp.com"
--
--# Setup the system plugins
--cat <<EOF >${EMBEDDED_DIR}/plugins.json
--{
--    "version": "1",
--    "installed": {
--        "vagrant-login": {
--            "ruby_version": "0",
--            "vagrant_version": "${VERSION}"
--        },
--        "vagrant-share": {
--            "ruby_version": "0",
--            "vagrant_version": "${VERSION}"
--        }
--    }
--}
--EOF
--chmod 0644 ${EMBEDDED_DIR}/plugins.json
--
- # Exit the temporary directory
- popd
- rm -rf ${TMP_DIR}

Copied: vagrant/repos/community-x86_64/plugins.patch (from rev 108008, vagrant/trunk/plugins.patch)
===================================================================
--- plugins.patch	                        (rev 0)
+++ plugins.patch	2014-03-20 20:53:49 UTC (rev 108009)
@@ -0,0 +1,31 @@
+--- src/vagrant-installers/package/support/install_vagrant.sh.orig	2014-03-20 19:49:56.853976851 +0000
++++ src/vagrant-installers/package/support/install_vagrant.sh	2014-03-20 19:53:25.921123996 +0000
+@@ -55,28 +55,6 @@
+ export PATH="${EMBEDDED_DIR}/bin:${PATH}"
+ ${GEM_COMMAND} install vagrant.gem --no-ri --no-rdoc
+ 
+-# Install extensions
+-${GEM_COMMAND} install vagrant-login --no-ri --no-rdoc --source "http://gems.hashicorp.com"
+-${GEM_COMMAND} install vagrant-share --no-ri --no-rdoc --source "http://gems.hashicorp.com"
+-
+-# Setup the system plugins
+-cat <<EOF >${EMBEDDED_DIR}/plugins.json
+-{
+-    "version": "1",
+-    "installed": {
+-        "vagrant-login": {
+-            "ruby_version": "0",
+-            "vagrant_version": "${VERSION}"
+-        },
+-        "vagrant-share": {
+-            "ruby_version": "0",
+-            "vagrant_version": "${VERSION}"
+-        }
+-    }
+-}
+-EOF
+-chmod 0644 ${EMBEDDED_DIR}/plugins.json
+-
+ # Exit the temporary directory
+ popd
+ rm -rf ${TMP_DIR}