Extract kdm's configure.in to get XLIBDIR definition, and patch it to not require imake.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 42 insertions, 11 deletions

diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 9635ca9d1328..6961d71881dc 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.43 2006/03/22 20:15:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.44 2006/03/23 08:46:10 flameeyes Exp $
+
+  23 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kxkb-3.5.2.ebuild:
+  Extract kdm's configure.in to get XLIBDIR definition, and patch it to not
+  require imake.
 
 *kxkb-3.5.2 (22 Mar 2006)
 
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index 46bb1ddb9ed0..543b7b70f7d8 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,6 +1,9 @@
-MD5 0831b875d59e19d1d62f3ef78a227a5b ChangeLog 5683
-RMD160 a9133c66f9530eae26a2871fb09b8b8ebd6a808e ChangeLog 5683
-SHA256 a0f524fce01af00552b254e612daecb833454e9e797add7fe535820d8404cd98 ChangeLog 5683
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 17a6942cf4127b31d349697b8af6dab2 ChangeLog 5850
+RMD160 3b00133d2682323656c534f747ccd3e42cdc77ef ChangeLog 5850
+SHA256 597a77f28bd4a99ae4f8c7eb24a490e19ad6e3af53bcae4018b52fc24b6db5b9 ChangeLog 5850
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
 RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-kxkb-3.4.1 212
 SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-kxkb-3.4.1 212
@@ -19,9 +22,9 @@ SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/di
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kxkb-3.5.1-r1 68
 RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-kxkb-3.5.1-r1 68
 SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-kxkb-3.5.1-r1 68
-MD5 612323f8728d639ddab8f055f88070ff files/digest-kxkb-3.5.2 250
-RMD160 b6e5ff095263b6bdb0f28016a100b78ce0d038ae files/digest-kxkb-3.5.2 250
-SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/digest-kxkb-3.5.2 250
+MD5 c394a5050794638636403870c68ca58b files/digest-kxkb-3.5.2 518
+RMD160 bbac942550e1e2b96467a37780f4bcb29bdbdfe7 files/digest-kxkb-3.5.2 518
+SHA256 449890ab3d599d2cab0871ca61449d5473fc561a9350c6febd205353c02b306b files/digest-kxkb-3.5.2 518
 MD5 42226b3baf60c509e74036e7bb7a7b4e files/kxkb3.5.1.xx_XX_layouts.patch 806
 RMD160 9c0f77dd658e01795ad4ec0fa7ed11fcb2218af1 files/kxkb3.5.1.xx_XX_layouts.patch 806
 SHA256 fd3010f128ad54327558857135d0ab8f814b2e88cb4fb99086b4ac831c7dc83d files/kxkb3.5.1.xx_XX_layouts.patch 806
@@ -43,9 +46,16 @@ SHA256 cbad8ca0bf6b06d2ec39e46787676ce5fceff539535debeb3ec9b05380e079b6 kxkb-3.5
 MD5 486c3fa7dee528af5d2ec7a4f37c696e kxkb-3.5.1.ebuild 536
 RMD160 5fddfffc6d2d4f4afe52782f809b79abfe892ea9 kxkb-3.5.1.ebuild 536
 SHA256 0eaefa2f009630ebe3948ccfe1a1eb89a9448300b545addc0553a425ff8963bc kxkb-3.5.1.ebuild 536
-MD5 8bee0695267bf2c82ed4002dd9c364da kxkb-3.5.2.ebuild 536
-RMD160 4bad42484c3e7dc1a5d1beb50d9920091b537167 kxkb-3.5.2.ebuild 536
-SHA256 39127ae5f4d7e620da6873ff06b0a7e659dd1af9e6a9cf1fbc8c320f7f84bdcd kxkb-3.5.2.ebuild 536
+MD5 c81c653493909077ea0e973330335537 kxkb-3.5.2.ebuild 846
+RMD160 b15999725542b4a7736b0a7440b9973f72780b08 kxkb-3.5.2.ebuild 846
+SHA256 cfcca8e74e9843baad3a87d44f67e0a832f161174c61b9d3e0bccf6fcd7e4e7c kxkb-3.5.2.ebuild 846
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEImBoAiZjviIA2XgRAqgHAJwMt0GsxzXd0Ey2ZOIQXBQqm+sG+gCbBprx
+8GULG5Hvveq8pn/bvLPyfbA=
+=Q8dy
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.2 b/kde-base/kxkb/files/digest-kxkb-3.5.2
index 7d6b04c82c0e..c016c39056aa 100644
--- a/kde-base/kxkb/files/digest-kxkb-3.5.2
+++ b/kde-base/kxkb/files/digest-kxkb-3.5.2
@@ -1,3 +1,6 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
+RMD160 c7e8356d2f46d2fd3a0e7e25f661843f09ff1296 kdebase-3.5.0-patches-1.tar.bz2 4654
+SHA256 599e92f2c488fef6fcd6f337b952e6ce72b27576df37dcb4b86f0961eb26e617 kdebase-3.5.0-patches-1.tar.bz2 4654
 MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 kdebase-3.5.2.tar.bz2 23590820
 SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/kxkb/kxkb-3.5.2.ebuild b/kde-base/kxkb/kxkb-3.5.2.ebuild
index 18d9410c4d1a..a9bed023c482 100644
--- a/kde-base/kxkb/kxkb-3.5.2.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.2.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.2.ebuild,v 1.1 2006/03/22 20:15:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.2.ebuild,v 1.2 2006/03/23 08:46:10 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+
 DESCRIPTION="Kicker applet for management of X keymaps"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
@@ -17,3 +20,14 @@ RDEPEND="${RDEPEND}
 			x11-apps/setxkbmap
 		) virtual/x11 )"
 
+KMEXTRACTONLY="${KMEXTRACTONLY}
+	kdm/configure.in.in"
+
+src_unpack() {
+	unpack "kdebase-3.5.0-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	# Avoid using imake (kde bug 114466)
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+}
+