Fix regressions introduced in -r6 aligning it with -r5 changes.

(Portage version: 2.1_rc2-r2)

4 files changed, 32 insertions, 6 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index d8fb18c74749..8a1779251e06 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.325 2006/05/25 13:37:33 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.326 2006/05/25 15:22:30 flameeyes Exp $
+
+  25 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdelibs-3.5.2-r6.ebuild:
+  Fix regressions introduced in -r6 aligning it with -r5 changes.
 
 *kdelibs-3.5.2-r6 (25 May 2006)
 
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5
index 193ecf8614e7..0fc3cb73e025 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5
@@ -1,2 +1,6 @@
 MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103
+RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103
+SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103
 MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r6 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r6
index 995a845b9d48..14798d7daca2 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r6
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r6
@@ -1,2 +1,9 @@
 MD5 19d6e23390215b3be59338a05482850c kdelibs-3.5.2-patchset.tar.bz2 17026
+RMD160 07093c155a11256ba8e0df3144899ca1696db063 kdelibs-3.5.2-patchset.tar.bz2 17026
+SHA256 c3e4d921bfe963ab49a11081fbd5b0b8fe3d1190054a22bb3933c64d51becf04 kdelibs-3.5.2-patchset.tar.bz2 17026
 MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103
+RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103
+SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103
+MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild
index ebc634534e36..786cb425ee71 100644
--- a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.1 2006/05/25 13:37:33 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.2 2006/05/25 15:22:30 flameeyes Exp $
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
 DESCRIPTION="KDE libraries needed by all kde programs"
 HOMEPAGE="http://www.kde.org/"
 SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5.2-patchset.tar.bz2"
-#SRC_URI="mirror://kde/stable/3.5/src/${P}.tar.bz2"
+	mirror://gentoo/kdelibs-3.5.2-patchset.tar.bz2
+	cups? ( mirror://gentoo/kdeprint-${PV}-cups-1.2-patches.tar.bz2 )"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
@@ -17,6 +17,8 @@ IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff ze
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
 RDEPEND="$(qt_min_version 3.3.3)
 	arts? ( ~kde-base/arts-${PV} )
 	app-arch/bzip2
@@ -36,7 +38,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	kerberos? ( virtual/krb5 )
 	jpeg2k? ( media-libs/jasper )
 	openexr? ( >=media-libs/openexr-1.2 )
-	spell? ( || ( app-text/aspell
+	spell? ( || (  ( app-text/aspell app-dicts/aspell-en )
 	              app-text/ispell ) )
 	zeroconf? ( net-misc/mDNSResponder )
 	virtual/fam
@@ -72,6 +74,15 @@ src_unpack() {
 		# This patch won't be included upstream, see bug #128922
 		epatch ${FILESDIR}/kdelibs-3.5.2-kssl-3des.patch || die "Patch did not apply."
 	fi
+
+	if use cups && has_version '>=net-print/cups-1.2_pre'; then
+		cd "${S}"
+
+		EPATCH_SUFFIX="diff" \
+		EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \
+		EPATCH_FORCE="yes" \
+		epatch ${WORKDIR}/kdeprint-${PV}-cups-1.2-patches/
+	fi
 }
 
 src_compile() {
@@ -98,7 +109,7 @@ src_compile() {
 	fi
 
 	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=${ROOT}/usr/share/X11/rgb.txt"
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
 	fi
 
 	myconf="${myconf} --disable-fast-malloc"