Accept umbrello 3.5.1 as that works better than .3 most of the time, and put under...

Package-Manager: portage-2.1_rc4

diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-base/kdesdk-meta/ChangeLog
index 63898c77249799fb1dbc7913086769d48c8202f2..fa2a321ea0011e9e5eebf0824bef02a10a28d311 100644 (file)
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-base/kdesdk-meta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesdk-meta
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.42 2006/06/01 18:06:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.43 2006/06/07 21:33:22 flameeyes Exp $
+
+  07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdesdk-meta-3.5.3.ebuild:
+  Accept umbrello 3.5.1 as that works better than .3 most of the time, and put
+  under glibc conditional kmtrace.
 
 *kdesdk-meta-3.5.3 (01 Jun 2006)
 

diff --git a/kde-base/kdesdk-meta/Manifest b/kde-base/kdesdk-meta/Manifest
index 35a23c5052829bf163515a9750fca5885a16e589..3dde2e84ada7094551e0b71b95bb6313f89d7b24 100644 (file)
--- a/kde-base/kdesdk-meta/Manifest
+++ b/kde-base/kdesdk-meta/Manifest
@@ -9,14 +9,14 @@ EBUILD kdesdk-meta-3.5.2.ebuild 1174 RMD160 1aa144ad2fe7b3af41bcd2827c3d47721ac5
 MD5 ce5d59c0fa86d2e888c9483101e6c405 kdesdk-meta-3.5.2.ebuild 1174
 RMD160 1aa144ad2fe7b3af41bcd2827c3d47721ac53646 kdesdk-meta-3.5.2.ebuild 1174
 SHA256 29445574c4d06f780b4fcd5b2b4503abc375a4a9ad38e36341772dfba637f91c kdesdk-meta-3.5.2.ebuild 1174
-EBUILD kdesdk-meta-3.5.3.ebuild 1172 RMD160 ad5bf883079a1a8b6fd1d070b3d3927396d2ad16 SHA1 938d2ff249c3608afc06adddf3dbed0b27c9cd5b SHA256 c780d545b666927e8bffd9aa89aff6c9b258d314119dabc9539ca90096cf8a5f
-MD5 60edbcaddfb7487cc1d0e8eca818488b kdesdk-meta-3.5.3.ebuild 1172
-RMD160 ad5bf883079a1a8b6fd1d070b3d3927396d2ad16 kdesdk-meta-3.5.3.ebuild 1172
-SHA256 c780d545b666927e8bffd9aa89aff6c9b258d314119dabc9539ca90096cf8a5f kdesdk-meta-3.5.3.ebuild 1172
-MISC ChangeLog 5668 RMD160 753bfbda8f27f8dfab026029da0967cde300da93 SHA1 816d7584cc3f616bf2581952c824e9447f8f98f2 SHA256 20611e8a75ecb3e893c37d49287f119804fa7ca10281ffd30a832730343ab939
-MD5 dd0a5acd462075bc654b7712a062b2b8 ChangeLog 5668
-RMD160 753bfbda8f27f8dfab026029da0967cde300da93 ChangeLog 5668
-SHA256 20611e8a75ecb3e893c37d49287f119804fa7ca10281ffd30a832730343ab939 ChangeLog 5668
+EBUILD kdesdk-meta-3.5.3.ebuild 1203 RMD160 a1c86108e1629bcc611ccc7906b4318c7c554f6e SHA1 f1893fcf91cd60e6b93ca4a4adc8ce30feebde05 SHA256 0d0b23808567a5dc41301353830df3c2bfef585a2e6b2bc69156a1ecb220f1f7
+MD5 c26bdae4406c3eb6b02fec1b520e5192 kdesdk-meta-3.5.3.ebuild 1203
+RMD160 a1c86108e1629bcc611ccc7906b4318c7c554f6e kdesdk-meta-3.5.3.ebuild 1203
+SHA256 0d0b23808567a5dc41301353830df3c2bfef585a2e6b2bc69156a1ecb220f1f7 kdesdk-meta-3.5.3.ebuild 1203
+MISC ChangeLog 5864 RMD160 b375e03a4c85c9105fbaa34924519cbf59cbb665 SHA1 49bde197b4bca0a77f278c95f5942ccaec3af198 SHA256 39369148b16070fa2d5d08f7103c8550e4cc2836f4fb615049851a677e8d28a3
+MD5 ea21141875a7e66c0d3fcb015dbba981 ChangeLog 5864
+RMD160 b375e03a4c85c9105fbaa34924519cbf59cbb665 ChangeLog 5864
+SHA256 39369148b16070fa2d5d08f7103c8550e4cc2836f4fb615049851a677e8d28a3 ChangeLog 5864
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -33,7 +33,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfyy9AiZjviIA2XgRAp0wAKDQhgcwiHjqb65R3D7nskl1cYacGQCcCdj/
-xRT8yrAn9s9CKlYElLS8Tu0=
-=hDUI
+iD8DBQFEh0YqAiZjviIA2XgRApEoAKDKpg28zo8UdFd3vj4Lw2kHTewyugCfbfr9
+zzSHono2cOo8l5DiKO2HWEM=
+=oBaI
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5.3.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.5.3.ebuild
index 08bf9bd1127bff035315cf731d6b40ef85af7f31..692122980df26f9711172da723ebe98e4280ebcc 100644 (file)
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5.3.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-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/kdesdk-meta/kdesdk-meta-3.5.3.ebuild,v 1.1 2006/06/01 18:06:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.5.3.ebuild,v 1.2 2006/06/07 21:33:22 flameeyes Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="3.5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="subversion"
+IUSE="subversion elibc_glibc"
 
 RDEPEND="
        $(deprange $PV $MAXKDEVER kde-base/cervisia)
@@ -21,9 +21,9 @@ RDEPEND="
        $(deprange $PV $MAXKDEVER kde-base/kdesdk-kfile-plugins)
        $(deprange 3.5.0 $MAXKDEVER kde-base/kdesdk-misc)
        $(deprange $PV $MAXKDEVER kde-base/kdesdk-scripts)
-       $(deprange 3.5.2 $MAXKDEVER kde-base/kmtrace)
+       elibc_glibc? ( $(deprange 3.5.2 $MAXKDEVER kde-base/kmtrace) )
        $(deprange 3.5.1 $MAXKDEVER kde-base/kompare)
        $(deprange 3.5.0 $MAXKDEVER kde-base/kspy)
        $(deprange $PV $MAXKDEVER kde-base/kuiviewer)
        subversion? ( $(deprange $PV $MAXKDEVER kde-base/kdesdk-kioslaves) )
-       $(deprange $PV $MAXKDEVER kde-base/umbrello)"
+       $(deprange 3.5.1 $MAXKDEVER kde-base/umbrello)"