Adjust ebuilds to kde_src_unpack() patch handling changes.

(Portage version: 2.1)

5 files changed, 18 insertions, 26 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 8d9229a08f99..9a3510fae5da 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.283 2006/06/03 10:19:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.284 2006/06/11 13:08:04 carlo Exp $
+
+  11 Jun 2006; Carsten Lohrke <carlo@gentoo.org> kdebase-3.5.2-r1.ebuild,
+  kdebase-3.5.3.ebuild:
+  Adjust ebuilds to kde_src_unpack() patch handling changes.
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> kdebase-3.5.2-r1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.2-r1
index 2e79e20e48d7..55c56022e98f 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.2-r1
@@ -1,6 +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 3e2318954d6f810815147acf0377e1e9 kdebase-3.5-patchset-01.tar.bz2 5552
+RMD160 196f2f57924ccab4109061794d09f579917f4ed1 kdebase-3.5-patchset-01.tar.bz2 5552
+SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0 kdebase-3.5-patchset-01.tar.bz2 5552
 MD5 9cf154e31d27902925386a9e0b5ef2ea kdebase-3.5.2-patchset.tar.bz2 5578
 RMD160 85656629b35a7aff41e96b1ffa464a38a377c281 kdebase-3.5.2-patchset.tar.bz2 5578
 SHA256 47db65bda783c05d8ede7ba1d598f0fcf92ab365ae2ba44475352eec5c3ba701 kdebase-3.5.2-patchset.tar.bz2 5578
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.3 b/kde-base/kdebase/files/digest-kdebase-3.5.3
index f0e866272b88..c57a28129d29 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.5.3
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.3
@@ -1,6 +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 3e2318954d6f810815147acf0377e1e9 kdebase-3.5-patchset-01.tar.bz2 5552
+RMD160 196f2f57924ccab4109061794d09f579917f4ed1 kdebase-3.5-patchset-01.tar.bz2 5552
+SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0 kdebase-3.5-patchset-01.tar.bz2 5552
 MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
index 3638fe6fe81c..02007d50eb1c 100644
--- a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.11 2006/06/03 10:19:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.12 2006/06/11 13:08:04 carlo Exp $
 
 inherit kde-dist eutils flag-o-matic
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2
-	mirror://gentoo/kdebase-3.5.2-patchset.tar.bz2"
+	mirror://gentoo/kdebase-3.5.2-patchset.tar.bz2
+	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
 pam samba ssl zeroconf xcomposite xscreensaver xinerama"
 # hal: enables hal backend for 'media:' ioslave
@@ -76,20 +76,14 @@ DEPEND="${DEPEND}
 		) virtual/x11 )
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/konsole-3.5.1-detach-send2all.patch
-	${WORKDIR}/kdebase-3.5.2-patchset.diff
-	${FILESDIR}/kwin-3.5.2-parallel-make.diff"
+PATCHES="${WORKDIR}/kdebase-3.5.2-patchset.diff"
 
 src_unpack() {
 	kde_src_unpack
 
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
 	# Avoid using imake (kde bug 114466).
 	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
 	rm -f ${S}/configure
-
-	epatch "${FILESDIR}/drkonqi-${PV}-splitdebug.patch"
 }
 
 src_compile() {
diff --git a/kde-base/kdebase/kdebase-3.5.3.ebuild b/kde-base/kdebase/kdebase-3.5.3.ebuild
index cb95c6a8a643..4fbea81d9171 100644
--- a/kde-base/kdebase/kdebase-3.5.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3.ebuild,v 1.1 2006/06/02 19:43:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3.ebuild,v 1.2 2006/06/11 13:08:04 carlo Exp $
 
 inherit kde-dist eutils flag-o-matic
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
@@ -75,18 +75,12 @@ DEPEND="${DEPEND}
 		) virtual/x11 )
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/konsole-3.5.1-detach-send2all.patch"
-
 src_unpack() {
 	kde_src_unpack
 
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
 	# Avoid using imake (kde bug 114466).
 	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
 	rm -f ${S}/configure
-
-	epatch "${FILESDIR}/drkonqi-3.5.2-splitdebug.patch"
 }
 
 src_compile() {