From 2ceb7dfef432ce6e4596247453b56448e435c4e2 Mon Sep 17 00:00:00 2001
From: Daniel Gryniewicz <dang@gentoo.org>
Date: Sun, 6 Nov 2005 22:47:41 +0000
Subject: [PATCH] Modular X deps Package-Manager: portage-2.0.53_rc7

---
 x11-libs/libxklavier/ChangeLog              |  5 ++-
 x11-libs/libxklavier/Manifest               | 36 +++++++++++++--------
 x11-libs/libxklavier/libxklavier-2.0.ebuild | 11 +++++--
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 74dcea15befc..bf3a2322541e 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.46 2005/07/11 22:52:25 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.47 2005/11/06 22:47:41 dang Exp $
+
+  06 Nov 2005; <dang@gentoo.org> libxklavier-2.0.ebuild:
+  Modular X deps
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> libxklavier-2.0.ebuild:
   stable on mips
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 50eecea94043..a342d381358c 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,17 +1,27 @@
-MD5 ddfe99faedd0be2841fd37eacdc38112 libxklavier-1.04.ebuild 999
-MD5 df49c2c8b0bd3d2650fdfc90ff0965c4 libxklavier-2.0.ebuild 1071
-MD5 11f83de3d100083dec4fa85c3a929f78 libxklavier-1.03.ebuild 949
-MD5 05df813a16281cb46bca7c793b2a6235 ChangeLog 5005
-MD5 5a267a38ce83469d40f7eb2e28de500d libxklavier-1.02.ebuild 941
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
-MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
-MD5 dd5b95ef05fbd2d67d79ce2053a1f4a2 files/libxklavier-1.14-werror.patch 1189
-MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
-MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
-MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
-MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d47a4c585986f29c31c2cee33623f0e7 ChangeLog 5078
 MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
 MD5 e25e334ceafe0426056d920a3ead52c3 files/digest-libxklavier-1.03 68
 MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04 68
 MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04-r1 68
+MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
+MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
+MD5 dd5b95ef05fbd2d67d79ce2053a1f4a2 files/libxklavier-1.14-werror.patch 1189
+MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
+MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
+MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
+MD5 5a267a38ce83469d40f7eb2e28de500d libxklavier-1.02.ebuild 941
+MD5 11f83de3d100083dec4fa85c3a929f78 libxklavier-1.03.ebuild 949
+MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
+MD5 ddfe99faedd0be2841fd37eacdc38112 libxklavier-1.04.ebuild 999
+MD5 b438ab07e92289b506f360e5ebd557cf libxklavier-2.0.ebuild 1182
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbogUomPajV0RnrERAlS0AJ92yC83wpDgDsgG5FOi3Cd8J0gSQwCeK7oR
+6vb/ymGNNx4+XHg8WxYDWrU=
+=J9AL
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/libxklavier-2.0.ebuild b/x11-libs/libxklavier/libxklavier-2.0.ebuild
index 6d34a8e057d3..7b9251ec864a 100644
--- a/x11-libs/libxklavier/libxklavier-2.0.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0.ebuild,v 1.14 2005/07/11 22:52:25 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0.ebuild,v 1.15 2005/11/06 22:47:41 dang Exp $
 
 inherit eutils
 
@@ -13,10 +13,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libxkbfile )
+	virtual/x11 )
 	dev-libs/libxml2"
 
 DEPEND="${RDEPEND}
+	|| ( (
+		x11-libs/libXt
+		x11-proto/xproto )
+	virtual/x11 )
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-- 
2.26.2