From 749567058aa20e47c43541466b89b86623742873 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 2 May 2014 01:26:44 +0000 Subject: Manually specify dbus paths to avoid using dbus-1.pc, bug 500282 by Benedikt Böhm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) --- sys-apps/systemd/ChangeLog | 7 ++++++- sys-apps/systemd/systemd-212-r2.ebuild | 8 +++++++- sys-apps/systemd/systemd-9999.ebuild | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) (limited to 'sys-apps') diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 6c03a0086833..ccd6d9f9151f 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.248 2014/04/19 01:04:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.249 2014/05/02 01:26:44 floppym Exp $ + + 02 May 2014; Mike Gilbert systemd-212-r2.ebuild, + systemd-9999.ebuild: + Manually specify dbus paths to avoid using dbus-1.pc, bug 500282 by Benedikt + Böhm. 19 Apr 2014; Mike Gilbert -systemd-212-r1.ebuild, -systemd-212.ebuild, systemd-212-r2.ebuild, systemd-9999.ebuild: diff --git a/sys-apps/systemd/systemd-212-r2.ebuild b/sys-apps/systemd/systemd-212-r2.ebuild index 74a439224296..e57236e99b6c 100644 --- a/sys-apps/systemd/systemd-212-r2.ebuild +++ b/sys-apps/systemd/systemd-212-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild,v 1.2 2014/04/19 01:04:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild,v 1.3 2014/05/02 01:26:44 floppym Exp $ EAPI=5 @@ -190,6 +190,12 @@ multilib_src_configure() { # hardcode a few paths to spare some deps QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck + + # dbus paths + --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/systemd.d" + --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" + --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" + --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" ) # Keep using the one where the rules were installed. diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index ea9479455d55..e24daebed9df 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.104 2014/04/19 01:04:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.105 2014/05/02 01:26:44 floppym Exp $ EAPI=5 @@ -212,6 +212,12 @@ multilib_src_configure() { # hardcode a few paths to spare some deps QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck + + # dbus paths + --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/systemd.d" + --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" + --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" + --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" ) # Keep using the one where the rules were installed. -- cgit v1.2.3-65-gdbad