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

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

3 files changed, 2 insertions, 49 deletions

diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index bbd4c1c58..365205720 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $
+# $Id: PKGBUILD 90671 2013-05-13 14:25:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
 pkgver=0.9.5_a
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
@@ -16,14 +16,10 @@ backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
 install=gnunet.install
 source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
-	gnunet.rc
 	gnunet.service
-	gnunet.conf.d
 	defaults.conf)
 md5sums=('b0e204cf9711f9799baaeb477992e66a'
-         '5baf691913b007fb33e365239e3f7217'
          '54cce3d2415d95b2e5bd1bd88db3a0ea'
-         'f161b46915736e4017e77ad735521453'
          '0fe23b2ca5b3fc47a0b5645e04406da0')
 
 build() {
@@ -36,8 +32,6 @@ build() {
 package() {
   cd $srcdir/gnunet-${pkgver/_/}
   make DESTDIR=$pkgdir install
-  install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd
-  install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd
   install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf
   rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/gnunet/gnunet.conf.d b/community/gnunet/gnunet.conf.d
deleted file mode 100644
index f10a322ce..000000000
--- a/community/gnunet/gnunet.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-GNUNETD_USER=nobody
diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc
deleted file mode 100644
index 30ac4d2ad..000000000
--- a/community/gnunet/gnunet.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-GNUNETD_USER=nobody
-
-. /etc/conf.d/gnunetd
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/gnunet-arm)
-case "$1" in
-    start)
-	stat_busy "Starting gnunet services"
-	[ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null &
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    add_daemon gnunetd
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping gnunet services"
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm_daemon gnunetd
-	    stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0