Care for bug #148180.

Package-Manager: portage-2.1.2.3

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 93a86d6f941cee53550eff73d08aa8f8fc7786a7..3ce84c536921c26c1841f05d9360bb717fadb737 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.447 2007/04/03 19:35:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.448 2007/04/04 16:05:50 carlo Exp $
+
+  04 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.5.5-r10.ebuild,
+  kdelibs-3.5.6-r5.ebuild:
+  Care for bug #148180.
 
   03 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   kdelibs-3.5.5-r10.ebuild:

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 45037ccb1fac06d49298e04ba199a3a64f481cb3..dc57df3872c6a3b2140d5311d5196f5ba22da7c4 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -43,10 +43,10 @@ DIST kdelibs-3.5-patchset-06.tar.bz2 18862 RMD160 e7f59e24897d83432ba5bd908e8dae
 DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 SHA1 1f1e7a02e0dfc35fd2d27d8983a16e53e42397c0 SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c
 DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3
 DIST kdelibs-3.5.6.tar.bz2 15509460 RMD160 ce8c088e13f0e59238719600da9c768eac58b57d SHA1 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
-EBUILD kdelibs-3.5.5-r10.ebuild 6564 RMD160 f7c094adf9a4946c38b9d2897e2c2131032b6318 SHA1 7f6d6515d3e0a5379fa69839145bd7d87c26ee7a SHA256 a8b7dd726c62c700deb64e10a1f33bd2e225c8ccc2526723fc349f65cf32e98d
-MD5 fa8e75a29a65a62c013288bbb0cb095b kdelibs-3.5.5-r10.ebuild 6564
-RMD160 f7c094adf9a4946c38b9d2897e2c2131032b6318 kdelibs-3.5.5-r10.ebuild 6564
-SHA256 a8b7dd726c62c700deb64e10a1f33bd2e225c8ccc2526723fc349f65cf32e98d kdelibs-3.5.5-r10.ebuild 6564
+EBUILD kdelibs-3.5.5-r10.ebuild 6618 RMD160 1a4cd383974322513beb6ac6eae828e01c6243be SHA1 839d94ced69b9b8e961bbd108da0666f84060003 SHA256 b8b9ab17a3ca4b105a2e39c1dd5f88e355a3e4f5a8e74f89caa36cf78be681ea
+MD5 fd36b1651d80483f03d3e49f91e46646 kdelibs-3.5.5-r10.ebuild 6618
+RMD160 1a4cd383974322513beb6ac6eae828e01c6243be kdelibs-3.5.5-r10.ebuild 6618
+SHA256 b8b9ab17a3ca4b105a2e39c1dd5f88e355a3e4f5a8e74f89caa36cf78be681ea kdelibs-3.5.5-r10.ebuild 6618
 EBUILD kdelibs-3.5.5-r4.ebuild 5767 RMD160 58acf609fa886fb766fe43d7ba5a9d1752e60dcb SHA1 38991d19ea8405f29e107eca4c0e36fce8e4faa3 SHA256 7f55628729b20f19631ce165949bb0b14340452179187491680b70cca5788f4f
 MD5 439f043cecd598d8a00fa077bbf7af51 kdelibs-3.5.5-r4.ebuild 5767
 RMD160 58acf609fa886fb766fe43d7ba5a9d1752e60dcb kdelibs-3.5.5-r4.ebuild 5767
@@ -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 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 72387 RMD160 d3f3d552722a477a4d97fba31a6900e842ae298d SHA1 0f8ca2a3ebc312d6878eb04394e5310a9e420394 SHA256 5924d809931f6e674608da11c0e98d301c1dbd10f3fdd6bf40a4ee7d22c96477
-MD5 dd3b10191af1378704dcbe04f660784a ChangeLog 72387
-RMD160 d3f3d552722a477a4d97fba31a6900e842ae298d ChangeLog 72387
-SHA256 5924d809931f6e674608da11c0e98d301c1dbd10f3fdd6bf40a4ee7d22c96477 ChangeLog 72387
+EBUILD kdelibs-3.5.6-r5.ebuild 6153 RMD160 1101a5391608695a4abe5deaf42caa8af0ecedd9 SHA1 f029eb1b1672c63bac9e6deac368275452bec3d4 SHA256 ac5dad37a46aeec439f742bdbf0959b773af39a94b0b332f82ecddd1a75aea6c
+MD5 29314504c485d4f21723a0eb704d16e7 kdelibs-3.5.6-r5.ebuild 6153
+RMD160 1101a5391608695a4abe5deaf42caa8af0ecedd9 kdelibs-3.5.6-r5.ebuild 6153
+SHA256 ac5dad37a46aeec439f742bdbf0959b773af39a94b0b332f82ecddd1a75aea6c kdelibs-3.5.6-r5.ebuild 6153
+MISC ChangeLog 72509 RMD160 3379dca22bc8f55bf7f58079bcf9c0e8b84b6c43 SHA1 600c5182a08a7104a4ff86fe3282d4d912b15048 SHA256 ff3810069b393a6c53f7e8b4562cead55c638f59d34c44ee7c217424f0cbf289
+MD5 56a7ed340cdc03dcdebf731df3d5b840 ChangeLog 72509
+RMD160 3379dca22bc8f55bf7f58079bcf9c0e8b84b6c43 ChangeLog 72509
+SHA256 ff3810069b393a6c53f7e8b4562cead55c638f59d34c44ee7c217424f0cbf289 ChangeLog 72509
 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.5-r10.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
index c15f6ba1c4da1ce0e085d3a5e5cd60395912056c..a73b3034f9d1d2b85d5f4a5894bcf223faa8f770 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.5-r10.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.5-r10.ebuild,v 1.6 2007/04/03 19:35:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild,v 1.7 2007/04/04 16:05:50 carlo Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -157,6 +157,8 @@ src_compile() {
        # work around bug #120858, gcc 3.4.x -Os miscompilation
        use x86 && replace-flags "-Os" "-O2" # see bug #120858
 
+       use amd64 && replace-flags "-O3" "-O2" # see bug #148180
+
        export BINDNOW_FLAGS="$(bindnow-flags)"
 
        kde_src_compile

diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
index 008725d6d05f9814d3c628ed72b54c31e59719e0..8e1c42595405d9f9eabeef8ae1421f49d99eb882 100644 (file)
--- 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.2 2007/04/01 12:08:33 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild,v 1.3 2007/04/04 16:05:50 carlo Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -142,6 +142,8 @@ src_compile() {
        # work around bug #120858, gcc 3.4.x -Os miscompilation
        use x86 && replace-flags "-Os" "-O2" # see bug #120858
 
+       use amd64 && replace-flags "-O3" "-O2" # see bug #148180
+
        export BINDNOW_FLAGS="$(bindnow-flags)"
 
        kde_src_compile