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

Conflicts:
	community/midori/PKGBUILD
	extra/libffado/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	testing/util-linux/PKGBUILD

6 files changed, 299 insertions, 0 deletions

diff --git a/social/aiccu/PKGBUILD b/social/aiccu/PKGBUILD
new file mode 100644
index 000000000..5fc4cb086
--- /dev/null
+++ b/social/aiccu/PKGBUILD
@@ -0,0 +1,33 @@
+pkgname=aiccu
+pkgver=20070115
+pkgrel=7
+pkgdesc="SixXS Automatic IPv6 Connectivity Client Utility - AICCU"
+arch=('i686' 'x86_64')
+url="http://www.sixxs.net/tools/aiccu/"
+license=('BSD')
+depends=('gnutls' 'iproute2')
+makedepends=('glibc' 'libgpg-error' 'libtasn1' 'libgcrypt' 'zlib')
+backup=(etc/aiccu.conf)
+source=(http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz
+        aiccu.rc.d)
+md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
+         '9eb63ae132d4835a822ea925c6440b04')
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  sed -i 's|Installing Debian-style init.d||' Makefile
+
+  LDFLAGS="" make
+  make DESTDIR="$pkgdir" install
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  install -D -m600 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+  install -D -m755 "$srcdir/aiccu.rc.d" "$pkgdir/etc/rc.d/aiccu"
+  install -D -m444 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  rm -fr "$pkgdir/etc/init.d"
+}
diff --git a/social/aiccu/aiccu.rc.d b/social/aiccu/aiccu.rc.d
new file mode 100644
index 000000000..b0ca08fce
--- /dev/null
+++ b/social/aiccu/aiccu.rc.d
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+daemon_name=aiccu
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof $daemon_name
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=`get_pid`
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name start > /dev/null
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo `get_pid` > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=`get_pid`
+    # RUN
+    $daemon_name stop
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
new file mode 100644
index 000000000..98e64982d
--- /dev/null
+++ b/social/netatalk/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: SJ_UnderWater
+# Maintainer (Parabola): fauno@parabola.nu
+# Based on netatalk package :
+# Maintainer: Dominik Dingel <mail at wodar dot de>
+# Contributor: William Udovich <nerdzrule7 at earthlink dot net>
+# Contributor: Farhan Yousaf <farhany at xaviya dot com>
+
+pkgname=netatalk
+pkgver=3.0
+pkgrel=4
+pkgdesc='Open Source AFP fileserver'
+arch=('i686' 'x86_64')
+url='http://netatalk.sourceforge.net'
+license=('GPL')
+depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent')
+backup=('etc/afp.conf')
+options=('!libtool')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
+	'62eb034011bb60b0bfd95072af3693dc')
+
+build() {
+	cd $pkgname-$pkgver
+
+# TODO what does this fix?
+	msg2 'Fixing...'
+	sed -i 's/x"linux/x"generic/' macros/netatalk.m4
+
+	autoreconf
+
+# disable bundled libevent
+	echo -e "all:\ninstall:" >libevent/Makefile
+
+	CFLAGS="-Wno-unused-result" \
+    LIBS=-levent \
+    ./configure --prefix=/usr \
+                --disable-static \
+                --localstatedir=/etc \
+                --sysconfdir=/etc \
+        		--disable-bundled-libevent \
+                --with-cracklib \
+                --with-cnid-cdb-backend \
+                --enable-pgp-uam \
+                --with-init-style=systemd
+
+	make 
+}
+package() {
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+
+	msg2 'Copying initscripts...'
+	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
+}
diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog
new file mode 100644
index 000000000..b577562d4
--- /dev/null
+++ b/social/netatalk/netatalk.changelog
@@ -0,0 +1,83 @@
+2012-07-14 SJ_UnderWater
+
+	* 3.0-3 :
+	moved localstate dir
+	to /etc for historical
+	reasons
+
+2012-07-12 SJ_UnderWater
+
+	* 3.0-2 :
+	disable bundled libevent
+
+2012-07-11 SJ_UnderWater
+
+	* 3.0-1 :
+	updated to new release
+	DDP moved to new pkg
+
+2012-06-12 SJ_UnderWater
+
+	* 2.2.3-4 :
+	added kill timing
+
+2012-06-04 SJ_UnderWater
+
+	* 2.2.3-3 :
+	removed conflicting files
+
+2012-06-02 SJ_UnderWater
+
+	* 2.2.3-2 :
+	Missing UAM links
+
+2012-05-29 SJ_UnderWater
+
+	* 2.2.3-1 :
+	updated package version
+	allowing headers and m4
+
+2012-05-01 SJ_UnderWater
+
+	* 2.2.2-6 :
+	moved to .rc files
+	refactored PKGBUILD
+	install rc.d files
+
+2012-04-25 SJ_UnderWater
+
+	* 2.2.2-5 :
+	init rebuild
+	fix dep check
+	fix get_pid
+	function relocation
+
+2012-04-21 SJ_UnderWater
+
+	* 2.2.2-4 :
+	moved to package()
+	added backup
+	split backup
+	moved depends
+
+2012-04-08 SJ_UnderWater
+
+	* 2.2.2-3 :
+	fixed extra dependencies
+	FHS compliance
+	NAMCAP checking
+	moved cups to optdepends
+
+2012-04-07 SJ_UnderWater
+
+	* 2.2.2-2 :
+	added Install
+	changed "conflicts" with "replace"
+	cleaned up PKGBUILD
+
+	* 2.2.2-1 :
+	added ChangeLog.
+	moved to split package format
+	bidirectional dependency-checking
+	moved to release package format
+	PKGBUILD compliance
diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install
new file mode 100644
index 000000000..a385add10
--- /dev/null
+++ b/social/netatalk/netatalk.install
@@ -0,0 +1,23 @@
+post_install() {
+	post_upgrade
+}
+post_upgrade() {
+	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	echo '>>> Detected old netatalk daemon entries in';
+	echo '>>> /etc/rc.conf, please replace these with';
+	echo '>>> "netatalk" before restarting!';
+	else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
+	echo '>>>';
+	if [ -f /etc/avahi/services/adisk.service ] ||
+	[ -f /etc/avahi/services/afpd.service ];then
+	echo '>>> Detected old netatalk service files in';
+	echo '>>> /etc/avahi/services, please delete these';
+	echo '>>> before restarting!';fi
+	if [ -f /opt/netatalk/afp_signature.conf ] ||
+	[ -f /opt/netatalk/afp_voluuid.conf ]; then
+	echo '>>> Found *.conf in /opt/netatalk, please';
+	echo '>>> migrate these to /etc/netatalk before restarting';fi
+}
+pre_remove() {
+	rc.d stop netatalk
+}
diff --git a/social/netatalk/netatalk.rc b/social/netatalk/netatalk.rc
new file mode 100644
index 000000000..f14d67ee3
--- /dev/null
+++ b/social/netatalk/netatalk.rc
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+NAME="Appletalk Services Daemon"
+ARGS=
+DAEMON=netatalk
+
+[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
+
+PID=`get_pid $DAEMON`
+
+case "$1" in
+ start)
+   stat_busy "Starting $NAME"
+   [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
+   if [ $? = 0 ]; then
+     add_daemon $DAEMON
+     stat_done
+   else
+     stat_fail
+     exit 1
+   fi
+   ;;
+ stop)
+   stat_busy "Stopping $NAME"
+   [ -n "$PID" ] && kill $PID &>/dev/null
+   if [ $? = 0 ]; then
+     rm_daemon $DAEMON
+     stat_done
+   else
+     stat_fail
+     exit 1
+   fi
+   ;;
+ restart)
+   $0 stop
+   sleep 1
+   $0 start
+   ;;
+ *)
+   echo "usage: $0 {start|stop|restart}"  
+esac