Version bump. Add 3.5.1 and remove 3.4.1. Include patch from upstream (r780036).

(Portage version: 2.1.4.4)

4 files changed, 64 insertions, 61 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 63139a39a12a..062445ba7099 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.158 2008/02/03 14:26:38 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.159 2008/03/18 21:48:26 zlin Exp $
+
+*kdevelop-3.5.1 (18 Mar 2008)
+
+  18 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  -files/kdevelop-3.4.1-hang-fix.diff,
+  +files/kdevelop-3.5.1_fix_missing_output.patch, -kdevelop-3.4.1.ebuild,
+  +kdevelop-3.5.1.ebuild:
+  Version bump. Include patch from upstream (r780036).
 
   03 Feb 2008; Bo Ørsted Andresen <zlin@gentoo.org> kdevelop-3.4.1.ebuild,
   kdevelop-3.5.0.ebuild:
diff --git a/dev-util/kdevelop/files/kdevelop-3.4.1-hang-fix.diff b/dev-util/kdevelop/files/kdevelop-3.4.1-hang-fix.diff
deleted file mode 100644
index 0d2a2c9e520b..000000000000
--- a/dev-util/kdevelop/files/kdevelop-3.4.1-hang-fix.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp	2007-05-16 16:36:20.000000000 +0200
-+++ kdevelop-svn/languages/cpp/cppsupportpart.cpp	2007-05-16 00:25:57.000000000 +0200
-@@ -3130,11 +3130,11 @@
-         return QString::null;
- }
- 
--UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) {
-+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) {
- }
-       
- void UIBlockTester::UIBlockTesterThread::run() {
--  while(1) {
-+  while(!m_stop) {
- 	  msleep( m_parent.m_msecs / 10 );
- 	  m_parent.m_timeMutex.lock();
- 	  QDateTime t = QDateTime::currentDateTime();
-@@ -3146,7 +3146,11 @@
- 	  m_parent.m_timeMutex.unlock();
-   }
- }
--      
-+
-+void UIBlockTester::UIBlockTesterThread::stop() {
-+	m_stop = true;
-+}
-+
- UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
- 	m_timer = new QTimer( this );
- 	m_timer->start( milliseconds/10 );
-@@ -3155,7 +3159,7 @@
- 	m_thread.start();
- }
- UIBlockTester::~UIBlockTester() {
--  m_thread.terminate();
-+  m_thread.stop();
-   m_thread.wait();
- }
- 	
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.h	2007-05-16 16:36:20.000000000 +0200
-+++ kdevelop-svn/languages/cpp/cppsupportpart.h	2007-05-16 00:25:57.000000000 +0200
-@@ -43,9 +43,10 @@
-     public:
-       UIBlockTesterThread( UIBlockTester& parent );
-       void run();
--      
-+      void stop();
-     private:
-       UIBlockTester& m_parent;
-+      bool m_stop;
-     };
-   friend class UIBlockTesterThread;
- public:
diff --git a/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch b/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch
new file mode 100644
index 000000000000..e2a74825ff94
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch
@@ -0,0 +1,48 @@
+Index: parts/outputviews/makewidget.cpp
+===================================================================
+--- parts/outputviews/makewidget.cpp	(Revision 780035)
++++ parts/outputviews/makewidget.cpp	(Revision 780036)
+@@ -532,28 +532,31 @@
+ {
+     QString sline;
+     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
++    
+     if( forceCLocale )
+         sline = QString::fromAscii( stdoutbuf+line );
+     else
+         sline = QString::fromLocal8Bit( stdoutbuf+line );
+-    stdoutbuf.truncate(0);
+ 
+     if ( !appendToLastLine( sline ) )
+         m_directoryStatusFilter.processLine( sline );
++    stdoutbuf.truncate(0);
+ }
+ 
+ void MakeWidget::insertStderrLine( const QCString& line )
+ {
+     QString sline;
+     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
++    
+     if( forceCLocale ) {
+         sline = QString( stderrbuf+line );
+     }
+     else
+         sline = QString::fromLocal8Bit( stderrbuf+line );
++    
++    if ( !appendToLastLine( sline ) )
++        m_errorFilter.processLine( sline );
+     stderrbuf.truncate(0);
+-    if ( !appendToLastLine( line ) )
+-        m_errorFilter.processLine( line );
+ }
+ 
+ void MakeWidget::slotProcessExited(KProcess *)
+@@ -832,7 +835,7 @@
+ 
+ void MakeWidget::storePartialStdoutLine(const QCString & line)
+ {
+-    stderrbuf += line;
++    stdoutbuf += line;
+ }
+ 
+ #include "makewidget.moc"
diff --git a/dev-util/kdevelop/kdevelop-3.4.1.ebuild b/dev-util/kdevelop/kdevelop-3.5.1.ebuild
index c417c9886cff..ece410c39ee6 100644
--- a/dev-util/kdevelop/kdevelop-3.4.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.5.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v 1.11 2008/02/03 14:26:38 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.1.ebuild,v 1.1 2008/03/18 21:48:26 zlin 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/3.5.7/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/3.5.8/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 
 SLOT="3"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
 
 DEPEND="sys-devel/gdb
@@ -27,8 +27,6 @@ DEPEND="${DEPEND}
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/kdevelop-3.4.1-hang-fix.diff"
-
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
@@ -50,11 +48,14 @@ src_unpack() {
 		cp "${i}" "${S}/parts/appwizard/common/admin/"
 	done
 
+	epatch "${FILESDIR}"/${P}_fix_missing_output.patch
+
 	rm -f "${S}/configure"
 }
 
 src_compile() {
-	local myconf="--with-kdelibsdoxy-dir=$(kde-config --prefix)/share/doc/HTML/en/kdelibs-apidocs"
+	local myconf
+	myconf="--with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
 
 	# languages
 	myconf="${myconf} $(use_enable java) $(use_enable python)