Commit compilation fix from bug #36545

4 files changed, 15 insertions, 70 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 5c51fc77c7a3..feffa1aaf99a 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.46 2004/02/18 17:47:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.47 2004/03/01 00:04:18 caleb Exp $
+
+  29 Feb 2004; Caleb Tennis <caleb@gentoo.org>
+  files/kdevelop-2.1.5-gentoo.diff:
+  Modify the patch to include the fix for bug #36545.
 
 *kdevelop-3.0.1 (18 Feb 2004)
 
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1 b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1
deleted file mode 100644
index d103bdc11f4f..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3d8e6ce937499f2432cd264b962f113 kdevelop-3.0.0r1.tar.bz2 4995832
diff --git a/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff b/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
index d36786b590e3..4c00537b74dd 100644
--- a/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
+++ b/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
@@ -79,3 +79,13 @@
  
    m_pInstallState->make	 = CToolClass::searchInstProgram("make");
    m_pInstallState->gmake = CToolClass::searchInstProgram("gmake");
+--- kdevelop/doctreeview.cpp.orig	2003-12-29 16:26:45.000000000 +0100
++++ kdevelop/doctreeview.cpp	2003-12-29 16:27:00.000000000 +0100
+@@ -826,7 +826,7 @@
+     void changePathes();
+     virtual void refresh();
+     #if KDE_QTVER >= 3
+-    void DocTreeKDELibsFolder::appendBooks(QDir dir);
++    void appendBooks(QDir dir);
+     #endif
+ };
diff --git a/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild b/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild
deleted file mode 100644
index 19aa9a09bfe8..000000000000
--- a/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild,v 1.2 2004/01/19 19:38:28 caleb Exp $
-
-inherit distutils kde
-need-kde 3.1
-
-IUSE="doc java python ruby"
-MY_P="kdevelop-3.0.0r1"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="KDevelop is an easy to use C/C++ IDE for Unix. It supports KDE/Qt, GNOME, plain C and C++ projects."
-SRC_URI="mirror://kde/unstable/3.1.95/src/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.kdevelop.org"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-SLOT=3
-# -j2 and greater fails - see bug #6199
-# export MAKEOPTS="$MAKEOPTS -j1"
-
-DEPEND=">=kde-base/kdebase-3.1.0
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gdb
-	java? ( virtual/jdk dev-java/ant )
-	python? ( dev-lang/python )
-	doc? ( app-doc/doxygen )"
-
-myconf="$myconf --with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
-
-distutils_python_version
-
-use java && myconf="$myconf --enable-javasupport --with-java=`java-config --jdk-home`" || myconf="$myconf --disable-javasupport"
-use python && myconf="$myconf --enable-scripting --with-pythondir=/usr/lib/python${PYVER}" || myconf="$myconf --disable-scripting"
-use ruby || myconf="$myconf --disable-ruby"
-
-src_unpack()
-{
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-mainwindow.patch
-}
-
-pkg_postinst() {
-
-einfo "kdevelop can use a wide range of apps for extra functionality. This is an almost"
-einfo "complete list. If you want subversion support, you must emerge it and then re-emerge"
-einfo "kdevelop; all other packages can be emerged after kdevelop."
-einfo
-einfo "dev-util/cvs:		provide frontend for cvs version control system"
-einfo "net-misc/x11-ssh-askpass		for use with SSH protected CVS systems"
-einfo "dev-util/subversion		ditto for subversion. However much newer version of"
-einfo "				subversion is needed than exists in portage atm"
-einfo "perforce			ditto for perforce system. No ebuild exists atm"
-einfo ">=dev-util/ctags-5		faster and more powerful code browsing logic"
-einfo "dev-util/kdoc		tools to generate KDE-style documentation for your project"
-einfo "app-misc/glimpse		index and search your project's documentation"
-einfo "net-www/htdig		ditto. yet another supoprted indexing/searching backend"
-einfo "dev-util/kdbg		kde frontend to gdb"
-einfo "app-arch/rpm			supports creating RPMs of your project"
-einfo "kde-base/kdebase		embed konsole kpart in kdevelop ide"
-einfo "kde-base/kdesdk		use kompare widget for showing the output of diff"
-einfo "dev-util/valgrind		integrates valgrind (memory debugger) commands"
-einfo "app-emulation/		create and run projects for this gameboy"
-einfo "	visualboyadvance	/gameboy color/gameboy advance emulator"
-einfo
-einfo "Support for GNU-style make, tmake, qmake and probably jam and other systems is included."
-einfo "There is also php, fortran, ruby, java etc. support - use your favourite package, I suppose."
-
-}