Bumping glib dep as per configure.in (phreak), and GTK+ dep to go along with it (bug #126820)

Package-Manager: portage-2.1_pre6-r5

3 files changed, 15 insertions, 11 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 7e00eaf43479..7e94af50d3c6 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.143 2006/03/18 19:25:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.144 2006/03/23 18:31:32 compnerd Exp $
+
+  23 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org> gconf-2.14.0.ebuild:
+  Fixing the glib dep as per the configure.in. Thanks to phreak for pointing
+  this out.  Fixing GTK+ dep (bug #126820).
 
 *gconf-2.14.0 (18 Mar 2006)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 2796dc93bfbe..0e9c6dbdd8d9 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,6 +1,6 @@
-MD5 bfedb99247327808ec47e7c021b78774 ChangeLog 18848
-RMD160 88b4a67fbaa3a86d3e0583fde0ae4a56556e4257 ChangeLog 18848
-SHA256 8d6cf7a3f950877e36d3b81cd4b984c6a95004999f32e9d8fae9cbaa8a0fce80 ChangeLog 18848
+MD5 ef00eb47cdbbc8a7893848941e9b1430 ChangeLog 19047
+RMD160 50474a9650292c43aba5a09daacbd326715285c9 ChangeLog 19047
+SHA256 b7a67620ba4cdafe79877d44be131d039bf4a0a4340c9e9c7e77a9fa280601fc ChangeLog 19047
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r3 64
 SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r3 64
@@ -55,9 +55,9 @@ SHA256 1a9eb9db3be8cb67757db8195a047cc7f5ea6fc127f5598c1da402f3c96d899d gconf-2.
 MD5 9053b30e0012779041c2157506b5cbbd gconf-2.12.1.ebuild 1970
 RMD160 13fd02954581488ed7ffe94b4c94d72bd936120e gconf-2.12.1.ebuild 1970
 SHA256 e83cdfe75cc53f0b8862b1e689c85c9f46f675fa1e156413ce2e2b0b36fe84dd gconf-2.12.1.ebuild 1970
-MD5 7c76d77efd22bd98b7eb59c5788f7aaa gconf-2.14.0.ebuild 1939
-RMD160 ce29ca7c87c341ced5c2b8469f04f61a29772f89 gconf-2.14.0.ebuild 1939
-SHA256 807e15842c4267caf551e784f4ee7b755943bcc8ac18072328160a0e0acf13bf gconf-2.14.0.ebuild 1939
+MD5 6260671a757f942d2d7acb6a0f7c576f gconf-2.14.0.ebuild 1945
+RMD160 ef05db978cb0578913c8fec78df010fbc3e54d55 gconf-2.14.0.ebuild 1945
+SHA256 c0a46af8b4a8de37fbe77dbccf4ebc591431b407196b1c6e390d834d7495afd9 gconf-2.14.0.ebuild 1945
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
diff --git a/gnome-base/gconf/gconf-2.14.0.ebuild b/gnome-base/gconf/gconf-2.14.0.ebuild
index 17b353ea4f52..49658e51a85b 100644
--- a/gnome-base/gconf/gconf-2.14.0.ebuild
+++ b/gnome-base/gconf/gconf-2.14.0.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/gnome-base/gconf/gconf-2.14.0.ebuild,v 1.1 2006/03/18 19:25:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.14.0.ebuild,v 1.2 2006/03/23 18:31:32 compnerd Exp $
 
 inherit gnome2
 
@@ -18,11 +18,11 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-libs/glib-2.7
+RDEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.8.16
 	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
-	dev-libs/popt
-	>=x11-libs/gtk+-2"
+	dev-libs/popt"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9