From: Carsten Lohrke <carlo@gentoo.org>
Date: Sun, 1 Apr 2007 12:08:33 +0000 (+0000)
Subject: Fix bug #172959.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87fd8fea11339835aae01862b65686771deab7f0;p=gentoo.git

Fix bug #172959.
Package-Manager: portage-2.1.2.3
---

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5081ffc3f8de..3ed24e621e84 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.442 2007/03/31 20:39:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.443 2007/04/01 12:08:33 carlo Exp $
+
+  01 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.5.6-r5.ebuild:
+  Fix bug #172959.
 
 *kdelibs-3.5.6-r5 (31 Mar 2007)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index bef01ffc9638..6aface15556d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -83,14 +83,14 @@ EBUILD kdelibs-3.5.6-r4.ebuild 6095 RMD160 99e40946bb1b1f4f97418c009315ed6699697
 MD5 95410947a63ed7933013dc1a3b52b8ed kdelibs-3.5.6-r4.ebuild 6095
 RMD160 99e40946bb1b1f4f97418c009315ed6699697f42 kdelibs-3.5.6-r4.ebuild 6095
 SHA256 7a5d657746e6e0786edfe4370662c1271bd1c71b884413c0aeab6a3af474e616 kdelibs-3.5.6-r4.ebuild 6095
-EBUILD kdelibs-3.5.6-r5.ebuild 6100 RMD160 3429e06e8fcc81610857fba7f6332b2973c370d0 SHA1 ecb91eb6ed34476327e90a16025b7501bf58bccb SHA256 8c2bcb586d045d50dc7944dc1cf28b91935c4f8a77dc73fc2ff3a3dff9e1912c
-MD5 1050a091d6fcf23ba9998669181d7e08 kdelibs-3.5.6-r5.ebuild 6100
-RMD160 3429e06e8fcc81610857fba7f6332b2973c370d0 kdelibs-3.5.6-r5.ebuild 6100
-SHA256 8c2bcb586d045d50dc7944dc1cf28b91935c4f8a77dc73fc2ff3a3dff9e1912c kdelibs-3.5.6-r5.ebuild 6100
-MISC ChangeLog 71841 RMD160 e89f45df0925ec28a98409f740dce1bfc717b3b3 SHA1 a4b93182f9bb401f8a7faa64a138357cc10f050d SHA256 1c63b8a37558194c4cbfee58010d359a2e4a2c41711fe7418fa88e225351b2f0
-MD5 6347e8ca9389f130f6902b2199cc0796 ChangeLog 71841
-RMD160 e89f45df0925ec28a98409f740dce1bfc717b3b3 ChangeLog 71841
-SHA256 1c63b8a37558194c4cbfee58010d359a2e4a2c41711fe7418fa88e225351b2f0 ChangeLog 71841
+EBUILD kdelibs-3.5.6-r5.ebuild 6094 RMD160 a849612a69e6e61c74fd3db4d855d27fd8221b33 SHA1 b220dd6551055ea2c41d8f08f530e67a4cc06abd SHA256 26b233b21fb3dc31db57622f4b31f0bf1e1005877db5266dea6c803b78df1274
+MD5 0834355e536a38d3b0f4d138f6c6ae3a kdelibs-3.5.6-r5.ebuild 6094
+RMD160 a849612a69e6e61c74fd3db4d855d27fd8221b33 kdelibs-3.5.6-r5.ebuild 6094
+SHA256 26b233b21fb3dc31db57622f4b31f0bf1e1005877db5266dea6c803b78df1274 kdelibs-3.5.6-r5.ebuild 6094
+MISC ChangeLog 71935 RMD160 90dba6e2f55216154f48842f96861342cdacb029 SHA1 6a66f76d366166370ed2af9105bc7e28b29eecbc SHA256 4b9fddb4c47b0eb456bebc45b9d9f1808d0961f598ab8404390ab0548ab32db6
+MD5 f0ff9d6a5984a072e99e9b227974c22c ChangeLog 71935
+RMD160 90dba6e2f55216154f48842f96861342cdacb029 ChangeLog 71935
+SHA256 4b9fddb4c47b0eb456bebc45b9d9f1808d0961f598ab8404390ab0548ab32db6 ChangeLog 71935
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
index 0e3d865d991a..008725d6d05f 100644
--- a/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild,v 1.1 2007/03/31 20:39:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild,v 1.2 2007/04/01 12:08:33 carlo Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
+IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
 zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
@@ -93,10 +93,10 @@ src_unpack() {
 		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
 	fi
 
-	if use branding ; then
+#	if use branding ; then
 		# add "(Gentoo)" to khtml user agent
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
+#		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+#	fi
 
 	# xinerama patch from Lubos Lunak
 	# http://ktown.kde.org/~seli/xinerama/