From 3fe9553ab50a9495efb0dc631ab7fb10ea28f426 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 12 Feb 2013 10:26:37 +0100
Subject: [PATCH] dbus: disable --enable-systemd; avoids cyclic dependencies.

---
 srcpkgs/dbus/dbus-devel.template |  6 +-----
 srcpkgs/dbus/dbus-libs.template  |  5 +----
 srcpkgs/dbus/dbus-x11.template   |  6 +-----
 srcpkgs/dbus/template            | 14 ++------------
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/dbus/dbus-devel.template b/srcpkgs/dbus/dbus-devel.template
index f882b6bd839..0fc6d9ba2f4 100644
--- a/srcpkgs/dbus/dbus-devel.template
+++ b/srcpkgs/dbus/dbus-devel.template
@@ -1,11 +1,7 @@
 # Template file for 'dbus-devel'.
 #
 depends="expat-devel dbus-libs>=${version}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
+short_desc="${short_desc} -- development files"
 noarch=yes
 
 do_install() {
diff --git a/srcpkgs/dbus/dbus-libs.template b/srcpkgs/dbus/dbus-libs.template
index 907ffdbb158..3cbe22bcda9 100644
--- a/srcpkgs/dbus/dbus-libs.template
+++ b/srcpkgs/dbus/dbus-libs.template
@@ -1,9 +1,6 @@
 # Template file for 'dbus-libs'.
 #
-short_desc="${short_desc} (shared libraries)"
-long_desc="${long_desc}
-
- This package contains the shared libraries."
+short_desc="${short_desc} -- shared libraries"
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
index f4920c6dd63..8221a87e1f9 100644
--- a/srcpkgs/dbus/dbus-x11.template
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -1,11 +1,7 @@
 # Template file for 'dbus-x11'.
 #
 replaces="dbus<1.4.16_2"
-short_desc="${short_desc} (X11 support)"
-long_desc="${long_desc}
-
- This package contains the dbus-launch utility which is necessary for
- packages using a D-Bus session bus."
+short_desc="${short_desc} -- X11 support"
 
 do_install() {
 	vmove usr/bin/dbus-launch usr/bin
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index d50e170f140..e874dd5544d 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.6.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
  --disable-dnotify --enable-inotify --with-dbus-user=dbus --disable-tests
@@ -9,7 +9,7 @@ configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
  --disable-asserts --with-system-socket=/run/dbus/system_bus_socket
  --with-system-pid-file=/run/dbus/pid --with-console-auth-dir=/run/console/
  --with-systemdsystemunitdir=/usr/lib/systemd/system"
-makedepends="pkg-config expat-devel libX11-devel systemd-devel"
+makedepends="pkg-config expat-devel libX11-devel"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 subpackages="dbus-devel dbus-libs dbus-x11"
 system_accounts="dbus"
@@ -19,13 +19,3 @@ license="GPL-2"
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/dbus-${version}.tar.gz"
 checksum=fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac
-long_desc="
- D-BUS is a message bus, used for sending messages between applications.
- Conceptually, it fits somewhere in between raw sockets and CORBA in terms
- of complexity.
-
- D-BUS supports broadcast messages, asynchronous messages (thus decreasing
- latency), authentication, and more.  It is designed to be low-overhead;
- messages are sent using a binary protocol, not using XML.  D-BUS also
- supports a method call mapping for its messages, but it is not required;
- this makes using the system quite simple."