diff options
Diffstat (limited to 'community/vagrant')
-rw-r--r-- | community/vagrant/PKGBUILD | 34 | ||||
-rw-r--r-- | community/vagrant/plugins.patch | 31 |
2 files changed, 16 insertions, 49 deletions
diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD index 5a43bcb3d..8013c81b5 100644 --- a/community/vagrant/PKGBUILD +++ b/community/vagrant/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108784 2014-04-03 17:58:29Z jsteel $ +# $Id: PKGBUILD 108871 2014-04-06 09:08:17Z jsteel $ # Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: Ido Rosen <ido@kernel.org> # Contributor: Brett Hoerner <brett@bretthoerner.com> @@ -11,34 +11,32 @@ pkgname=vagrant pkgver=1.5.2 -pkgrel=1 +pkgrel=2 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 +source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip) -md5sums=('SKIP' 'SKIP' - 'c73455203b22aaf89e3a7779ebbe81ed') +md5sums=('217e62eb15e5ba9c4aaea394c75ad272') [[ $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 ) + cd "$srcdir"/$pkgname-$pkgver + + EMBEDDED_DIR="$srcdir"/substrate/embedded + + echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version + + "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec - "$srcdir"/$pkgname-installers/package/support/install_$pkgname.sh \ - "$srcdir"/substrate/ $REV "$srcdir"/substrate/${pkgname}_version + GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \ + GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \ + LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \ + "$EMBEDDED_DIR"/bin/gem install $pkgname-$pkgver.gem --no-ri --no-rdoc } package() { @@ -51,6 +49,6 @@ package() { 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 \ + install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/vagrant/plugins.patch b/community/vagrant/plugins.patch deleted file mode 100644 index 8c2bc9ba7..000000000 --- a/community/vagrant/plugins.patch +++ /dev/null @@ -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} |