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

[Jonathan Steel]

    Date: Thursday, March 20, 2014 @ 21:28:17
  Author: jsteel
Revision: 108006

upgpkg: vagrant 1.5.1-5

Added:
  vagrant/trunk/plugins.patch
Modified:
  vagrant/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 +++++++++++----
 plugins.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-20 19:53:28 UTC (rev 108005)
+++ PKGBUILD	2014-03-20 20:28:17 UTC (rev 108006)
@@ -11,7 +11,7 @@
 
 pkgname=vagrant
 pkgver=1.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
 url="http://vagrantup.com"
@@ -21,11 +21,18 @@
 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')
-[[ $CARCH == i686 ]] && md5sums[2]='c04042b24de56d18a041bc005e5ecaa4'
-[[ $CARCH == x86_64 ]] && md5sums[2]='53d8a137e0b50fee8509a7d1c15fd33b'
+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 )

Added: plugins.patch
===================================================================
--- plugins.patch	                        (rev 0)
+++ plugins.patch	2014-03-20 20:28:17 UTC (rev 108006)
@@ -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}