diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /~fauno | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to '~fauno')
| -rw-r--r-- | ~fauno/notmuch/PKGBUILD | 7 | ||||
| -rw-r--r-- | ~fauno/pandoc/PKGBUILD | 13 | ||||
| -rw-r--r-- | ~fauno/pandoc/SRCBUILD | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 3283f3734..1e64e388c 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Richard Murri <admin@richardmurri.com> pkgname=notmuch -pkgver=0.13 +pkgver=0.13.1 pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) @@ -19,7 +19,6 @@ optdepends=('emacs: for using the emacs interface' options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('d5a70ed3ba84a2670b4576cfe16bd4f6') build() { cd "$srcdir/${pkgname}-"* @@ -62,4 +61,8 @@ package(){ cd $srcdir/${pkgname}-*/bindings/ruby sed -i -e 's,/site_ruby,,g' Makefile make prefix=${pkgdir}/usr install + +# Remove conflicting zsh completion + rm -r ${pkgdir}/usr/share/zsh } +md5sums=('1380d4b010e4321288a48ef09edf9de2') diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index 875e6bb0a..56b9567f8 100644 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -1,16 +1,21 @@ # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> # Based on haskell-pandoc +# Run `makepkg -srp SRCBUILD` if you want to update the source tarball + pkgname=pandoc -pkgver=1.9.1.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') options=('strip') -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig}) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig} SRCBUILD) +md5sums=('944f2b32803b0335345853cd2b1c1ad7' + '0ee3190fd7d43bcfebdb282ff12584f2' + 'ecc040d30c6e4fb77c32d598dd03729d') conflicts=('haskell-pandoc') # PKGBUILD functions @@ -55,5 +60,3 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } -md5sums=('f377f51be658821876e49e5485d47219' - 'd08ee033440f16c30b2b8b6b80ae12c7') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index 09b154d7a..5ef2b9dc1 100644 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -2,8 +2,8 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.9.1.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') |