Add patch to fix support for custom makefiles (#86780). Update the template for KDE projects (see kde bug 104386).

Package-Manager: portage-2.0.51.22-r1

5 files changed, 102 insertions, 2 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 014f1a5af0a2..620e7656289a 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.89 2005/07/08 07:50:45 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.90 2005/07/16 07:58:37 greg_g Exp $
+
+*kdevelop-3.2.1-r1 (16 Jul 2005)
+
+  16 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdevelop-3.2.1-makefiles.patch, +kdevelop-3.2.1-r1.ebuild:
+  Add patch to fix support for custom makefiles (#86780). Update the template
+  for KDE projects (see kde bug 104386).
 
   03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> kdevelop-3.2.1.ebuild:
   we depend on cervisia for cvs support
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 4c0ee73833fe..546b4b518c76 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,10 +1,13 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 b4fd6e5c50c19d113c9d9ed1650fcd39 kdevelop-3.2.1-r1.ebuild 2862
 MD5 f655767a8b91ae8cb1d3f14492ee6834 kdevelop-3.1.2.ebuild 2722
-MD5 414f11dfd32d327c9d5bd2865a4c5a3b ChangeLog 13913
+MD5 b2ca502d2b25d22a548ecdcb73df02f6 ChangeLog 14185
 MD5 d38abdd4874e7ceda8abefbe79b8a588 kdevelop-3.2.1.ebuild 2603
 MD5 b7e0a740f84187b6165568ddc5ba978b kdevelop-3.2.0.ebuild 2592
 MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
+MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1-r1 68
 MD5 72bf5d9a24a821f9584ec59ccf1a2d6e files/kdevelop-3.2.1-gcc4.patch 446
+MD5 1760f21a5c2d5c152495c12af8232d04 files/kdevelop-3.2.1-makefiles.patch 815
 MD5 9baadc6b0dcbb08db8c865897cf4cf43 files/kdevelop-3.1.0-bdb-mutex.patch 656
 MD5 ec01bfff42fec724ae7c4a9a10bd9eaf files/digest-kdevelop-3.2.0 68
 MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1 68
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.2.1-r1 b/dev-util/kdevelop/files/digest-kdevelop-3.2.1-r1
new file mode 100644
index 000000000000..fc7ad7d07dd5
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.2.1-r1
@@ -0,0 +1 @@
+MD5 7a5e9f2fb8a9539a41541dba566a234a kdevelop-3.2.1.tar.bz2 8335006
diff --git a/dev-util/kdevelop/files/kdevelop-3.2.1-makefiles.patch b/dev-util/kdevelop/files/kdevelop-3.2.1-makefiles.patch
new file mode 100644
index 000000000000..62cf8d532876
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.2.1-makefiles.patch
@@ -0,0 +1,12 @@
+diff -Nur kdevelop-3.2.1.orig/buildtools/custommakefiles/customprojectpart.cpp kdevelop-3.2.1/buildtools/custommakefiles/customprojectpart.cpp
+--- kdevelop-3.2.1.orig/buildtools/custommakefiles/customprojectpart.cpp	2005-05-23 14:09:32.000000000 +0200
++++ kdevelop-3.2.1/buildtools/custommakefiles/customprojectpart.cpp	2005-07-15 12:10:59.000000000 +0200
+@@ -188,7 +188,7 @@
+ 
+     if( fcontext->urls().size() == 1 )
+     {
+-        QString contextFileName = URLUtil::canonicalPath(fcontext->urls().first().fileName());
++        QString contextFileName = URLUtil::canonicalPath(fcontext->urls().first().path());
+         bool inProject = project()->isProjectFile(contextFileName);
+         QString popupstr = QFileInfo(contextFileName).fileName();
+         if (contextFileName.startsWith(projectDirectory()+ "/"))
diff --git a/dev-util/kdevelop/kdevelop-3.2.1-r1.ebuild b/dev-util/kdevelop/kdevelop-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..508a54a98312
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-3.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.2.1-r1.ebuild,v 1.1 2005/07/16 07:58:37 greg_g Exp $
+
+inherit kde eutils
+
+DESCRIPTION="Integrated Development Enviroment for Unix, supporting KDE/Qt, C/C++ and a many other languages."
+HOMEPAGE="http://www.kdevelop.org"
+SRC_URI="mirror://kde/stable/${PV/#3.2/3.4}/src/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ada clearcase fortran haskell java pascal perforce perl php python ruby sql subversion"
+
+DEPEND="dev-lang/perl
+	sys-devel/flex
+	sys-devel/gdb
+	subversion? ( dev-util/subversion )
+	|| ( kde-base/cervisia kde-base/kdesdk )"
+
+need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	# See bug #86780 and kde bug 98852.
+	epatch "${FILESDIR}/${P}-makefiles.patch"
+
+	# 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=${KDEDIR}/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 clearcase) $(use_enable perforce)
+			$(use_enable subversion)"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	einfo "kdevelop can use a wide range of apps for extra functionality. This is an almost"
+	einfo "complete list. All these packages can be emerged after kdevelop."
+	einfo
+	einfo "kde-base/kdebase:               (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	einfo "dev-util/kdbg:                  (RECOMMENDED) kde frontend to gdb"
+	einfo "dev-util/valgrind:              (RECOMMENDED) integrates valgrind (memory debugger) commands"
+	einfo "kde-base/kompare:               (RECOMMENDED) show differences between files"
+	einfo "dev-java/ant:                   support projects using the ant build tool"
+	einfo "dev-util/ctags:                 faster and more powerful code browsing logic"
+	einfo "app-doc/doxygen:                generate KDE-style documentation for your project"
+	einfo "net-www/htdig:                  index and search your project's documentation"
+	einfo "app-arch/rpm:                   support creating RPMs of your project"
+	einfo "app-emulation/visualboyadvance: create and run projects for this gameboy"
+	einfo
+	einfo "Support for GNU-style make, tmake, qmake is included."
+	einfo "Support for using clearcase, perforce and subversion"
+	einfo "as version control systems is optional."
+}