summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Klimaszewski <steev@gentoo.org>2008-02-07 00:56:52 +0000
committerStephen Klimaszewski <steev@gentoo.org>2008-02-07 00:56:52 +0000
commit88b66668b3f14ce7f425b96c5aa95faba7263a49 (patch)
treead041483479d403d6bbb5668c947f0fd30c26a15 /sys-apps/dbus
parentkde-base/poxml removed permanently. It was accidentally committed during the ... (diff)
downloadgentoo-2-88b66668b3f14ce7f425b96c5aa95faba7263a49.tar.gz
gentoo-2-88b66668b3f14ce7f425b96c5aa95faba7263a49.tar.bz2
gentoo-2-88b66668b3f14ce7f425b96c5aa95faba7263a49.zip
Only patch if we are building with use X, the patch causes an error when built without X. Fixes bug #209175. Thanks to Nikolay S. Rybaloff for reporting.
(Portage version: 2.1.4.1)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog7
-rw-r--r--sys-apps/dbus/dbus-1.1.4.ebuild6
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index c0ccfa244566..855b1e962d72 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/dbus
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.207 2008/02/06 00:26:11 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.208 2008/02/07 00:56:52 steev Exp $
+
+ 07 Feb 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.1.4.ebuild:
+ Only patch if we are building with use X, the patch causes an error when
+ built without X. Fixes bug #209175. Thanks to Nikolay S. Rybaloff for
+ reporting.
06 Feb 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.0.2-r2.ebuild,
dbus-1.1.4.ebuild:
diff --git a/sys-apps/dbus/dbus-1.1.4.ebuild b/sys-apps/dbus/dbus-1.1.4.ebuild
index 344934016716..77e6771e7d2e 100644
--- a/sys-apps/dbus/dbus-1.1.4.ebuild
+++ b/sys-apps/dbus/dbus-1.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.4 2008/02/06 00:26:11 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.5 2008/02/07 00:56:52 steev Exp $
inherit eutils multilib autotools flag-o-matic
@@ -27,7 +27,9 @@ src_unpack() {
unpack ${A}
cd "${S}"
# Patch that *should* fix dbus-launch hanging around after exiting X
- epatch "${FILESDIR}/${PN}-1.1.4-xdisplay_null.patch"
+ if use X ; then
+ epatch "${FILESDIR}/${PN}-1.1.4-xdisplay_null.patch"
+ fi
}
src_compile() {