[arch-commits] Commit in bitlbee/trunk (PKGBUILD xinetd)

[Dave Reisner]

    Date: Monday, July 7, 2014 @ 03:27:38
  Author: dreisner
Revision: 216588

upgpkg: bitlbee 3.2.2-1

- libotr3 -> libotr
- drop unmaintained xinetd config

Modified:
  bitlbee/trunk/PKGBUILD
Deleted:
  bitlbee/trunk/xinetd

----------+
 PKGBUILD |   25 ++++++++-----------------
 xinetd   |   12 ------------
 2 files changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-07 00:06:34 UTC (rev 216587)
+++ PKGBUILD	2014-07-07 01:27:38 UTC (rev 216588)
@@ -8,26 +8,22 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=bitlbee
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+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=('asciidoc' 'libotr3')
+makedepends=('asciidoc' 'libotr')
 optdepends=('skype4py: to use skyped'
-            'libotr3: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'xinetd'
+            'libotr: for OTR encryption support')
+source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz"
         'bitlbee.tmpfiles')
-sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
+        'etc/bitlbee/motd.txt')
 install=bitlbee.install
 
 build() {
@@ -45,17 +41,12 @@
     --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
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }

Deleted: xinetd
===================================================================
--- xinetd	2014-07-07 00:06:34 UTC (rev 216587)
+++ xinetd	2014-07-07 01:27:38 UTC (rev 216588)
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}