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
commit4ba2c15b4cb0989d157e9688009335a40d5d5530 (patch)
tree04baf030aed882e21cf97ec320eab25942178134 /sys-apps/dbus
parentkde-base/poxml removed permanently. It was accidentally committed during the ... (diff)
downloadhistorical-4ba2c15b4cb0989d157e9688009335a40d5d5530.tar.gz
historical-4ba2c15b4cb0989d157e9688009335a40d5d5530.tar.bz2
historical-4ba2c15b4cb0989d157e9688009335a40d5d5530.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.
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog7
-rw-r--r--sys-apps/dbus/Manifest4
-rw-r--r--sys-apps/dbus/dbus-1.1.4.ebuild6
3 files changed, 12 insertions, 5 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/Manifest b/sys-apps/dbus/Manifest
index 64125269eb06..b91fe2a3ae6c 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,6 +5,6 @@ AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e
DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
EBUILD dbus-1.0.2-r2.ebuild 3406 RMD160 2bc007e091ca12b57248ccb34677d001e7ca3a77 SHA1 bf45ae458276a3ae23551cb4531d8b3c3af81fc9 SHA256 627893aedf081dfef8562bdd48302e1eae7c532c508310cd887c0e197639bef7
-EBUILD dbus-1.1.4.ebuild 3455 RMD160 a55430567890a4a2cc15fc9afa50600734dad805 SHA1 a96f6dc6eda3ea8aef18139a17c42742b44038ca SHA256 73066f997fe8fac61487ed9ba56a55b631537aad6d66c59e6593500ede0c17fe
-MISC ChangeLog 31243 RMD160 6793148eaf859fcb0251a44c712f46a66dfec990 SHA1 642e8619a7a4e03243eec63bd48bdd63d2adab58 SHA256 6fcbf2ebc9857b07b5734245f6c6a916a3ba9a0735ab278797c8cdaee69bb344
+EBUILD dbus-1.1.4.ebuild 3478 RMD160 e3bb96a26c994d5d8283cb01ff7a17df5b3b04ea SHA1 43d155fed688cd5284fd1a90ca85519a651c74c1 SHA256 a52ffc14cc29d5e43325c5fe84c59711bb1e99ed014bf59d629f7823eb5a03a2
+MISC ChangeLog 31476 RMD160 00a913c44acb5520ae03672de443a10a4825dcba SHA1 b715795f5b522b1c4a02be7f8654a6996e46c528 SHA256 2030071fc50a84126b0826acd63f2f75b2f8cff2eccfaae50e887002d34c1c2b
MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
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() {