fix deps for dbus 1.0

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/x11-terms/roxterm/ChangeLog b/x11-terms/roxterm/ChangeLog
index 686aff07839f7a1a8ea357007219a2a430345de9..a3f10697a377d0f4d28bb09a805836aeaa0e637a 100644 (file)
--- a/x11-terms/roxterm/ChangeLog
+++ b/x11-terms/roxterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/roxterm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.3 2006/09/17 16:21:03 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.4 2006/11/17 09:01:46 compnerd Exp $
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> roxterm-1.2.3.ebuild:
+  Fix deps for dbus 1.0
 
   17 Sep 2006; Jason Huebel <jhuebel@gentoo.org> roxterm-1.2.3.ebuild:
   ~amd64, bug #147954

diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index cf24f272f5dffd15e3a740a0046d84c41bfd85df..9db213799f637b6101b82fd465ab982d878e7c11 100644 (file)
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -7,14 +7,14 @@ MD5 d82a90ec60230a415ed6715e7e7adcdf files/roxterm-1.2.3-new-button.patch 788
 RMD160 6b5af45408fd6e718f517d1d82448a4fc83de04b files/roxterm-1.2.3-new-button.patch 788
 SHA256 c9894361d16f8dd6eb7591c6d7fa8dac9226017216db2a53cd1e4c71362e9e78 files/roxterm-1.2.3-new-button.patch 788
 DIST roxterm-1.2.3.tar.gz 458009 RMD160 849e6ab82c81ef8c1e955ab414bcc5b9c162f1ee SHA1 904a239f2c2d3353a80fe012f50e3329d135f88c SHA256 6249853acd2a3b3448b4408e763fcd2f3f5a6384b0e1e6ad4763eb0b6fde5349
-EBUILD roxterm-1.2.3.ebuild 950 RMD160 fbfa0f3e227e18ba713b173e9550f939de7643d3 SHA1 beee301e9f759e7eff599e84f1fed06d607db35e SHA256 b4be4a373df4d426eff94832ee57a15579785e82f8bd7aaee0999a10690296e8
-MD5 20094e08c1b445442e3fa2198011c38a roxterm-1.2.3.ebuild 950
-RMD160 fbfa0f3e227e18ba713b173e9550f939de7643d3 roxterm-1.2.3.ebuild 950
-SHA256 b4be4a373df4d426eff94832ee57a15579785e82f8bd7aaee0999a10690296e8 roxterm-1.2.3.ebuild 950
-MISC ChangeLog 635 RMD160 eb0129754b2158bf6ef8b62fe4f3714d29462a9d SHA1 52c22b4a32453bc49835374e3065975490e1bb16 SHA256 a417cf0b8d60a49c8abb2a35becc199e725efb232ec3446d2334ba41e411d7b3
-MD5 c155b119af2e7fc8eb6542ec2c38bfa7 ChangeLog 635
-RMD160 eb0129754b2158bf6ef8b62fe4f3714d29462a9d ChangeLog 635
-SHA256 a417cf0b8d60a49c8abb2a35becc199e725efb232ec3446d2334ba41e411d7b3 ChangeLog 635
+EBUILD roxterm-1.2.3.ebuild 1019 RMD160 3c556719852d5161805977443165f739e114a590 SHA1 34f47611bd4d7aa5be89bc216c552036d3810324 SHA256 7baefc56fc5c7fa709f422536ebf34d560f60b7ef87165718cea0ac38772db50
+MD5 4b0f0ffe88483d00a4ee6e1d2903ea27 roxterm-1.2.3.ebuild 1019
+RMD160 3c556719852d5161805977443165f739e114a590 roxterm-1.2.3.ebuild 1019
+SHA256 7baefc56fc5c7fa709f422536ebf34d560f60b7ef87165718cea0ac38772db50 roxterm-1.2.3.ebuild 1019
+MISC ChangeLog 739 RMD160 753a2f976b47923f8400f0c297b2d1d1567910b2 SHA1 e42718cb39545b7b079405fb696b7e6ab52ec983 SHA256 44098cbcc95d270f6bd8deb435be7d935a6f588d92499b484a9c9a9d37683190
+MD5 28a8226f7fb3a4887716f1c3003dac91 ChangeLog 739
+RMD160 753a2f976b47923f8400f0c297b2d1d1567910b2 ChangeLog 739
+SHA256 44098cbcc95d270f6bd8deb435be7d935a6f588d92499b484a9c9a9d37683190 ChangeLog 739
 MISC metadata.xml 304 RMD160 6c356cf2024baa36b7462ea705b7e2b6603d906c SHA1 9ec84f45bb762392c1e05e62745a3f9e5e3f2671 SHA256 33f6aac6054f2a663a6349e206078025c47ad599ea45fabcde0a3a327a64d0d2
 MD5 7058c3aae72cb72453f67a1d1f41d0a6 metadata.xml 304
 RMD160 6c356cf2024baa36b7462ea705b7e2b6603d906c metadata.xml 304

diff --git a/x11-terms/roxterm/roxterm-1.2.3.ebuild b/x11-terms/roxterm/roxterm-1.2.3.ebuild
index cba03e26283166fc57971d1f4c6a067a3f3be12d..bfaa0097ea99e183392a9685d583ad86f1692ddc 100644 (file)
--- a/x11-terms/roxterm/roxterm-1.2.3.ebuild
+++ b/x11-terms/roxterm/roxterm-1.2.3.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/x11-terms/roxterm/roxterm-1.2.3.ebuild,v 1.3 2006/09/17 16:21:03 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-1.2.3.ebuild,v 1.4 2006/11/17 09:01:46 compnerd Exp $
 
 inherit eutils
 
@@ -15,7 +15,10 @@ IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.6
                 >=x11-libs/gtk+-2.6
-                >=sys-apps/dbus-0.35
+                || (
+                               >=dev-libs/dbus-glib-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+                       )
                 >=x11-libs/vte-0.11.11
                 >=gnome-base/libglade-2"
 DEPEND="${RDEPEND}