From: Dan Armak <danarmak@gentoo.org>
Date: Wed, 23 Nov 2005 05:23:31 +0000 (+0000)
Subject: Removed kxkb patch applied upstream.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1e6cf2bc9854377c3461beab825baf4f75751cc;p=gentoo.git

Removed kxkb patch applied upstream.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index b9d87792c996..3edf774a3cbe 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,9 @@
 # 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.230 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.231 2005/11/23 05:23:31 danarmak Exp $
+
+  23 Nov 2005; Dan Armak <danarmak@gentoo.org> kdebase-3.5.0.ebuild:
+  Removed kxkb patch applied upstream.
 
 *kdebase-3.5.0 (22 Nov 2005)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 760fc8a43c95..e72a5f2fd2e3 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,4 +1,4 @@
-MD5 3d1ac4d723a149a31bc9115ad10fe661 ChangeLog 40100
+MD5 a187e2faa559258de9e37cdcef2c8c72 ChangeLog 40209
 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
@@ -50,7 +50,7 @@ MD5 bca1b08e31bfa89d6d04e9996a77c0bd kdebase-3.4.2-r2.ebuild 4527
 MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
 MD5 71d63b9e44334013e0008591620de1eb kdebase-3.4.3-r1.ebuild 4492
 MD5 591117532cfbeb0a773148c9edf13f60 kdebase-3.4.3.ebuild 4256
-MD5 93409dbeae846719a527346ee8b42fd3 kdebase-3.5.0.ebuild 4233
+MD5 f0a2b1d6c1d17ce57f8bf2421895d99c kdebase-3.5.0.ebuild 4100
 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
diff --git a/kde-base/kdebase/kdebase-3.5.0.ebuild b/kde-base/kdebase/kdebase-3.5.0.ebuild
index 82b2b8104546..7fd75bbb9014 100644
--- a/kde-base/kdebase/kdebase-3.5.0.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.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/kde-base/kdebase/kdebase-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0.ebuild,v 1.2 2005/11/23 05:23:31 danarmak Exp $
 
 inherit kde-dist eutils
 
@@ -43,10 +43,6 @@ 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
 }