From d8837f8e8ef49099c8c250a8e0620acd746f0aec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 20 Feb 2014 11:47:30 +0100
Subject: [PATCH] Update bitlbee-bzr

---
 .SRCINFO |  6 +++---
 PKGBUILD | 10 +++-------
 rc.d     | 40 ----------------------------------------
 3 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 rc.d

diff --git a/.SRCINFO b/.SRCINFO
index 61345ca13708..71dd91f19fc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitlbee-bzr
 	pkgdesc = Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC
-	pkgver = 996
+	pkgver = 1005
 	pkgrel = 1
 	url = http://www.bitlbee.org/
 	install = bitlbee.install
@@ -10,13 +10,13 @@ pkgbase = bitlbee-bzr
 	checkdepends = check
 	makedepends = bzr
 	makedepends = asciidoc
-	makedepends = libotr3
+	makedepends = libotr
 	makedepends = xmlto
 	makedepends = lynx
 	depends = gnutls
 	depends = glib2
 	optdepends = skype4py: to use skyped
-	optdepends = libotr3: for OTR encryption support
+	optdepends = libotr: for OTR encryption support
 	optdepends = xinetd: to run bitlbee through xinetd
 	provides = bitlbee
 	conflicts = bitlbee
diff --git a/PKGBUILD b/PKGBUILD
index abd05f36ff81..1e7ebafd26ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,17 @@
 # Maintainer: Florian Bruhin (The-Compiler) <archlinux.org@the-compiler.org>
 
 pkgname=bitlbee-bzr
-pkgver=996
+pkgver=1005
 pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('gnutls' 'glib2')
-makedepends=('bzr' 'asciidoc' 'libotr3' 'xmlto' 'lynx')
+makedepends=('bzr' 'asciidoc' 'libotr' 'xmlto' 'lynx')
 checkdepends=('check')
 optdepends=('skype4py: to use skyped'
-            'libotr3: for OTR encryption support'
+            'libotr: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=('bitlbee::bzr+http://code.bitlbee.org/bitlbee/'
         'xinetd'
@@ -50,10 +50,6 @@ build() {
     --otr=plugin \
     --skype=plugin
 
-  # hacky: build against libotr3
-  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
-  sed -i 's,#include.*libotr,&3,' otr.h
-
   make
 }
 
diff --git a/rc.d b/rc.d
deleted file mode 100644
index bd9248173f47..000000000000
--- a/rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=bitlbee
-PID=$(pidof -o %PPID /usr/sbin/bitlbee)
-install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && {
-		rm -f /var/run/bitlbee/bitlbee.pid
-		su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee
-	} && {
-		add_daemon $name
-		stat_done
-	} || { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && {
-		kill $PID &>/dev/null
-	} && {
-		rm -f /var/run/bitlbee/bitlbee.pid
-		rm_daemon $name
-		stat_done
-	} || { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac