Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 20 insertions, 16 deletions

diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d0afe870f..74a7cbe7d 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $
+# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.3.2
+pkgver=1.8.3.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
 url="http://git-scm.com/"
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
+makedepends=('python2' 'emacs' 'libgnome-keyring')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -18,10 +18,10 @@ optdepends=('tk: gitk and git gui'
             'perl-authen-sasl: git send-email TLS support'
             'python2: various helper scripts'
             'subversion: git svn'
-            'cvsps: git cvsimport')
+            'cvsps: git cvsimport'
+            'gnome-keyring: GNOME keyring credential helper')
 replaces=('git-core')
 provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
 install=git.install
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
         "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
@@ -37,8 +37,8 @@ build() {
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
     all
 
-  cd contrib/emacs
-  make prefix=/usr
+  make -C contrib/emacs prefix=/usr
+  make -C contrib/credential/gnome-keyring
 }
 
 check() {
@@ -72,16 +72,23 @@ package() {
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
+    INSTALLDIRS=vendor DESTDIR="$pkgdir" install
 
   # bash completion
   mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
   # fancy git prompt
   mkdir -p "$pkgdir"/usr/share/git/
   install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
-  # more contrib stuff
-  cp -a ./contrib/* $pkgdir/usr/share/git/ 
+  # emacs
+  make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install
+  # gnome credentials helper
+  install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
+      "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
+  make -C contrib/credential/gnome-keyring clean
+  # the rest of the contrib stuff
+  cp -a ./contrib/* $pkgdir/usr/share/git/
+
   # scripts are for python 2.x
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
@@ -92,9 +99,6 @@ package() {
   sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \
     "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
-  # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do
@@ -111,7 +115,7 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('83b792fd06066c77e1d4911ebba2d701'
-         'f850829e1e7f32e388d2ffb61759fcc9'
+md5sums=('80eec3201a5d012913d287b85adaee8e'
+         '86fd812754d25201fd72c7476045dfec'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')