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

Conflicts:
	community/collectd/PKGBUILD
	community/drivel/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnomesu/PKGBUILD
	community/gnuchess/PKGBUILD
	community/gphpedit/PKGBUILD
	community/gsql/PKGBUILD
	community/libmatchbox/PKGBUILD
	community/lockfile-progs/PKGBUILD
	community/opencc/PKGBUILD
	community/roxterm/PKGBUILD
	community/uriparser/PKGBUILD
	community/xcircuit/PKGBUILD
	core/bison/PKGBUILD
	core/curl/PKGBUILD
	core/expat/PKGBUILD
	core/gcc/PKGBUILD
	core/gpm/PKGBUILD
	core/m4/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	extra/alsa-lib/PKGBUILD
	extra/alsa-utils/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream/PKGBUILD
	extra/freeglut/PKGBUILD
	extra/gob2/PKGBUILD
	extra/libcdio-paranoia/PKGBUILD
	extra/liblqr/PKGBUILD
	extra/libnl1/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libwpd/PKGBUILD
	extra/xorg-server/PKGBUILD

2 files changed, 4 insertions, 56 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 5cf70124a..8d3a91031 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $
+# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -9,22 +9,20 @@
 
 pkgname=bitlbee
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('openssl' 'glib2')
+depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
         'xinetd'
-        'rc.d'
         'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '02423c500ac64f673ba26a3395c7c7036c17343e'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt'
@@ -40,7 +38,7 @@ build() {
     --pidfile=/run/bitlbee/bitlbee.pid \
     --ipcsocket=/run/bitlbee/bitlbee.sock \
     --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=openssl \
+    --ssl=gnutls \
     --strip=0 \
     --otr=plugin
 
@@ -56,6 +54,5 @@ package() {
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
   install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d
deleted file mode 100644
index ade85221a..000000000
--- a/extra/bitlbee/rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting bitlbee daemon"
-    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-      stat_fail
-      exit 1
-    else
-      add_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitlbee daemon"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-      exit 1
-    else
-      rm -f "$pidfile"
-      rm_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-    ;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2: