Ported dbus-0.23.4-r1.ebuild to modular X dependencies.

Package-Manager: portage-2.1_pre4-r1

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 495795c6fada11f88f82319cbf64e1853726cbd9..3d8eeaef523439a7c5b5b34fcd4db5bdcd8cb84c 100644 (file)
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.96 2006/02/16 16:59:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.97 2006/02/16 21:15:41 wolf31o2 Exp $
+
+  16 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> dbus-0.23.4-r1.ebuild:
+  Ported dbus-0.23.4-r1.ebuild to modular X dependencies.
 
   16 Feb 2006; <dang@gentoo.org> dbus-0.60-r4.ebuild:
   Marked stable on amd64

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 435b79013fc357f120a82a11f6c8c349cc6bc801..9b34072499012d8570d643af6302d10be5535513 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,9 +1,9 @@
-MD5 383e533ebef903e80a7673611d6bae74 ChangeLog 13863
-RMD160 1d3eeea9b2d505a545a7dc9770812d14d2adfa71 ChangeLog 13863
-SHA256 e01e013b8bd4a9caf0bd0ac48b17516f5510e17073bc5a96f3f0b8a5e164ccdc ChangeLog 13863
-MD5 2f46957776ab8bd83cfd271870d598da dbus-0.23.4-r1.ebuild 3587
-RMD160 01970301a038397859411f5bd87def38978dfa00 dbus-0.23.4-r1.ebuild 3587
-SHA256 48ce34c411e91bedce2d5eb540480e8ad7d4ee9375ae79c38df1a5ede1691cba dbus-0.23.4-r1.ebuild 3587
+MD5 424e0dfbf025470e5774928b159c3870 ChangeLog 14003
+RMD160 dc9898d97177411bc98483390ea4b792c782949f ChangeLog 14003
+SHA256 ba1c190afb0128ca900568d18adaa46904a3bda16f0c29a61909e97cd173d608 ChangeLog 14003
+MD5 80bd8d05a4478ae3d83d952d19e928ac dbus-0.23.4-r1.ebuild 3647
+RMD160 ca03ac02fddf891a097814dac744774d2aaa3267 dbus-0.23.4-r1.ebuild 3647
+SHA256 d08b90313aab10d5a71e7e0858e3548983cb2dfc4bd7317dfb99a57c2a0faad0 dbus-0.23.4-r1.ebuild 3647
 MD5 9cbbbd99c7ff7776f7b857effba153d2 dbus-0.50-r1.ebuild 3904
 RMD160 69a3ba30658fe9d29b0a229428d3735bd8da38bb dbus-0.50-r1.ebuild 3904
 SHA256 88f3b1c5ff29d8fc30da13c30b108a2ef4915523a43a49d6ea65b1b9cfe64763 dbus-0.50-r1.ebuild 3904

diff --git a/sys-apps/dbus/dbus-0.23.4-r1.ebuild b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
index 3916ddfbb3b72a72887af574736e3ad6bab9f494..d2681a6d7b41619910499ee9adbfb5ee320d4c14 100644 (file)
--- a/sys-apps/dbus/dbus-0.23.4-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.14 2006/01/16 09:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.15 2006/02/16 21:15:41 wolf31o2 Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib qt3
@@ -20,7 +20,12 @@ KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 RDEPEND=">=dev-libs/glib-2
        xml2? ( >=dev-libs/libxml2-2.6 )
        !xml2? ( dev-libs/expat )
-       X? ( virtual/x11 )
+       X? (
+               || (
+                       (
+                               x11-libs/libXt
+                               x11-libs/libX11 )
+                       virtual/x11 ) )
        gtk? ( >=x11-libs/gtk+-2 )
        python? ( >=dev-lang/python-2.2
                >=dev-python/pyrex-0.9 )