Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for possible use of XKB files on the console in addition to within X by removing runtime X-related dependencies. The console-setup package in other distros contains tools for handling this called ckb (ckbcomp, etc.). I'd like to look into using this in Gentoo instead of sys-apps/kbd.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc9 x86_64

3 files changed, 18 insertions, 10 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index dfb17b23823a..4e84884dc933 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.51 2008/10/14 17:09:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.52 2008/10/16 21:40:56 dberkholz Exp $
+
+  16 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xkeyboard-config-1.4.ebuild:
+  Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for
+  possible use of XKB files on the console in addition to within X by
+  removing runtime X-related dependencies. The console-setup package in
+  other distros contains tools for handling this called ckb (ckbcomp, etc.).
+  I'd like to look into using this in Gentoo instead of sys-apps/kbd.
 
 *xkeyboard-config-1.4 (14 Oct 2008)
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c87ee3aeecb6..4a0acdfbc609 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -13,13 +13,13 @@ EBUILD xkeyboard-config-0.9.ebuild 1641 RMD160 1fb215254b85863d5dc2fc72f6fca9016
 EBUILD xkeyboard-config-1.1.ebuild 1535 RMD160 7cee97349058f5fad83883c0f0e3ed489dee0501 SHA1 6fc4e953c1d716114398153093882daafc5749dc SHA256 f53b959e328119d0b2a4ad73a9ba6b1244b17b3ec6bb4c4bba8a6335db421204
 EBUILD xkeyboard-config-1.2.ebuild 1545 RMD160 2ffdfcf6f24ca5527014be7495d2d8a18d416329 SHA1 01c379cc898fa90cf79eedb53d32e6a20a3bd928 SHA256 f77dfc9bcc2d4c8db4e8026984a953bf86bcdd8bb34faa86725b1aa5b055d7a7
 EBUILD xkeyboard-config-1.3.ebuild 1550 RMD160 01b990942c0cd4332f1353ac72b0e09f82b925cc SHA1 471fe9faa1c7a0a5c5d3f4e223179b8a00b6eada SHA256 186b7e7c895542923b2641d3cc9c1144a9b83f809fed0f1f655a1365cdaa5b11
-EBUILD xkeyboard-config-1.4.ebuild 1550 RMD160 4318a89680fc028e7dcff0c05ae12425ce7963ac SHA1 942e9090c7679ef286afafe25468b875f3ee0a96 SHA256 a6612277b3f0c816c02caef95db963415c4af76b97d7d94bccb091d2cf4986d1
-MISC ChangeLog 7719 RMD160 6d9fc8616e6271522e74c478ee6d807e1692eddb SHA1 8e038ca8279be1de01c4926c68aa335f0ccd3269 SHA256 30ee7d614391cca10e60c0385fa4645f1de8c7064304820f3983f0c89161a722
+EBUILD xkeyboard-config-1.4.ebuild 1550 RMD160 8ad095c02deaa63c12bb2e100ef84cfce8eb8c9f SHA1 f90578c9d72cefed92a8338a1acaf80420c5c827 SHA256 cf6d556d628a9054f2536a969661a4d42d6eb2293fa359ed3acd7438d493d536
+MISC ChangeLog 8166 RMD160 cf71e76c56736f5759e6a4b76f5cb09a14cd4da6 SHA1 48f8bf956ce6ea437ff89e5e08c119282319b84a SHA256 0fcbc3b52f72d59dd9f4bb5d8b9d7d32df26487bae8edf9aca5c90c7297baf02
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj00nEACgkQXVaO67S1rtu3mgCgppOXXjOdCjAHFRORSRRHcvSf
-iUIAoLjVHZqry5NAs4GuuUvwsFDYUjF8
-=zKqd
+iEYEARECAAYFAkj3tPMACgkQXVaO67S1rtu4PACfVTKwfgX1x5O+nwGRaFHqpXVl
+5HQAniWW6VHJaJMXxKDAwONT/1L3p/dI
+=8EjA
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild
index f6b568dbb007..01653b205bb6 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.4.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/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild,v 1.1 2008/10/14 17:09:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild,v 1.2 2008/10/16 21:40:56 dberkholz Exp $
 
 inherit eutils multilib
 
@@ -12,10 +12,10 @@ SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
+RDEPEND="!x11-misc/xkbdata"
 DEPEND="${RDEPEND}
-	dev-perl/XML-Parser"
+	dev-perl/XML-Parser
+	x11-apps/xkbcomp"
 
 pkg_setup() {
 	# (#130590) The old XKB directory can screw stuff up