Fix GTK+ dependency as per bug #119415

(Portage version: 2.1_pre3-r1)

5 files changed, 15 insertions, 21 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index f558631a636f..010ef56dbb53 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.85 2006/01/06 08:31:24 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.86 2006/01/19 20:40:35 compnerd Exp $
+
+  19 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org> dbus-0.50-r1.ebuild,
+  dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild:
+  Fix GTK+ dependencies as per bug #119415
 
   06 Jan 2006; Chris PeBenito <pebenito@gentoo.org> dbus-0.60-r3.ebuild:
   Add explicit handling of SELinux support.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 7ab7787155d2..8aa0c0c538b7 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d61a52915ffc61a0c891eb5465173799 ChangeLog 12614
 MD5 2f46957776ab8bd83cfd271870d598da dbus-0.23.4-r1.ebuild 3587
-MD5 eaaed2cd9d845468bff2f444d0a4f4c7 dbus-0.50-r1.ebuild 3900
-MD5 da1f078c3ef62452c0d8ec34581d3da3 dbus-0.50-r2.ebuild 4338
-MD5 2c74b4243ede4d93a8acaa8c17add16d dbus-0.60-r3.ebuild 4421
+MD5 fd9d4344a0a40808e61973f90fb4f151 dbus-0.50-r1.ebuild 3902
+MD5 fc712bc3a6bd549c492785ffce058f01 dbus-0.50-r2.ebuild 4338
+MD5 601d9898bb263693f703b6a8b0146222 dbus-0.60-r3.ebuild 4421
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
 MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
@@ -26,10 +23,3 @@ MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r2 62
 MD5 d1d5323f6bb155eef5cf44b19078aa07 files/digest-dbus-0.60-r3 62
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDy2gZ2+ySkm8kpY0RAqteAJ9DQlkCpUyIQwDGgIMtKIYy5iYvagCdEFrx
-IVdK0alDfQkknNIPxTB4Isg=
-=D3Ab
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.50-r1.ebuild b/sys-apps/dbus/dbus-0.50-r1.ebuild
index 1ae44230cc01..f6004898dad3 100644
--- a/sys-apps/dbus/dbus-0.50-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.50-r1.ebuild,v 1.4 2005/12/17 13:07:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.5 2006/01/19 20:40:35 compnerd Exp $
 
 inherit eutils mono python multilib autotools debug qt3
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		x11-libs/libX11
 		)
 	virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2 )
+	gtk? ( >=x11-libs/gtk+-2.6 )
 	python? ( >=dev-lang/python-2.4
 		>=dev-python/pyrex-0.9.3-r2 )
 	qt? ( $(qt_min_version 3.3) )
diff --git a/sys-apps/dbus/dbus-0.50-r2.ebuild b/sys-apps/dbus/dbus-0.50-r2.ebuild
index da8e99bacaff..aedd46bc7dfc 100644
--- a/sys-apps/dbus/dbus-0.50-r2.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r2.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.50-r2.ebuild,v 1.5 2006/01/04 01:02:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r2.ebuild,v 1.6 2006/01/19 20:40:35 compnerd Exp $
 
 inherit eutils mono python multilib autotools debug qt3
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		x11-libs/libX11
 		)
 	virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2.4 )
+	gtk? ( >=x11-libs/gtk+-2.6 )
 	python? ( >=dev-lang/python-2.4
 		>=dev-python/pyrex-0.9.3-r2 )
 	qt? ( $(qt_min_version 3.3) )
diff --git a/sys-apps/dbus/dbus-0.60-r3.ebuild b/sys-apps/dbus/dbus-0.60-r3.ebuild
index bd712b98f9ed..861024471815 100644
--- a/sys-apps/dbus/dbus-0.60-r3.ebuild
+++ b/sys-apps/dbus/dbus-0.60-r3.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.60-r3.ebuild,v 1.6 2006/01/16 09:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r3.ebuild,v 1.7 2006/01/19 20:40:35 compnerd Exp $
 
 inherit eutils mono python multilib debug qt3 autotools toolchain-funcs
 
@@ -15,7 +15,7 @@ IUSE="doc gcj gtk mono python qt selinux X xml2"
 
 RDEPEND=">=dev-libs/glib-2.6
 	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2.4 )
+	gtk? ( >=x11-libs/gtk+-2.6 )
 	mono? ( >=dev-lang/mono-0.95 )
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
 	qt? ( $(qt_min_version 3.3) )