From b32e5e13c7dbf2d3acdaf49e85ddbc424207c14c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 7 Apr 2014 03:51:15 +0000 Subject: Mon Apr 7 03:43:56 UTC 2014 --- community/avrdude/PKGBUILD | 10 +++++----- community/bird/PKGBUILD | 6 +++--- community/stone-soup/PKGBUILD | 4 ++-- community/vagrant/PKGBUILD | 34 ++++++++++++++++------------------ community/vagrant/plugins.patch | 31 ------------------------------- 5 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 community/vagrant/plugins.patch (limited to 'community') diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 72757ecf2..7810a041f 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102091 2013-12-05 02:01:26Z eric $ +# $Id: PKGBUILD 108877 2014-04-06 12:54:01Z jelle $ # Contributor: Corrado Primier # Maintainer: Brad Fanella pkgname=avrdude -pkgver=6.0.1 -pkgrel=3 +pkgver=6.1 +pkgrel=1 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') -depends=('readline' 'libftdi' 'libusb-compat') +depends=('readline' 'libftdi' 'libusb-compat' 'elfutils') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('346ec2e46393a54ac152b95abf1d9850' +md5sums=('9db8c25b935d34234b9b1ba16ad55fd5' 'SKIP') build() { diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index cc71fcc31..42930aea2 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108743 2014-04-02 14:30:24Z seblu $ +# $Id: PKGBUILD 108886 2014-04-06 21:09:47Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 arch=('i686' 'x86_64') url='http://bird.network.cz/' @@ -12,7 +12,7 @@ depends=('readline' 'ncurses') source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') -md5sums=('7bd6df9674e4003cfffd3343f14ee775' +md5sums=('127c154a5a000fa5658ee1c53c44ab68' '69221e063a3f07dcad519d5eeacaae75' '5b172bd052b523efd95ee018e891e181') diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 49cd9695b..42953f682 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') @@ -66,4 +66,4 @@ package() { } -md5sums=('835825ba4d9863c8e255a8cb916db0c7') +md5sums=('c63074afa81c74c311697b04fb6e7610') 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 # Contributor: Ido Rosen # Contributor: Brett Hoerner @@ -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 <${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} -- cgit v1.2.3-54-g00ecf