Bump to KDE 3.5.8. Removed obsolete versions.

Package-Manager: portage-2.1.3.15

10 files changed, 131 insertions, 218 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 4b15aa006a3a..400c51c4b125 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.151 2007/08/28 20:41:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.152 2007/10/19 22:21:49 philantrop Exp $
+
+*kdevelop-3.5.0 (19 Oct 2007)
+
+  19 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdevelop-3.5.0-scope.patch, +kdevelop-3.5.0.ebuild:
+  Bump to KDE 3.5.8.
 
   28 Aug 2007; nixnut <nixnut@gentoo.org> kdevelop-3.4.1.ebuild:
   Stable on ppc wrt bug 184641
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d38e51e53f22..a28be0b444d2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,45 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdevelop-3.4.1-hang-fix.diff 1789 RMD160 c05a8a5f1aee8b073923a494d98c91ca31a0a7bc SHA1 90124ed6d6230086d333ae633599cf0fb6030677 SHA256 9ef2627335a7c2a2e6d9ff9ed097c294c20a23b521bbd7b3619c79ef9891a413
 MD5 b687b6adad73c26def7c0d6686b37bac files/kdevelop-3.4.1-hang-fix.diff 1789
 RMD160 c05a8a5f1aee8b073923a494d98c91ca31a0a7bc files/kdevelop-3.4.1-hang-fix.diff 1789
 SHA256 9ef2627335a7c2a2e6d9ff9ed097c294c20a23b521bbd7b3619c79ef9891a413 files/kdevelop-3.4.1-hang-fix.diff 1789
-DIST kdevelop-3.3.5.tar.bz2 8178575 RMD160 7c422d62073fd8984d1464fec7201d255b147b40 SHA1 5de503d814abc9c70130326b50484ebb5bac3364 SHA256 b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29
-DIST kdevelop-3.3.6.tar.bz2 8176547 RMD160 1a1356e9eb015b2947cd64ba9ba223479d1ef3a4 SHA1 90d56409cf1108b4469c1ce98e7517dc46633eb9 SHA256 1cd0daccc885d1e50fc169fc33fc3d78b5d7970cdd14f249d2b8450a92f0b685
-DIST kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588 RMD160 abc7376f97b7b3cc1e1e0cb5c73d0979a58ca5a5 SHA1 29b8f3298414495ca75206eb376e8d10083b8213 SHA256 32fa957e622c8a3d4730c1124a2b343905c64196ca703129277baa6d8a3230d1
-DIST kdevelop-3.4.0.tar.bz2 9158370 RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 SHA1 d72f01ae6a0d3200339345d3557ada5c5f99112d SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194
+AUX kdevelop-3.5.0-scope.patch 3722 RMD160 342fd6bc3ed07aa2c39a27fedce02cc247280a25 SHA1 e3d30bd0ec7be8c830d525a83c4bd7622167db6e SHA256 9183f191163048aa481769ea620d81f89ba2d8e4d7b33ce6bd55f1c5400eeeef
+MD5 5e14f76d816b9b4999ad0bd871855166 files/kdevelop-3.5.0-scope.patch 3722
+RMD160 342fd6bc3ed07aa2c39a27fedce02cc247280a25 files/kdevelop-3.5.0-scope.patch 3722
+SHA256 9183f191163048aa481769ea620d81f89ba2d8e4d7b33ce6bd55f1c5400eeeef files/kdevelop-3.5.0-scope.patch 3722
 DIST kdevelop-3.4.1.tar.bz2 9368912 RMD160 c24ee5a999334345c521ddd70f51b8d2e4aa38d6 SHA1 5862f03aa4111b1288fc3c1cc926bc7aa582179c SHA256 f917321e6c4c35861aad7f9990f98f7b988fa4756ade624c9866f999a4845ef8
