Added backport of revision 481658 to let kxkb find the data while using modular X.

Package-Manager: portage-2.0.53_rc7

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 3fcd5371bb1894cdcb132eeb93082dcc1b0c4f00..149687d460dd79d0753d3dfb6d0bf5e454c93458 100644 (file)
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.227 2005/11/16 09:50:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.228 2005/11/20 00:28:56 flameeyes Exp $
+
+  20 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kxkb-3.5.0_rc1-modularx.patch, kdebase-3.5.0_rc1.ebuild:
+  Added backport of revision 481658 to let kxkb find the data while using
+  modular X.
 
 *kdebase-3.5.0_rc1 (16 Nov 2005)
 

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 2246a79e0326064a4b08703960069abbfede8f85..43cce67e83d3abc36772ad48e7269b69d11277d9 100644 (file)
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,54 +1,65 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
-MD5 c9a8dd6584d378e6e0130a37ab107632 kdebase-3.5_beta1.ebuild 4087
-MD5 66c2d20b2ccd3ae464f3ac3b404b3d60 ChangeLog 39600
-MD5 9ea970c24377c122bfd0d1024d1aed0e kdebase-3.3.2-r2.ebuild 3627
-MD5 bca1b08e31bfa89d6d04e9996a77c0bd kdebase-3.4.2-r2.ebuild 4527
-MD5 6c3e64729fba168a32ee89887da2ed82 kdebase-3.4.1-r1.ebuild 3882
-MD5 33f57e015cda93fea347d9dffcde669d kdebase-3.5.0_rc1.ebuild 4102
-MD5 78cbbef7e2dc635f99b0d468cce8e028 kdebase-3.4.2-r1.ebuild 4224
-MD5 591117532cfbeb0a773148c9edf13f60 kdebase-3.4.3.ebuild 4256
-MD5 b358eab7eab8c227d0985ba4f2280470 kdebase-3.5.0_beta2.ebuild 4265
-MD5 acf208f77b0607c97763d9f91cb8da35 kdebase-3.3.2-r3.ebuild 3751
-MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
-MD5 704491358dcd806f5264ca1cbdf470e9 kdebase-3.4.3-r1.ebuild 4491
-MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
-MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9bd89c62896330ec0a9b483c3eff61cc ChangeLog 39810
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
+MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
+MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r2/kdmrc 19864
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
+MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
+MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
 MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1-r1 68
-MD5 6fbfb59b6c34c3ed5a8b8bbfb5ccb1c7 files/kcheckpass-pie-final.patch 624
-MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-3.4.3 145
-MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
-MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
-MD5 dfb258d599bf770949dff416197af77f files/kdebase-3.5-configure-openexr.patch 780
-MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-3.5_beta1 69
-MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
-MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
 MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2 68
-MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 567135da80c6ae6bc19c925a4ff42765 files/digest-kdebase-3.4.3-r1 145
 MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2-r1 68
-MD5 472a5c5b9ade622637e00a6d28e69614 files/kdebase-3.5.0_beta2-noimake.patch 2248
-MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
-MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
 MD5 387a99610a8332cea995ed48d7e3339b files/digest-kdebase-3.4.2-r2 143
+MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-3.4.3 145
+MD5 567135da80c6ae6bc19c925a4ff42765 files/digest-kdebase-3.4.3-r1 145
+MD5 12824ea25b96ca06a0a91f4e4bf81cab files/digest-kdebase-3.5.0_beta2 69
+MD5 7a4f5a930b2071393172484a0557bc17 files/digest-kdebase-3.5.0_rc1 72
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-3.5_beta1 69
+MD5 6fbfb59b6c34c3ed5a8b8bbfb5ccb1c7 files/kcheckpass-pie-final.patch 624
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
 MD5 c13bb6243f0c10dd3892ca00a9fce333 files/kdebase-3.4-configure.patch 7273
 MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
