Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/balsa/PKGBUILD
	community/bitcoin/PKGBUILD
	community/jack2/PKGBUILD
	community/kadu/PKGBUILD
	community/oss/PKGBUILD
	core/sudo/PKGBUILD
	extra/djvulibre/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/samba/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-sdl/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/man-db/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/procps-ng/PKGBUILD
	testing/procps-ng/sysctl.conf
	testing/sudo/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nouveau/xf86-video-nouveau.install

4 files changed, 22 insertions, 29 deletions

diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD
index c03ccc7c8..1256ad4d3 100644
--- a/~fauno/afew/PKGBUILD
+++ b/~fauno/afew/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=2011.12.1
-_gitver=20111222
+pkgver=2012.07.11
+_gitver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
@@ -25,5 +25,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e99de6dc7390e22701fa60cfed1a52b8'
+md5sums=('99e501fb8f99ec58eccf8c08d572dab2'
          '295b245540aa61538f9a3556c4be846c')
diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD
index eea293021..0ac3b5d75 100644
--- a/~fauno/afew/SRCBUILD
+++ b/~fauno/afew/SRCBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=20111222
+pkgver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD
index ace343317..0d0d91a11 100644
--- a/~fauno/haskell-zip-archive/PKGBUILD
+++ b/~fauno/haskell-zip-archive/PKGBUILD
@@ -5,27 +5,19 @@ _licensefile=LICENSE
 # PKGBUILD options/directives
 pkgname=haskell-zip-archive
 pkgver=0.1.1.7
-pkgrel=18
+pkgrel=20
 pkgdesc="Library for creating and modifying zip archives."
 url="http://github.com/jgm/zip-archive"
 license=("GPL")
 arch=('i686' 'x86_64')
 makedepends=()
 depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-array=0.3.0.2"
-         "haskell-binary=0.5.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-digest=0.0.0.9"
-         "haskell-directory=1.1.0.0"
-         "haskell-filepath=1.2.0.0"
-         "haskell-mtl=2.0.1.0"
-         "haskell-old-time=1.0.0.6"
-         "haskell-pretty=1.0.1.2"
-         "haskell-unix=2.4.2.0"
-         "haskell-utf8-string=0.3.6"
-         "haskell-zlib=0.5.3.1")
+         "haskell-binary=0.5.0.2-8"
+         "haskell-digest=0.0.1.0-1"
+         "haskell-mtl=2.0.1.0-3.1"
+         "haskell-unix=2.4.2.0-2"
+         "haskell-utf8-string=0.3.6-7.2"
+         "haskell-zlib=0.5.3.1-2.1")
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
diff --git a/~fauno/ruby-mustache/PKGBUILD b/~fauno/ruby-mustache/PKGBUILD
index 7b396434c..8c8d924c1 100644
--- a/~fauno/ruby-mustache/PKGBUILD
+++ b/~fauno/ruby-mustache/PKGBUILD
@@ -1,29 +1,30 @@
 # Maintainer: David Campbell <davekong@archlinux.us>
 pkgname=ruby-mustache
 pkgver=0.99.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework-agnostic way to render logic-free views."
 arch=('any')
 url="http://github.com/defunkt/mustache"
 license=(MIT)
 depends=('ruby')
 makedepends=('rubygems')
-source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
+source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem"
+        "https://raw.github.com/defunkt/mustache/master/LICENSE")
+md5sums=('650194ec2c166feb087377647414b9dc'
+         'fbbd010314b3f1554733123ecde55a52')
 noextract=("mustache-${pkgver}.gem")
 
 build() {
   cd $srcdir
   local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
-  -n "$pkgdir/usr/bin"
+  gem install \
+      --ignore-dependencies \
+      -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
+      -n "$pkgdir/usr/bin"
 
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/LICENSE \
+  install -Dm644 $srcdir/LICENSE \
                  $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.1 \
-                 $pkgdir/usr/share/man/man1/mustache.1
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.5 \
-                 $pkgdir/usr/share/man/man5/mustache.5
+
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('650194ec2c166feb087377647414b9dc')