-EBUILD kdevelop-3.3.5.ebuild 3126 RMD160 83a4f92eb0749aaa31034c211c723c1b7813f8be SHA1 79393a442ef0795bbbc165eab5f4577f594135ac SHA256 04d74b618c70ee486d530a1bfb6b1fa9bbe4356fd645814a64a7a1491db1577f
-MD5 746c5dcd349ef5ae9f8d320a1d22434e kdevelop-3.3.5.ebuild 3126
-RMD160 83a4f92eb0749aaa31034c211c723c1b7813f8be kdevelop-3.3.5.ebuild 3126
-SHA256 04d74b618c70ee486d530a1bfb6b1fa9bbe4356fd645814a64a7a1491db1577f kdevelop-3.3.5.ebuild 3126
-EBUILD kdevelop-3.3.6.ebuild 3131 RMD160 1921a92628d9857b5fe8ead9563c5fb880574ee5 SHA1 d5654f8dace410ce133ed49c7a3dfd8fd66ea8af SHA256 92f500010c007faac9fff59ad0c9e97c89ac6502aa351ff83be91a9e68a80b05
-MD5 125a45f83779c6a2b7cce8abc9baeb81 kdevelop-3.3.6.ebuild 3131
-RMD160 1921a92628d9857b5fe8ead9563c5fb880574ee5 kdevelop-3.3.6.ebuild 3131
-SHA256 92f500010c007faac9fff59ad0c9e97c89ac6502aa351ff83be91a9e68a80b05 kdevelop-3.3.6.ebuild 3131
-EBUILD kdevelop-3.4.0-r2.ebuild 3380 RMD160 4e249f581c1930dbdf372aa8bb4b8ad4328175ac SHA1 d2b43c03146a6cf797b019d991ff3869352763d8 SHA256 434d4daa8561d62953a8a75c8d524867749793958cd31c1852b466e8e33fd79a
-MD5 608018facc4b8c60ddd05af2390651cd kdevelop-3.4.0-r2.ebuild 3380
-RMD160 4e249f581c1930dbdf372aa8bb4b8ad4328175ac kdevelop-3.4.0-r2.ebuild 3380
-SHA256 434d4daa8561d62953a8a75c8d524867749793958cd31c1852b466e8e33fd79a kdevelop-3.4.0-r2.ebuild 3380
+DIST kdevelop-3.5.0.tar.bz2 9415312 RMD160 fad1adda009eaa7fc6a6533a6bf211e3f1fa23fa SHA1 e46eb17bcf83e9a31c120bd6b872347b7a606dcf SHA256 d05afebfc9a8b61ca0fbc6dbe2341d7f6b0762cf76573abdc20d1147068c8aaa
 EBUILD kdevelop-3.4.1.ebuild 3369 RMD160 3a6def45a3b06f4254abc7b6f71798dcc8430234 SHA1 f36840233b50ad0e32e6ac38478690751a748d7f SHA256 bbfcaa0d34be84eb3fd475d1e163dad8d3d33cc9324ace30a4b29ae1e11f3a99
 MD5 41582ab3c3625cf8c7745c4cae0166ac kdevelop-3.4.1.ebuild 3369
 RMD160 3a6def45a3b06f4254abc7b6f71798dcc8430234 kdevelop-3.4.1.ebuild 3369
 SHA256 bbfcaa0d34be84eb3fd475d1e163dad8d3d33cc9324ace30a4b29ae1e11f3a99 kdevelop-3.4.1.ebuild 3369
