Fix dbus conditional dep for bug #104951.

Package-Manager: portage-1.589-cvs

diff --git a/xfce-extra/terminal/ChangeLog b/xfce-extra/terminal/ChangeLog
index 6a224ba360eda2371a8c2cd00367d79fe50612c7..c64024f6ac7792c1360fc67318d66446d051cb6c 100644 (file)
--- a/xfce-extra/terminal/ChangeLog
+++ b/xfce-extra/terminal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/terminal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.8 2005/06/12 14:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.9 2005/09/07 18:18:51 bcowan Exp $
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> terminal-0.2.4.ebuild:
+  Add dbus as conditional dep.
 
   12 Jun 2005; Sven Wegener <swegener@gentoo.org> terminal-0.2.2-r1.ebuild,
   terminal-0.2.4_pre1.ebuild, terminal-0.2.4.ebuild:

diff --git a/xfce-extra/terminal/Manifest b/xfce-extra/terminal/Manifest
index a53ed01844db3ca1c1ba322134742fb0c7a12c47..e877853f71cff9cfe7c1bee976eaa88b6cc440b1 100644 (file)
--- a/xfce-extra/terminal/Manifest
+++ b/xfce-extra/terminal/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ff824b21604d77e23d4cbc96fee8cebd terminal-0.2.4.ebuild 537
+MD5 8256c6ea395a946449f69d14a422a1a2 terminal-0.2.4.ebuild 628
 MD5 ccea9d2a721c2383abad7945bdacfab0 terminal-0.2.2-r1.ebuild 529
 MD5 2f33f0835f138986e6019840d3fad951 terminal-0.2.4_pre1.ebuild 542
-MD5 9f50304577a55d34cd69ff412dab92db ChangeLog 1314
+MD5 23e53ac784f5bfe0df53d050e7f96cb8 ChangeLog 1413
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 d70719558b669d516582f062bf02d7c9 files/digest-terminal-0.2.2-r1 67
 MD5 7ef99426867dafad5a6020ba78dfa5c2 files/digest-terminal-0.2.4 68
 MD5 ffe4301116b9b2a849aeb52d1e74fd0f files/digest-terminal-0.2.4_pre1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrEcXI1lqEGTUzyQRAmLoAJ0TwlqvIITqeG8BdLplTcKKC7QaoACeNBSq
-WlB8fkdLzrNhDKNV87wDEeA=
-=h1D3
------END PGP SIGNATURE-----

diff --git a/xfce-extra/terminal/terminal-0.2.4.ebuild b/xfce-extra/terminal/terminal-0.2.4.ebuild
index 4f448256f634e42d89c8f8c1d273059c8a3504cb..f15e719e753648e6357d46419bae663243e4a6e6 100644 (file)
--- a/xfce-extra/terminal/terminal-0.2.4.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4.ebuild
@@ -1,17 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.2 2005/06/12 14:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.3 2005/09/07 18:18:51 bcowan Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
+IUSE="dbus"
+
 RDEPEND=">=x11-libs/gtk+-2.4
        >=xfce-extra/exo-0.3.0_pre1
+       dbus? ( =sys-apps/dbus )
        >=x11-libs/vte-0.11.11
        >=xfce-base/libxfce4mcs-4.2.0"
+
 MY_P="${PN/t/T}-${PV/_/}"
 BZIPPED=1
 GOODIES=1
 
-inherit xfce4
+if ! use dbus; then
+       XFCE_CONFIG="--disable-dbus"
+fi
+
+inherit xfce4
\ No newline at end of file