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

Conflicts:
	community/aspell-pl/PKGBUILD
	community/gloox/PKGBUILD
	community/libircclient/PKGBUILD
	community/mashup/PKGBUILD
	community/omniorb/PKGBUILD
	community/openbox/PKGBUILD
	community/patchutils/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt5/PKGBUILD
	extra/samba/PKGBUILD
	extra/tdb/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vim/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

4 files changed, 8 insertions, 28 deletions

diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index b01553131..d0a44ffc3 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $
+# $Id: PKGBUILD 189680 2013-07-04 14:55:33Z tomegun $
+# Maintainer : Tom Gundersen <teg@jklm.no>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.77
-pkgrel=3
+pkgver=2.80
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
-        transmission.systemd
-        transmission.tmpfiles)
-md5sums=('60c0e77a1852656215f7102a437b2a3d'
-         '5c289c8901221a94be74665368ab5c2c'
-         '23f2320361ad54373c3a4551ef634fe8')
+source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz)
+md5sums=('2bde600d4b0a75d0bd3784550d59a8af')
 
 build() {
   cd $pkgbase-$pkgver
@@ -27,7 +24,7 @@ build() {
 }
 package_transmission-cli() {
   pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
-  depends=('curl' 'libevent')
+  depends=('curl' 'libevent' 'systemd')
   install=transmission-cli.install
 
   cd $pkgbase-$pkgver
@@ -37,8 +34,7 @@ package_transmission-cli() {
       make -C "$dir" DESTDIR="$pkgdir" install
   done
 
-  install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
-  install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service"
+  install -D -m644 "$srcdir/transmission-$pkgver/daemon/transmission-daemon.service" "$pkgdir/usr/lib/systemd/system/transmission.service"
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
 }
 
diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install
index b0832042c..1af0f87e8 100644
--- a/extra/transmission/transmission-cli.install
+++ b/extra/transmission/transmission-cli.install
@@ -7,5 +7,4 @@ post_upgrade() {
        # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
        getent group transmission >/dev/null || groupadd -g 169 transmission
        getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission
-       systemd-tmpfiles --create transmission.conf
 }
diff --git a/extra/transmission/transmission.systemd b/extra/transmission/transmission.systemd
deleted file mode 100644
index 56ab8f794..000000000
--- a/extra/transmission/transmission.systemd
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Transmission Bit Torrent Daemon
-
-# This assumes that a user 'transmission' exists, with a writeable homedirectory,
-# and that /run/transmission exists and is writeable by the transmission user.
-
-[Service]
-User=transmission
-Type=forking
-PIDFile=/run/transmission/transmission.pid
-ExecStart=/usr/bin/transmission-daemon --pid-file /run/transmission/transmission.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/transmission/transmission.tmpfiles b/extra/transmission/transmission.tmpfiles
deleted file mode 100644
index b603066c1..000000000
--- a/extra/transmission/transmission.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/transmission - transmission transmission -