Add randrproto build-time dependency for future-proofing (libXrandr currently pulls it in, but eventually should not)

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 9cc43d21223f..0122e6937fe5 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.227 2008/11/13 19:09:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.228 2008/11/23 16:59:43 leio Exp $
+
+  23 Nov 2008; Mart Raudsepp <leio@gentoo.org> gnome-desktop-2.24.1.ebuild:
+  Add randrproto build-time dependency for future-proofing (libXrandr
+  currently pulls it in, but eventually should not)
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gnome-desktop-2.22.3.ebuild:
   Marking gnome-desktop-2.22.3 ppc64 stable for bug 236971
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 6e4dbbe0851b..0d3d9461028f 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -3,6 +3,6 @@ DIST gnome-desktop-2.22.3.tar.bz2 1444103 RMD160 f1bbba787e3924df0fac25c56f3d703
 DIST gnome-desktop-2.24.1.tar.bz2 1508429 RMD160 980538be5fb4ebeff0e66a89dc2a051f679b86af SHA1 d4b396df792c5bd1b496ff3e89949b1d4d2d048e SHA256 ec7beb0886dfaeebb506b2f0e6e255b4254b3ca812ab6f69a6cafb3d9e492a40
 EBUILD gnome-desktop-2.20.3.ebuild 1291 RMD160 4149e458db6fb702ade8a144de5c44a0222841c3 SHA1 3998dbab52f9758dbb9ebe328c76e7a59e5eaa27 SHA256 8c5147d6bfa584232553daf672d61f6f0b7e4b68191ede1e8d705a4633ca2c92
 EBUILD gnome-desktop-2.22.3.ebuild 1127 RMD160 e46301620880bef23932a112fe40209755c1f5d2 SHA1 2fdd3c3bd43575f0104b34cd78ed290f6bdb947e SHA256 a6613203b233501ddcf05c67c4ed4d99e35207f2e11cb3ca9b9c3368c7d2d315
-EBUILD gnome-desktop-2.24.1.ebuild 1304 RMD160 679cb174eeb65a8695c92a0a83bd28b4eee32638 SHA1 7a49e856865a65131eb24a4282bb6d69862a0b92 SHA256 d2bfe43037c6af67ab2cd8f724dc9bc42a6c1e698e93413abbb9db838438d565
-MISC ChangeLog 28558 RMD160 d8cc88c82e2b0f91fda9e83abd804000bf97f470 SHA1 96968401234e6c61bfce2727998a3c4a0f4a758a SHA256 2a2416bf10d3a0c6c33ea5174fb6310e3c27ab196b74824ecd7af2297e11a93d
+EBUILD gnome-desktop-2.24.1.ebuild 1448 RMD160 8af48159270debce6c29b2074f222532bcc74180 SHA1 f9e14edcfa4bf05275eaf5fc89bc576646fb5e48 SHA256 49af644bdd3f129cadc1d78e29ed7c713b11473c82c91af8de2e4ac391bbb375
+MISC ChangeLog 28755 RMD160 758ff8c26158a5caa14a119c2172cdc80fda4725 SHA1 e504246d54e51c7ca50b8314987e7f1842d0a1cb SHA256 e97e9aac657ea0f1114d21d7d8f15135ff643fcc6256faea9f2023f74e9af993
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild
index 7758bc971ad6..8398bc1435d1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild,v 1.2 2008/11/08 12:59:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild,v 1.3 2008/11/23 16:59:43 leio Exp $
 
 inherit gnome2
 
@@ -13,21 +13,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/libxml2-2.4.20
-		 >=x11-libs/gtk+-2.11.3
-		 >=dev-libs/glib-2.15.4
-		 >=x11-libs/libXrandr-1.2
-		 >=gnome-base/gconf-2
-		 >=gnome-base/libgnomeui-2.6
-		 >=x11-libs/startup-notification-0.5"
+	>=x11-libs/gtk+-2.11.3
+	>=dev-libs/glib-2.15.4
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2.6
+	>=x11-libs/startup-notification-0.5"
 DEPEND="${RDEPEND}
-		app-text/scrollkeeper
-		>=dev-util/intltool-0.40
-		>=dev-util/pkgconfig-0.9
-		>=app-text/gnome-doc-utils-0.3.2
-		doc? ( >=dev-util/gtk-doc-1.4 )
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-proto/xproto"
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
 # Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"