-MISC ChangeLog 23538 RMD160 f82bca2dcdee565047b6e8ff8408b8d227e31e87 SHA1 758da28222c1381a29ec660e8298252ad5ed534d SHA256 776e372d332ed95d7dfeebd97d3d76743d88426933c6312fe9793f505646ddba
-MD5 f432d53a7f5e3e9d8f3d745d6d8c3fcf ChangeLog 23538
-RMD160 f82bca2dcdee565047b6e8ff8408b8d227e31e87 ChangeLog 23538
-SHA256 776e372d332ed95d7dfeebd97d3d76743d88426933c6312fe9793f505646ddba ChangeLog 23538
+EBUILD kdevelop-3.5.0.ebuild 3411 RMD160 52e0bef1328edbfc9340f94203c7df156ca7a5a9 SHA1 5bda08a7b2e6091ea92c5b4d5e748efd519fc750 SHA256 4e973515c4734ff05bf0baf219db5d53b79605725b84b48070f9dd29e25f80ca
+MD5 3a6004bb9ec7d8cc7b3a7880779e9c7f kdevelop-3.5.0.ebuild 3411
+RMD160 52e0bef1328edbfc9340f94203c7df156ca7a5a9 kdevelop-3.5.0.ebuild 3411
+SHA256 4e973515c4734ff05bf0baf219db5d53b79605725b84b48070f9dd29e25f80ca kdevelop-3.5.0.ebuild 3411
+MISC ChangeLog 23711 RMD160 1687fa7f94f46c6aa580fc08bd6bef0150e95092 SHA1 49219f874e109f74b19f31f80c980bf7c2529d98 SHA256 703b204d1d2e86778366eaefa1c4f6ce452c7817dbcce0c4cfb8bdfc902e641d
+MD5 24d96130eda32111dd9d0405bfa99e26 ChangeLog 23711
+RMD160 1687fa7f94f46c6aa580fc08bd6bef0150e95092 ChangeLog 23711
+SHA256 703b204d1d2e86778366eaefa1c4f6ce452c7817dbcce0c4cfb8bdfc902e641d ChangeLog 23711
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 334f5b6af156c3c3b2708b9e3f025d7b files/digest-kdevelop-3.3.5 250
-RMD160 6ef0765f1c9b2c5a7db8669cbdca11b6e549e8ef files/digest-kdevelop-3.3.5 250
-SHA256 1999a1306fe7c9242b83850ba3a4aed089216b2709170afe3216a175dc779a81 files/digest-kdevelop-3.3.5 250
-MD5 77d03bb3ed11aa086a3d63a8b3abdf5a files/digest-kdevelop-3.3.6 250
-RMD160 1fb856d79055868485d583409fb5be13630cd70d files/digest-kdevelop-3.3.6 250
-SHA256 15d021ae3f66947fb298f426091768a2609c970c1f506194d2d399fcec0d94c8 files/digest-kdevelop-3.3.6 250
-MD5 807f18a53dcf87c3a52e386f2f560a95 files/digest-kdevelop-3.4.0-r2 545
-RMD160 984c3274dcd077bf5688853067b6cc802e775101 files/digest-kdevelop-3.4.0-r2 545
-SHA256 c74aa9bf3182ed76a08955d12e2cc94d797168b94eb4a323c9eb73eb8d8827aa files/digest-kdevelop-3.4.0-r2 545
 MD5 da6b87cb76b3254a1777251ce6e8f859 files/digest-kdevelop-3.4.1 250
 RMD160 97df94311bb8a6d5e326cf06578d8faa37735768 files/digest-kdevelop-3.4.1 250
 SHA256 b0fa223cccb535aade0f81c024150b001ad4bb3d3cc7856e41bd1e002ac7d9c9 files/digest-kdevelop-3.4.1 250
