Add dependencies for modular x, see bug #125562.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 33 insertions, 28 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 5fbad8eeba70..6b03273bb1dc 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4a1e5e202d0a0a0c528a08b82f0bc6d5 ChangeLog 45693
-RMD160 65353ee7cba39d9e288fb28db654825ff434e03d ChangeLog 45693
-SHA256 6b1ec18c5b39a83d595bb4ba77ba1ab81b1f3f1596bd44615f01cf454cc9abf7 ChangeLog 45693
+MD5 c935d2326626f5e5c827fc2b11aa5ae5 ChangeLog 45833
+RMD160 dceb43491ce653d71e9f9de8d566a024dddcdfdf ChangeLog 45833
+SHA256 e398b6eed46741039bbb810d1c51a209472bd42659c99f0c41348a9132d6ad30 ChangeLog 45833
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
 RMD160 4ecb5417a842a4fb309b975608cbe68484cef22b files/3.3.2-r1/Xsetup 758
 SHA256 8c56fca90a98025ecae2364197ad3e07d2b7f86cf7efe86d07ea518d5b63fac9 files/3.3.2-r1/Xsetup 758
@@ -166,19 +163,12 @@ SHA256 86ac748dccd7b740709cb0cf1af1562f49eb7e1c35ce93a30a0d3c9a240c1c02 kdebase-
 MD5 d6e6b2323b7bc9ee1450d4448309e2c1 kdebase-3.5.1-r2.ebuild 5261
 RMD160 95bcc498b44b07622323891bcc5b2f1080475f7f kdebase-3.5.1-r2.ebuild 5261
 SHA256 18db3073793203879f530eacdc10f15de58e4836acc5e8e4c5ac088aab207bf0 kdebase-3.5.1-r2.ebuild 5261
-MD5 c435b203378c0d3d705846c1045e5352 kdebase-3.5.1-r3.ebuild 5375
-RMD160 37e7a59f61ba6b270299d5cf4af9fa7dfe575295 kdebase-3.5.1-r3.ebuild 5375
-SHA256 af540d92212f7971811eaed519fbe4dce191a729da488b84fab03c7ec856e199 kdebase-3.5.1-r3.ebuild 5375
+MD5 76e7957c8fcba4ce838c7abfe842a8d7 kdebase-3.5.1-r3.ebuild 5427
+RMD160 072cb9be99b310a18155d81a33a2c61b1a87504d kdebase-3.5.1-r3.ebuild 5427
+SHA256 140ed1e9218c0c1bd2de9da98d0d22f5da649811d476da11715e71eedfa3f9c9 kdebase-3.5.1-r3.ebuild 5427
 MD5 e4b268e5fd737ffd4858993020e915ab kdebase-3.5.1.ebuild 5116
 RMD160 29a90af9ace387020879187c1dd7580661e4ea0d kdebase-3.5.1.ebuild 5116
 SHA256 18607df8898fa044582cca3d40cb94ba255991b3398183dbe9aaeda5f8eca714 kdebase-3.5.1.ebuild 5116
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBWdzAiZjviIA2XgRAqbPAKCHvNM8pbaS9fCR2viiHfd8tW96pQCgwRJa
-wjZpC2rpfHgeIaitfsd8u2M=
-=ghpb
------END PGP SIGNATURE-----
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index f25dbb3be5f8..e2c48436040d 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.36 2006/02/24 17:10:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.37 2006/03/09 10:49:34 flameeyes Exp $
+
+  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  konsole-3.5.1-r1.ebuild:
+  Add dependencies for modular x, see bug #125562.
 
 *konsole-3.5.1-r1 (24 Feb 2006)
 
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index c5460ab88b20..ee8d5e9cd5dc 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 837fe9b04cc57716a3572cc677b5d57c ChangeLog 4699
-RMD160 a475a95573722f492700dd8eb3e5bb4db7693374 ChangeLog 4699
-SHA256 0f7f73a71f9b322874d31a59cbb4d5be154ddf719f17a8b396e3d73fe86d0cb7 ChangeLog 4699
+MD5 f44fc2954017419371337791c55e1183 ChangeLog 4831
+RMD160 05c3202173a3eb6bb7d17415aab9611ca63fec61 ChangeLog 4831
+SHA256 0718cbc6b150f2e6b60d4fb0e4c2da883348503ce4b8eb54b82faa844016bf67 ChangeLog 4831
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-konsole-3.4.1 212
 RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-konsole-3.4.1 212
 SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-konsole-3.4.1 212
@@ -37,9 +37,9 @@ SHA256 393fa9d4791c090ff161c7f6d98395e982d10ed65f7d2062b3b9395d7469fbff konsole-
 MD5 6564ed23df179f2c07986eb8a49a5f5e konsole-3.5.0.ebuild 406
 RMD160 2dae69c0f766e50496ddf5744ec055a85d557eea konsole-3.5.0.ebuild 406
 SHA256 b2fbc436bea201bede591679448290136c0f56f0552e69fb9667ee92f6e74d16 konsole-3.5.0.ebuild 406
-MD5 3e8858c570793c15cf6346b7e88ba039 konsole-3.5.1-r1.ebuild 460
-RMD160 f2ca980fc03198bd4a453d17e5861bbb3dc8fe14 konsole-3.5.1-r1.ebuild 460
-SHA256 a406a7602754fe0124d82335e0dba5d44066bbe78a869358bf1ec5909cee48c6 konsole-3.5.1-r1.ebuild 460
+MD5 bb7b37e57b2117b4542e886848f28862 konsole-3.5.1-r1.ebuild 639
+RMD160 68661b521bb539a2026f787a1f08f6370801c6d3 konsole-3.5.1-r1.ebuild 639
+SHA256 c83ae9e700b26a2051ae5b7b4410b6b68c025a8a71a0653c5d6d448fc4773acc konsole-3.5.1-r1.ebuild 639
 MD5 c79ba02b20960d20ec6859b33a903a5f konsole-3.5.1.ebuild 407
 RMD160 b679b377dc157156cd57812850bde0b41d4818ad konsole-3.5.1.ebuild 407
 SHA256 a1cbe9d6b5da17eb96b82222391e0094d9829ecc2d1f9287e3854d7fdb8dfe72 konsole-3.5.1.ebuild 407
@@ -47,9 +47,9 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD/z5EAiZjviIA2XgRAkySAKCUepaWJDB+M+SYdtFPCxfDgEh/rQCg1Du3
-IARHgm+qC1Iou/IAhwnpuVg=
-=IVWF
+iD8DBQFEEAhUAiZjviIA2XgRAm1sAKCox3vAheUDF/k67T1/gL+/WO+a3ACgpbP2
+VzjP2xVEcUCjopzPgOi9W98=
+=JkSG
 -----END PGP SIGNATURE-----
diff --git a/kde-base/konsole/konsole-3.5.1-r1.ebuild b/kde-base/konsole/konsole-3.5.1-r1.ebuild
index 36e05ca57540..f529dc64cbe9 100644
--- a/kde-base/konsole/konsole-3.5.1-r1.ebuild
+++ b/kde-base/konsole/konsole-3.5.1-r1.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/kde-base/konsole/konsole-3.5.1-r1.ebuild,v 1.1 2006/02/24 17:10:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.1-r1.ebuild,v 1.2 2006/03/09 10:49:34 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -13,3 +13,14 @@ IUSE=""
 
 PATCHES="${FILESDIR}/${P}-detach-send2all.patch"
 
+RDEPEND="
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			x11-libs/libXtst
+		) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-apps/bdftopcf virtual/x11 )"
+