Adjust ebuilds to kde_src_unpack() patch handling changes.

Package-Manager: portage-2.1

5 files changed, 16 insertions, 24 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 1b5ac6c100e6..344647fa9074 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.54 2006/06/01 17:37:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.55 2006/06/11 13:01:53 carlo Exp $
+
+  11 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
+  kdebase-startkde-3.5.2.ebuild, kdebase-startkde-3.5.3.ebuild:
+  Adjust ebuilds to kde_src_unpack() patch handling changes.
 
 *kdebase-startkde-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.2 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.2
index c016c39056aa..97c2fd5ac603 100644
--- a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.2
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.2
@@ -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 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/kdebase-startkde/files/digest-kdebase-startkde-3.5.3 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.3
index f0e866272b88..c57a28129d29 100644
--- a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.3
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-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-startkde/kdebase-startkde-3.5.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.2.ebuild
index b2c1834052cc..29ab7dfcff62 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.2.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/kdebase-startkde/kdebase-startkde-3.5.2.ebuild,v 1.10 2006/06/01 08:04:50 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.2.ebuild,v 1.11 2006/06/11 13:01:53 carlo Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,10 +10,10 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 # The kde apps called from the startkde script.
@@ -35,18 +35,12 @@ $(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
 $(deprange 3.5.0 $MAXKDEVER kde-base/kreadconfig)
 $(deprange $PV $MAXKDEVER kde-base/ksplashml)"
 
-src_unpack() {
-	unpack "kdebase-3.5.0-patches-1.tar.bz2"
-	kde-meta_src_unpack
-}
-
 src_compile() {
 	einfo "Nothing to compile"
 }
 
 src_install() {
 	# startkde script
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
 	exeinto ${KDEDIR}/bin
 	doexe startkde
 
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.3.ebuild
index 5bc1c49fff3c..92bb4d42f845 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.3.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.3.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/kdebase-startkde/kdebase-startkde-3.5.3.ebuild,v 1.1 2006/06/01 17:37:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.3.ebuild,v 1.2 2006/06/11 13:01:53 carlo Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -35,18 +35,12 @@ $(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
 $(deprange 3.5.0 $MAXKDEVER kde-base/kreadconfig)
 $(deprange $PV $MAXKDEVER kde-base/ksplashml)"
 
-src_unpack() {
-	unpack "kdebase-3.5.0-patches-1.tar.bz2"
-	kde-meta_src_unpack
-}
-
 src_compile() {
 	einfo "Nothing to compile"
 }
 
 src_install() {
 	# startkde script
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
 	exeinto ${KDEDIR}/bin
 	doexe startkde