-MD5 12824ea25b96ca06a0a91f4e4bf81cab files/digest-kdebase-3.5.0_beta2 69
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.1-startkde-gentoo.patch 1284
-MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
-MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
-MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
+MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
+MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
 MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
-MD5 7a4f5a930b2071393172484a0557bc17 files/digest-kdebase-3.5.0_rc1 72
-MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
-MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
-MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
-MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r2/kdmrc 19864
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
-MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
-MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
+MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
+MD5 dfb258d599bf770949dff416197af77f files/kdebase-3.5-configure-openexr.patch 780
+MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
+MD5 472a5c5b9ade622637e00a6d28e69614 files/kdebase-3.5.0_beta2-noimake.patch 2248
+MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
+MD5 6dfdd0c3f860e595b1ba5ba09d4f32f7 files/kxkb-3.5.0_rc1-modularx.patch 672
+MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
+MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
+MD5 9ea970c24377c122bfd0d1024d1aed0e kdebase-3.3.2-r2.ebuild 3627
+MD5 acf208f77b0607c97763d9f91cb8da35 kdebase-3.3.2-r3.ebuild 3751
+MD5 6c3e64729fba168a32ee89887da2ed82 kdebase-3.4.1-r1.ebuild 3882
+MD5 78cbbef7e2dc635f99b0d468cce8e028 kdebase-3.4.2-r1.ebuild 4224
+MD5 bca1b08e31bfa89d6d04e9996a77c0bd kdebase-3.4.2-r2.ebuild 4527
+MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
+MD5 704491358dcd806f5264ca1cbdf470e9 kdebase-3.4.3-r1.ebuild 4491
+MD5 591117532cfbeb0a773148c9edf13f60 kdebase-3.4.3.ebuild 4256
+MD5 b358eab7eab8c227d0985ba4f2280470 kdebase-3.5.0_beta2.ebuild 4265
+MD5 f4815f27488d7c174d789ce94ef90afc kdebase-3.5.0_rc1.ebuild 4238
+MD5 c9a8dd6584d378e6e0130a37ab107632 kdebase-3.5_beta1.ebuild 4087
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf8NWAiZjviIA2XgRArJNAJ9qJ8AicoI62AEButi5Dq6KjJ+dywCgnwNf
+fPXb5XMmalgCI/9Cr1cp9Uw=
+=vM+q
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch b/kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch
new file mode 100644 (file)
index 0000000..82d7cb0
--- /dev/null
+++ b/kde-base/kdebase/files/kxkb-3.5.0_rc1-modularx.patch
@@ -0,0 +1,20 @@
+Index: kdebase/kxkb/rules.cpp
+===================================================================
+--- kdebase/kxkb/rules.cpp     (revision 481653)
++++ kdebase/kxkb/rules.cpp     (working copy)
+@@ -17,13 +17,13 @@
+ 
+ #include "rules.h"
+ 
+-const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"};
++const char* X11DirList[3] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/share/X11/"};
+ const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"};
+ 
+ KeyRules::KeyRules():
+     m_layouts(90)
+ {
+-  for(int ii=0; ii<2; ii++)
++  for(int ii=0; ii<3; ii++)
+     if( QDir(X11DirList[ii]).exists() ) {
+       X11_DIR = X11DirList[ii];
+       break;

diff --git a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild b/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
index 375504a0d220ade5c04198e261c7b672b116a442..89e9429d45050187c54eca65cb8d2b9be3460370 100644 (file)
--- a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0_rc1.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/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.1 2005/11/16 09:50:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.2 2005/11/20 00:28:56 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -43,6 +43,10 @@ src_unpack() {
        # Avoid using imake (kde bug 114466).
        epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
 
+       # Let kxkb search in Xorg 7.0 default path (kde rev 481658, applied for
+       # final).
+       epatch "${FILESDIR}/kxkb-${PV}-modularx.patch"
+
        # For the noimake patch.
        make -f admin/Makefile.common || die
 }