Version bump.

(Portage version: 2.1.2.7)

4 files changed, 162 insertions, 1 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 436289612d37..b7926b0626b4 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.141 2007/02/16 15:44:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.142 2007/05/23 11:43:38 carlo Exp $
+
+*kdevelop-3.4.1 (23 May 2007)
+
+  23 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdevelop-3.4.1-hang-fix.diff, +kdevelop-3.4.1.ebuild:
+  Version bump.
 
   16 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   kdevelop-3.4.0-r2.ebuild:
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.4.1 b/dev-util/kdevelop/files/digest-kdevelop-3.4.1
new file mode 100644
index 000000000000..9c8485a0241c
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.4.1
@@ -0,0 +1,3 @@
+MD5 abc6cc2831ad4c0f4da9fba9e38edce1 kdevelop-3.4.1.tar.bz2 9368912
+RMD160 c24ee5a999334345c521ddd70f51b8d2e4aa38d6 kdevelop-3.4.1.tar.bz2 9368912
+SHA256 f917321e6c4c35861aad7f9990f98f7b988fa4756ade624c9866f999a4845ef8 kdevelop-3.4.1.tar.bz2 9368912
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
new file mode 100644
index 000000000000..0d2a2c9e520b
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.4.1-hang-fix.diff
@@ -0,0 +1,54 @@
+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/kdevelop-3.4.1.ebuild b/dev-util/kdevelop/kdevelop-3.4.1.ebuild
new file mode 100644
index 000000000000..2549b635a8d2
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-3.4.1.ebuild
@@ -0,0 +1,98 @@
+# 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.1.ebuild,v 1.1 2007/05/23 11:43:38 carlo 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"
+
+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.1
+	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-2.5.33"
+need-kde 3.5
+
+
+PATCHES="${FILESDIR}/kdevelop-3.4.1-hang-fix.diff"
+
+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
+
+	rm -f "${S}/configure"
+}
+
+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=${ROOT}$(db_includedir)
+		   --with-db-lib=$(db_libname)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# Default to exuberant-ctags so that we don't end up trying to run emacs's
+	# ctags.
+	cat - >> "${D}/usr/share/config/kdeveloprc" <<EOF
+
+[CTAGS]
+ctags binary=/usr/bin/exuberant-ctags
+
+EOF
+}
+
+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."
+}