Bump to KDE 3.5.8. Removed obsolete versions.

(Portage version: 2.1.3.15)

9 files changed, 105 insertions, 189 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/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"