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

Conflicts:
	community/cantata/PKGBUILD
	community/gpsmanshp/PKGBUILD
	community/pigz/PKGBUILD
	extra/calligra/PKGBUILD
	extra/genius/PKGBUILD
	extra/gnumeric/PKGBUILD
	extra/goffice/PKGBUILD
	extra/graphicsmagick/PKGBUILD
	extra/libgphoto2/PKGBUILD
	extra/python-numpy/PKGBUILD

10 files changed, 9 insertions, 170 deletions

diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 5781cada3..57f8974d3 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 177822 2013-02-09 16:57:36Z dreisner $
+# $Id: PKGBUILD 179927 2013-03-12 12:59:52Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.6.4
-pkgrel=2
+pkgver=5.6.7
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 groups=('base')
 depends=('glibc' 'sh')
+provides=('dhcp-client')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
         'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('18a09d8fabf926e5d32bd6315b40d77247b11596'
+sha1sums=('2f9f2f432e43181497c4909725e29239c9ff004a'
           'b67b9ce6a2faaca75fea356966a16be2283b7db0'
           '6245b8db7e6f39a0305571726bb693a53901c400'
           'e49e01041f831281a1cd0c97ca21204e0aa07fda')
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 486f85ae0..e76d9c5d3 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177775 2013-02-08 11:19:11Z stephane $
+# $Id: PKGBUILD 179909 2013-03-11 19:50:37Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
-pkgver=1.11
-pkgrel=3
+pkgver=1.11.1
+pkgrel=1
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
@@ -21,7 +21,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si
         krb5-kpropd.service
         krb5-kpropd@.service
         krb5-kpropd.socket)
-sha1sums=('dcdc305bd2b63cf8b8cb698cb9ea28f0a6282136'
+sha1sums=('e2e759c35e775d8f03b75c26ffcaa4f2514147f5'
           '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
diff --git a/core/krb5/krb5-kadmind b/core/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/core/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Admin Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kadmind
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Admin Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service
deleted file mode 100644
index f3836c898..000000000
--- a/core/krb5/krb5-kadmind.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 administration server
-
-[Service]
-ExecStart=/usr/sbin/kadmind -nofork
-
-[Install]
-WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kdc b/core/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/core/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Authentication"
-        if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Authentication"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service
deleted file mode 100644
index 6ec93bb72..000000000
--- a/core/krb5/krb5-kdc.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 KDC
-
-[Service]
-ExecStart=/usr/sbin/krb5kdc -n
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd
deleted file mode 100644
index a0077d68e..000000000
--- a/core/krb5/krb5-kpropd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpropd`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Database Propagation Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kpropd -S
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kpropd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Database Propagation Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kpropd
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service
deleted file mode 100644
index a7c5b579d..000000000
--- a/core/krb5/krb5-kpropd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Service]
-ExecStart=/usr/sbin/kpropd -S
-
-[Install]
-WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket
deleted file mode 100644
index 4389290c0..000000000
--- a/core/krb5/krb5-kpropd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Socket]
-ListenStream=754
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service
deleted file mode 100644
index 46f7e3639..000000000
--- a/core/krb5/krb5-kpropd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-Conflicts=krb5-kpropd.service
-
-[Service]
-ExecStart=/usr/sbin/kpropd
-StandardInput=socket
-StandardError=syslog