version bump, please look at changelog for details

4 files changed, 159 insertions, 1 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 2a8d23dbb529..c2d426ce714b 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.20 2003/01/30 20:01:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.21 2003/02/04 18:36:03 hannes Exp $
+
+*kdevelop-2.1.5 (04 Feb 2003)
+
+  04 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdevelop-2.1.5.ebuild:
+  version bump, thanks to Sascha Herrmann <Sascha.Herrmann@web.de> for
+  help in bug #14536, this should also fix bug #3875, bug #14971, bug #8113,
+  and bug #9958
 
   30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/dev-util/kdevelop/files/digest-kdevelop-2.1.5 b/dev-util/kdevelop/files/digest-kdevelop-2.1.5
new file mode 100644
index 000000000000..c69aa1a731c4
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-2.1.5
@@ -0,0 +1,3 @@
+MD5 8953caa03c22aabe6707ca494a0d4a41 kdevelop-2.1.5_for_KDE_3.1.tar.bz2 5792839
+MD5 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 1096541
+MD5 a15d1f21ea2af5e0dd7e325a32551dfc kdevelop-2.1.3-qt-templates.tar.gz 27385
diff --git a/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff b/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
new file mode 100644
index 000000000000..d36786b590e3
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
@@ -0,0 +1,81 @@
+--- kdevelop/setup/wizardkdedocpage.cpp	2003-01-14 01:41:20.000000000 +0100
++++ kdevelop/setup/wizardkdedocpage.cpp	2003-02-04 16:56:00.000000000 +0100
+@@ -39,10 +39,8 @@
+   bool kde_docs_found=false;
+ 
+   QStringList kde_dirs;
+-  kde_dirs  << "/opt/kde2/share/doc/HTML/en/kdelibs"     // normal dist
+-//!? conflict with KDE-1.x            << "/opt/kde/share/doc/HTML/en/kdelibs"     // normal dist
+-            << "/usr/share/doc/kdelibs"                 // Redhat 6.0
+-            << "/usr/local/kde/share/doc/kdelibs"       // other locations
++  kde_dirs  << "/usr/kde/3.1/share/doc/HTML/en/kdelibs-apidocs"
++            << "/usr/kde/3.2/share/doc/HTML/en/kdelibs-apidocs"
+             << KDELIBS_DOCDIR;    // autoconf said
+ 
+   // first check the autoconfified path
+--- kdevelop/setup/ccreatedocdatabasedlg.cpp	2002-06-07 01:45:09.000000000 +0200
++++ kdevelop/setup/ccreatedocdatabasedlg.cpp	2003-02-04 17:32:26.000000000 +0100
+@@ -192,7 +192,7 @@
+ 
+ void CCreateDocDatabaseDlg::slotOkClicked()
+ {
+-  if(!QFile::exists(m_kdeDocDir + "/kdeui/KDialog.html") && kde_checkbox->isChecked()){
++  if(!QFile::exists(m_kdeDocDir + "/kdeui/html/classKDialog.html") && kde_checkbox->isChecked()){
+     KMessageBox::error(0,i18n("The KDE-Documentation-Path isn't set correctly."),i18n("No Database created!"));
+     return;
+   }
+--- kdevelop/setup/wizardcreatekdedocpage.cpp	2002-07-18 02:38:17.000000000 +0200
++++ kdevelop/setup/wizardcreatekdedocpage.cpp	2003-02-04 17:42:10.000000000 +0100
+@@ -65,7 +65,7 @@
+ //    kde_dir->mkdir(".kde/share/apps/kdevelop",false);
+ //    kde_dir->mkdir(".kde/share/apps/kdevelop/KDE-Documentation",false);
+ 
+-    if(!QFile::exists(m_pInstallState->kde + "/kdeui/KDialog.html")) {
++    if(!QFile::exists(m_pInstallState->kde + "/kdeui/html/classKDialog.html")) {
+       m_pInstallState->kde = docDir;
+     }
+     pDlg = new CUpdateKDEDocDlg(m_pInstallState->shell_process, docDir, m_pInstallState->qt, wdg, false, "test");
+--- kdevelop/setup/ckdevinstall.cpp	2002-07-18 02:38:17.000000000 +0200
++++ kdevelop/setup/ckdevinstall.cpp	2003-02-04 17:43:36.000000000 +0100
+@@ -62,7 +62,7 @@
+   m_config->setGroup("Doc_Location");
+   QString qtDocuPath = m_config->readEntry("doc_qt", QT_DOCDIR);
+   QString kdeDocuPath = m_config->readEntry("doc_kde", KDELIBS_DOCDIR);
+-  if(!QFile::exists(kdeDocuPath + "/kdeui/KDialog.html"))
++  if(!QFile::exists(kdeDocuPath + "/kdeui/html/classKDialog.html"))
+     kdeDocuPath = KDELIBS_DOCDIR;
+   m_pInstallState = new CKDevInstallState( qtDocuPath, kdeDocuPath);
+ 
+--- kdevelop/ctags/cctags_interf.h	2001-07-23 17:38:09.000000000 +0200
++++ kdevelop/ctags/cctags_interf.h	2003-02-04 17:55:57.000000000 +0100
+@@ -31,7 +31,7 @@
+ public:
+   CTagsCommandLine() {                    // long form of arguments
+     m_onlyProjectFiles=false;
+-    m_command = "ctags";
++    m_command = "exuberant-ctags";
+     m_append = "";                        //--append=no      [default]
+     m_sort = "-u";                        //--sort=no
+     m_totals = "--totals";                //--totals=yes
+--- kdevelop/ckdevelop_project.cpp	2002-06-25 16:59:59.000000000 +0200
++++ kdevelop/ckdevelop_project.cpp	2003-02-04 18:58:30.000000000 +0100
+@@ -1356,7 +1356,7 @@
+ void CKDevelop::slotProjectMakeTags()
+ {
+   slotStatusMsg(i18n("Creating tags file..."));
+-  if(!CToolClass::searchInstProgram("ctags")) // no dialog
++  if(!CToolClass::searchInstProgram("exuberant-ctags")) // no dialog
+   {
+     KMessageBox::sorry(0,
+       i18n("KDevelop needs \"Exuberant Ctags\" \n for tags based search functionality."),
+--- kdevelop/setup/wizardtoolscheckpage.cpp	2002-07-18 02:38:17.000000000 +0200
++++ kdevelop/setup/wizardtoolscheckpage.cpp	2003-02-04 19:14:09.000000000 +0100
+@@ -59,7 +59,7 @@
+   bool kpaint       = CToolClass::searchInstProgram("kpaint");
+   bool designer     = CToolClass::searchInstProgram("designer");
+   bool linguist     = CToolClass::searchInstProgram("linguist");
+-  bool ctags        = CToolClass::searchInstProgram("ctags");
++  bool ctags        = CToolClass::searchInstProgram("exuberant-ctags");
+ 
+   m_pInstallState->make	 = CToolClass::searchInstProgram("make");
+   m_pInstallState->gmake = CToolClass::searchInstProgram("gmake");
diff --git a/dev-util/kdevelop/kdevelop-2.1.5.ebuild b/dev-util/kdevelop/kdevelop-2.1.5.ebuild
new file mode 100644
index 000000000000..ed124a96e901
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-2.1.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.5.ebuild,v 1.1 2003/02/04 18:36:03 hannes Exp $
+
+inherit kde-base eutils
+need-kde 3.1
+
+IUSE=""
+MY_P=${P}_for_KDE_3.1
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="KDevelop ${PV}"
+HOMEPAGE="http://www.kdevelop.org/"
+SRC_URI="mirror://kde/stable/${P}/src/${MY_P}.tar.bz2
+	ftp://ftp.ee.fhm.edu/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
+	mirror://gentoo/$PN-2.1.3-qt-templates.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+newdepend ">=kde-base/kdebase-3
+	>=dev-util/kdoc-2.0_alpha24
+	>=dev-util/kdbg-1.2.5.3
+	>=net-www/htdig-3.1.6
+	>=app-text/enscript-1.6.1
+	>=app-text/a2ps-4.13b
+	>=dev-util/ctags-5.0.1
+	>=app-text/sgmltools-lite-3.0.3
+	>=app-doc/qt-docs-${QTVER}
+	app-doc/kdelibs-apidocs
+	=sys-devel/flex-2.5.4*
+	sys-devel/perl"
+
+# -j2 and greater fails - see bug #6199
+export MAKEOPTS="$MAKEOPTS -j1"
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}/kdevelop
+	for x in *.desktop; do
+		mv $x $x.2
+		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
+		rm $x.2
+	done
+	cd ${WORKDIR}
+	mv q*.tar.gz ${S}/kdevelop/templates/
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	kde_src_compile
+	cd ${WORKDIR}/c_cpp_reference-2.0.2_for_KDE_3.0
+	econf --with-qt-dir=/usr/qt/3
+	emake
+}
+
+src_install() {
+	kde_src_install
+	# setup htdig for use with kdevelop out-of-the-box (sort of)
+	sed -e "s:_KDEDIR_:${PREFIX}:g" \
+	${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
+	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
+
+	# c/cpp reference package
+	cd ${WORKDIR}/c_cpp_reference-2.0.2_for_KDE_3.0
+	einstall
+}