x11-base/xorg-server: add x11-apps/xkbcomp to RDEPEND, fixes bug #265480

Package-Manager: portage-2.2_rc33/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 14 insertions, 6 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 665e0eb2f0e4..4d0a858b7c08 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.398 2009/05/07 15:43:49 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.399 2009/05/10 22:18:05 remi Exp $
+
+  10 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r5.ebuild,
+  xorg-server-1.5.3-r6.ebuild:
+  add x11-apps/xkbcomp to RDEPEND, fixes bug #265480
 
 *xorg-server-1.5.3-r6 (07 May 2009)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 880957143abf..9b18b9e0545d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -58,7 +58,7 @@ DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea449981002
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18332 RMD160 dcb87d12e9bde7f7580ab594be30015caaf32582 SHA1 ba7ee79ea7f7462299e2838a4b100f82e1306220 SHA256 db1d21e2a5f99b813227d2ce32294f19ec79cdee0198a7df909c207cf36a770c
 EBUILD xorg-server-1.4.2.ebuild 18259 RMD160 6aada909523f3941c0cb32332bb68407e6964814 SHA1 39d925056c108f0478f1e594bd9d178c7fb0f9f5 SHA256 b8700d79414cdf78f2a5a00a4c3b5a56a9ce96334277c0e668e96600cff0ef80
 EBUILD xorg-server-1.5.3-r4.ebuild 16847 RMD160 138b4d01c414af00202ed4c862a8ab32478d1a91 SHA1 1d9adcfd151eecab16b0bf68be57ef2680198fc4 SHA256 eca029f6fa3f70d9a9ff801fee48ec9aad9d2a43cd8c369a327955489db841a0
-EBUILD xorg-server-1.5.3-r5.ebuild 16919 RMD160 3a99c18b9018382f15bc4bccc4d80d4765bcd102 SHA1 25bece006b34d8701aa7161b2d8b01cf1b176144 SHA256 ec4f064765daeb152e5a8f018c812166018562e48fd3c64944511387c391914b
-EBUILD xorg-server-1.5.3-r6.ebuild 16926 RMD160 e0f34536077f5362719bd4ed073e34829b8d316c SHA1 147a5ca2bb87380462ec8e33bf85b0e8d709b0ee SHA256 59b9dbed51e2827d892500ef99501fda7afd8643906dc932963000475d107a51
-MISC ChangeLog 93385 RMD160 a7515cb4385e2696f9ef07eb862964e2bd5b6562 SHA1 279b7398fddaf18c8e432c1ba91ae808534b5ca3 SHA256 238e8de38dc1f0cccff3d3185bbfd27c985c860008476a3455bea2265d13a96d
+EBUILD xorg-server-1.5.3-r5.ebuild 17002 RMD160 47d9dd7d6af789f22208ce906e8facde51c328b7 SHA1 2e5b9383f9cd9fed0a8d260e3521ca121a79358b SHA256 f513aaa4adbff8cbee7b0a24d54b4227624b700197123184bbd369c3787a0ce9
+EBUILD xorg-server-1.5.3-r6.ebuild 17009 RMD160 4ef9066a86ef56fb419956a1af7103c414db2fb7 SHA1 84c663fd12db525440e22cb1833251e7e9d16c39 SHA256 86eefbde11d8a00b1edc557985d085d8a3179de724524282a5af9d9a185dfeee
+MISC ChangeLog 93546 RMD160 38fe691df83739b6aab7ec4c1d1bafb7ceb117da SHA1 48f57ebd8780838673081e610010cb466833a2f3 SHA256 a8b25c22bcd71d4db50a2236229137e2ba7bc8aa8de0b596868c597864640bea
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
index 4bc9faeb791e..da04e88d3c95 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.12 2009/05/05 15:05:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.13 2009/05/10 22:18:05 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -121,6 +121,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	media-libs/freetype
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
@@ -143,6 +144,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
 	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# xkbcomp is launched at startup but not checked by ./configure
 DEPEND="${RDEPEND}
 	!net-dialup/dtrace
 	sys-devel/flex
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
index 5c50383a12b3..9795e5cf2232 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.1 2009/05/07 15:43:49 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.2 2009/05/10 22:18:05 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -121,6 +121,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	media-libs/freetype
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
@@ -143,6 +144,7 @@ RDEPEND="hal? ( sys-apps/hal )
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
 	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# xkbcomp is launched at startup but not checked by ./configure
 DEPEND="${RDEPEND}
 	!net-dialup/dtrace
 	sys-devel/flex