+MD5 864a51c1db32e307b3115b1e18933c14 files/digest-kdevelop-3.5.0 250
+RMD160 f89ae520ced6d7cf7516b7add60f13a191bc7173 files/digest-kdevelop-3.5.0 250
+SHA256 aaf9c6378c13a0dbefccc248a862cb65d2f65c1c53f16d499b746e997b70f5b0 files/digest-kdevelop-3.5.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHGS4RCkvF58q80IkRAiV3AJ9IByM46pJtrnXd3RiV5yx5eXfXkgCgpGSe
+ropWnKlsc6HPaB8KXS6vSAw=
+=64ze
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.3.5 b/dev-util/kdevelop/files/digest-kdevelop-3.3.5
deleted file mode 100644
index d71d8224fc29..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e1bb5566c79022c20d534efae386cfa2 kdevelop-3.3.5.tar.bz2 8178575
-RMD160 7c422d62073fd8984d1464fec7201d255b147b40 kdevelop-3.3.5.tar.bz2 8178575
-SHA256 b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29 kdevelop-3.3.5.tar.bz2 8178575
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.3.6 b/dev-util/kdevelop/files/digest-kdevelop-3.3.6
deleted file mode 100644
index 758647a1ce0e..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0de7c7d82c176456f2adff48981f5d40 kdevelop-3.3.6.tar.bz2 8176547
-RMD160 1a1356e9eb015b2947cd64ba9ba223479d1ef3a4 kdevelop-3.3.6.tar.bz2 8176547
-SHA256 1cd0daccc885d1e50fc169fc33fc3d78b5d7970cdd14f249d2b8450a92f0b685 kdevelop-3.3.6.tar.bz2 8176547
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2 b/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2
deleted file mode 100644
index 5682a766ae63..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3ee48fd1a951678ce4a4f90ade0f5c90 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
-RMD160 abc7376f97b7b3cc1e1e0cb5c73d0979a58ca5a5 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
-SHA256 32fa957e622c8a3d4730c1124a2b343905c64196ca703129277baa6d8a3230d1 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
-MD5 9cf367c89329acf23738e23c0b663ee9 kdevelop-3.4.0.tar.bz2 9158370
-RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 kdevelop-3.4.0.tar.bz2 9158370
-SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194 kdevelop-3.4.0.tar.bz2 9158370
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.5.0 b/dev-util/kdevelop/files/digest-kdevelop-3.5.0
new file mode 100644
index 000000000000..b4cf2af7420b
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.5.0
@@ -0,0 +1,3 @@
+MD5 1101077b3a0164da463f60cad4f13e25 kdevelop-3.5.0.tar.bz2 9415312
+RMD160 fad1adda009eaa7fc6a6533a6bf211e3f1fa23fa kdevelop-3.5.0.tar.bz2 9415312
+SHA256 d05afebfc9a8b61ca0fbc6dbe2341d7f6b0762cf76573abdc20d1147068c8aaa kdevelop-3.5.0.tar.bz2 9415312
diff --git a/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch b/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch
new file mode 100644
index 000000000000..cd50da7bc60c
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch
@@ -0,0 +1,82 @@
+--- branches/kdevelop/3.5/buildtools/qmake/scope.h	2007/10/11 19:47:17	724230
++++ branches/kdevelop/3.5/buildtools/qmake/scope.h	2007/10/11 19:48:00	724231
+@@ -217,7 +217,7 @@
+     // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0),
+     // using the given list as startvalue
+     // Changes the list using the +=, -=, = operations accordingly
+-    void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true ) const;
++    void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true ) const;
+ 
+     // Check wether the two operators are compatible
+     static bool isCompatible( const QString& op1, const QString& op2);
+@@ -255,8 +255,6 @@
+ 
+     QString replaceWs(QString);
+ 
+-    // All different subscopes of this scope, the key is the "position" at which the scope starts
+-    QMap<QString, Scope*> m_subProjects;
+ 
+     // The "position" inside the parent scope that this scope starts at
+     unsigned int m_num;
+
+--- branches/kdevelop/3.5/buildtools/qmake/scope.cpp	2007/10/11 19:47:17	724230
++++ branches/kdevelop/3.5/buildtools/qmake/scope.cpp	2007/10/11 19:48:00	724231
+@@ -325,13 +325,13 @@
+     return result;
+ }
+ 
+-void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent ) const
++void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault ) const
+ {
+     if( !m_root )
+         return;
+ 
+     /* For variables that we don't know and which are not QT/CONFIG find the default value */
+-    if( m_defaultopts
++    if( setDefault && m_defaultopts
+         && m_defaultopts->variables().findIndex(variable) != -1
+         && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) )
+     {
+@@ -379,6 +379,42 @@
+                     }
+                 }
+             }
++        }else if( ast->nodeType() == QMake::AST::IncludeAST )
++        {
++            QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast);
++            QValueList<unsigned int> l = m_scopes.keys();
++            for( unsigned int i = 0; i < l.count(); ++i )
++            {
++                int num = l[ i ];
++                if( m_scopes.contains( num ) )
++                {
++                    Scope* s = m_scopes[num];
++                    if( s && s->scopeType() == IncludeScope && s->m_incast == iast )
++                    {
++                        s->calcValuesFromStatements( variable, result, false, 0, false, false );
++                    }
++                }
++            }
++
++        }else if( ast->nodeType() == QMake::AST::ProjectAST )
++        {
++            QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast);
++            if( past->isFunctionScope() || past->isScope() )
++            {
++                QValueList<unsigned int> l = m_scopes.keys();
++                for( unsigned int i = 0; i < l.count(); ++i )
++                {
++                    int num = l[ i ];
++                    if( m_scopes.contains( num ) )
++                    {
++                        Scope* s = m_scopes[num];
++                        if( s && s->m_root == past && s->m_root->scopedID == past->scopedID  )
++                        {
++                            s->calcValuesFromStatements( variable, result, false, 0, false, false );
++                        }
++                    }
++                }
++            }
+         }
+     }
+ 
diff --git a/dev-util/kdevelop/kdevelop-3.3.5.ebuild b/dev-util/kdevelop/kdevelop-3.3.5.ebuild
deleted file mode 100644
index 0afcd5030f2d..000000000000
--- a/dev-util/kdevelop/kdevelop-3.3.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.5.ebuild,v 1.9 2007/06/25 10:52:20 peper Exp $
-
-inherit kde eutils db-use
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-HOMEPAGE="http://www.kdevelop.org"
-#SRC_URI="mirror://kde/stable/${PV/#3.3/3.5}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/stable/${PV/3.3/3.5}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="3"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion graphviz"
-
-DEPEND="sys-devel/gdb
-	=sys-libs/db-4*
-	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )
-	graphviz? ( media-gfx/graphviz ) "
-RDEPEND="${DEPEND}
-	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
-DEPEND="${DEPEND}
-	sys-devel/flex"
-need-kde 3.5
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Update the admin dir used in KDE template projects.
-	# See also kde bug 104386.
-	for i in ${S}/admin/*; do
-		cp "${i}" "${S}/parts/appwizard/common/admin/"
-	done
-}
-
-src_compile() {
-	local myconf="--with-kdelibsdoxy-dir=$(kde-config --prefix)/share/doc/HTML/en/kdelibs-apidocs"
-
-	# languages
-	myconf="${myconf} $(use_enable java) $(use_enable python)
-			$(use_enable ruby) $(use_enable ada) $(use_enable fortran)
-			$(use_enable haskell) $(use_enable pascal) $(use_enable perl)
-			$(use_enable php) $(use_enable sql)"
-
-	# build tools
-	myconf="${myconf} $(use_enable java antproject)"
-
-	# version control systems
-	myconf="${myconf} $(use_enable cvs) $(use_enable clearcase) $(use_enable perforce)
-			$(use_enable subversion)"
-
-	# Explicitly set db include directory (bug 128897)
-	myconf="${myconf} --with-db-includedir=$(db_includedir)
-			--with-db-lib=$(db_libname)"
-
-	kde_src_compile
-}
-
-pkg_postinst() {
-	elog "kdevelop can use a wide range of apps for extra functionality. This is an"
-	elog "almost complete list. All these packages can be emerged after kdevelop."
-	elog
-	elog "kde-base/konsole:       (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "OR kde-base/kdebase:    (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "dev-util/kdbg:          (RECOMMENDED) kde frontend to gdb"
-	elog "dev-util/valgrind:      (RECOMMENDED) integrates valgrind (memory debugger) commands"
-	elog "kde-base/kompare:       (RECOMMENDED) show differences between files"
-	elog "dev-java/ant:           support projects using the ant build tool"
-	elog "dev-util/ctags:         faster and more powerful code browsing logic"
-	elog "app-doc/doxygen:        generate KDE-style documentation for your project"
-	elog "www-misc/htdig:         index and search your project's documentation"
-	elog "app-arch/rpm:           support creating RPMs of your project"
-	elog "app-emulation/visualboyadvance: create and run projects for this gameboy"
-	elog
-	elog "Support for GNU-style make, tmake, qmake is included."
-	elog "Support for using clearcase, perforce and subversion"
-	elog "as version control systems is optional."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.3.6.ebuild b/dev-util/kdevelop/kdevelop-3.3.6.ebuild
deleted file mode 100644
index 9baf0d379ba3..000000000000
--- a/dev-util/kdevelop/kdevelop-3.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.6.ebuild,v 1.4 2007/06/25 10:52:20 peper Exp $
-
-inherit kde eutils db-use
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-HOMEPAGE="http://www.kdevelop.org"
-#SRC_URI="mirror://kde/stable/${PV/#3.3/3.5}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/stable/${PV/3.3/3.5}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion graphviz"
-
-DEPEND="sys-devel/gdb
-	=sys-libs/db-4*
-	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )
-	graphviz? ( media-gfx/graphviz ) "
-RDEPEND="${DEPEND}
-	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
-DEPEND="${DEPEND}
-	sys-devel/flex"
-need-kde 3.5
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Update the admin dir used in KDE template projects.
-	# See also kde bug 104386.
-	for i in ${S}/admin/*; do
-		cp "${i}" "${S}/parts/appwizard/common/admin/"
-	done
-}
-
-src_compile() {
-	local myconf="--with-kdelibsdoxy-dir=$(kde-config --prefix)/share/doc/HTML/en/kdelibs-apidocs"
-
-	# languages
-	myconf="${myconf} $(use_enable java) $(use_enable python)
-			$(use_enable ruby) $(use_enable ada) $(use_enable fortran)
-			$(use_enable haskell) $(use_enable pascal) $(use_enable perl)
-			$(use_enable php) $(use_enable sql)"
-
-	# build tools
-	myconf="${myconf} $(use_enable java antproject)"
-
-	# version control systems
-	myconf="${myconf} $(use_enable cvs) $(use_enable clearcase) $(use_enable perforce)
-			$(use_enable subversion)"
-
-	# Explicitly set db include directory (bug 128897)
-	myconf="${myconf} --with-db-includedir=$(db_includedir)
-			--with-db-lib=$(db_libname)"
-
-	kde_src_compile
-}
-
-pkg_postinst() {
-	elog "kdevelop can use a wide range of apps for extra functionality. This is an"
-	elog "almost complete list. All these packages can be emerged after kdevelop."
-	elog
-	elog "kde-base/konsole:       (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "OR kde-base/kdebase:    (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "dev-util/kdbg:          (RECOMMENDED) kde frontend to gdb"
-	elog "dev-util/valgrind:      (RECOMMENDED) integrates valgrind (memory debugger) commands"
-	elog "kde-base/kompare:       (RECOMMENDED) show differences between files"
-	elog "dev-java/ant:           support projects using the ant build tool"
-	elog "dev-util/ctags:         faster and more powerful code browsing logic"
-	elog "app-doc/doxygen:        generate KDE-style documentation for your project"
-	elog "www-misc/htdig:         index and search your project's documentation"
-	elog "app-arch/rpm:           support creating RPMs of your project"
-	elog "app-emulation/visualboyadvance: create and run projects for this gameboy"
-	elog
-	elog "Support for GNU-style make, tmake, qmake is included."
-	elog "Support for using clearcase, perforce and subversion"
-	elog "as version control systems is optional."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild b/dev-util/kdevelop/kdevelop-3.5.0.ebuild
index b46e53cec65d..1f21c822e20e 100644
--- a/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.5.0.ebuild
@@ -1,32 +1,29 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild,v 1.5 2007/06/25 10:52:20 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.1 2007/10/19 22:21:49 philantrop Exp $
 
 inherit kde eutils db-use
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 HOMEPAGE="http://www.kdevelop.org"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2
-	mirror://gentoo/${P}-qmake-parser-2.patch.bz2"
+SRC_URI="mirror://kde/stable/3.5.8/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 
 SLOT="3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion graphviz"
+IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
 
 DEPEND="sys-devel/gdb
-	>=sys-libs/db-4.1
-	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )
-	graphviz? ( media-gfx/graphviz )"
+		>=sys-libs/db-4.1
+		cvs? ( || ( kde-base/kdesdk kde-base/cervisia ) )"
 
 RDEPEND="${DEPEND}
-	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
+		subversion? ( || ( kde-base/kdesdk kde-base/kdesdk-kioslaves ) )"
 DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-need-kde 3.5
+		>=sys-devel/flex-2.5.33"
 
-PATCHES="${DISTDIR}/${P}-qmake-parser-2.patch.bz2"
+need-kde 3.5
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -35,10 +32,13 @@ src_unpack() {
 
 	# Update the admin dir used in KDE template projects.
 	# See also kde bug 104386.
-	for i in ${S}/admin/*; do
+	for i in "${S}/admin/*"; do
 		cp "${i}" "${S}/parts/appwizard/common/admin/"
 	done
 
+	# Fix some post-3.5.8 quirks in qmake.
+	epatch "${FILESDIR}/${P}-scope.patch"
+
 	rm -f "${S}/configure"
 }
 
@@ -87,6 +87,7 @@ pkg_postinst() {
 	elog "dev-util/kdbg:		  (RECOMMENDED) kde frontend to gdb"
 	elog "dev-util/valgrind:	  (RECOMMENDED) integrates valgrind (memory debugger) commands"
 	elog "kde-base/kompare:		  (RECOMMENDED) show differences between files"
+	elog "media-gfx/graphviz:	  (RECOMMENDED) support the new graphical classbrowser"
 	elog "dev-java/ant:			  support projects using the ant build tool"
 	elog "dev-util/ctags:		  faster and more powerful code browsing logic"
 	elog "app-doc/doxygen:		  generate KDE-style documentation for your project"