Revision bump, EAPI 2'ed, slotted and prefixed

Also it solves bug 237304, bug 259094, bug 251484
Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 153 insertions, 3 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 08da55f9a346..204b919701c1 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.174 2009/04/06 12:07:40 scarabeus Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.175 2009/05/13 13:40:48 tampakrap Exp $
+
+*kdevelop-3.5.4-r1 (13 May 2009)
+
+  13 May 2009; Theo Chatzimichos <tampakrap@gentoo.org> +kdevelop-3.5.4-r1.ebuild,
+  +files/kdevelop-3.5-lexer.patch, +files/kdevelop-3.5-parallel.patch:
+  Revision bump, EAPI 2'ed, slotted and prefixed
+  Also it solves bug 237304, bug 259094, bug 251484
 
   06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kdevelop-3.9.91.ebuild:
   Preparation for new eclass. Unprefixing misc apps.
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 31cc55279b15..25b13bcdb631 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
+AUX kdevelop-3.5-lexer.patch 510 RMD160 e113f4e01c05704fd06870139e66729bfcd6601c SHA1 baeef6d2af05c2f45d1b0c840c8a3b878a500e3b SHA256 00e723b0c6a9a615b75dde6bf26b78c6200e855c1b51ad0fc5548b0704585c59
+AUX kdevelop-3.5-parallel.patch 603 RMD160 138fb288a2c0c157f5be2760319449f8c6bcc576 SHA1 816250066e394c9a77c451dc64450cfc052dda69 SHA256 0a54a7e23db4c447d65082055c9bd198828bf1f792b02d63185df829bae40198
 AUX kdevelop-3.5.0-scope.patch 3722 RMD160 342fd6bc3ed07aa2c39a27fedce02cc247280a25 SHA1 e3d30bd0ec7be8c830d525a83c4bd7622167db6e SHA256 9183f191163048aa481769ea620d81f89ba2d8e4d7b33ce6bd55f1c5400eeeef
 AUX kdevelop-3.5.1_fix_missing_output.patch 1460 RMD160 9c0f7f367fd2ae4399cf442bc36f5c16b72b8272 SHA1 71a8d86e2365f8794c0263c603d0281f3886d608 SHA256 504d1d208781e7ae67be4240c1acbe5e0e5723d56948f1f81b932edd42292cd0
 DIST kdevelop-3.5.0.tar.bz2 9415312 RMD160 fad1adda009eaa7fc6a6533a6bf211e3f1fa23fa SHA1 e46eb17bcf83e9a31c120bd6b872347b7a606dcf SHA256 d05afebfc9a8b61ca0fbc6dbe2341d7f6b0762cf76573abdc20d1147068c8aaa
@@ -12,7 +14,8 @@ EBUILD kdevelop-3.5.1.ebuild 3811 RMD160 e08935d84acd66c7a2c41b648e4f8e4944db9bf
 EBUILD kdevelop-3.5.2-r1.ebuild 3918 RMD160 ca03e383c866d2464ca143d782a4175dfe6a43e2 SHA1 818134f688da28a9d2c6aed1e64c57b5f3d0f934 SHA256 db55faf9bef2ba3ffc89aa6a2628f71629b9bd396df08038be9200132bcb5dc1
 EBUILD kdevelop-3.5.2.ebuild 3746 RMD160 5f911bd2b5de1160d811398fbaba68a3cdbbe522 SHA1 bba615c8e548594c41fdae31d2bb82886b059e95 SHA256 3aa4a7baa9faada46747b040c829ac2498010dca021776da4802dd0ea3327cfa
 EBUILD kdevelop-3.5.3.ebuild 3807 RMD160 90bf83ec9209056b40a76c84608cc54a92604b48 SHA1 2a8d7716375654f89eefbdb99182483f26892c1f SHA256 3f777b78d129fb2e9b0fba3842612cf956010957f116f7b876d1f3d2ca7cd2fe
+EBUILD kdevelop-3.5.4-r1.ebuild 3724 RMD160 922b99c2e662d01061ca2fdfa3a463a665d7a221 SHA1 c498e713c8acf9dd0fa978e254ce961e30ffe6b2 SHA256 2821ed4c78efa0c3b0399990ef304ed6b2a2391481e90613febabfb0aeef1ec7
 EBUILD kdevelop-3.5.4.ebuild 3819 RMD160 9e75f4846aed6b93aa2a2d5169589f85fdf579c3 SHA1 dece2c491c74c6094d6e127ceb3cf0b459d9b9ae SHA256 f9afd5ed381c0fb41f3339bc38b6c1638d26a56b16933eafd98fedf88f3fbaf1
 EBUILD kdevelop-3.9.91.ebuild 1097 RMD160 747bc3fffae733823b685b0262a9e1335156dc77 SHA1 0cdea04de10868363d3f393ca1bf1a7a981b579d SHA256 2ba214db38d587707d20ce56cacad97bb752c9090ff53e9bc8331179f4eb36b8
-MISC ChangeLog 26724 RMD160 df5ede145d3de7af5f9de660b05fd26fbeff4390 SHA1 565ec5a384f8e88f907874f02cfa8471870d5ce3 SHA256 633437ae3301349491b8361e6d7492e867c9fa80fefd99be42235075b72dc453
+MISC ChangeLog 27014 RMD160 0651e0b71da1e50ecd68e9f0f1df1eb2878c4c59 SHA1 633acde5ecd5925618925367e475ae681c3ec5a5 SHA256 ef08c75d2309bd76f913328addcd50857f8c5c221ab1c2b6297240881be56977
 MISC metadata.xml 774 RMD160 302bfcd12495aacf01ffc4bdb03943b3af2353bd SHA1 ab99a32d6791631b9d256c1244a2962fcd853cd5 SHA256 88046dbf5f297870614fb4907fe6c88bbc7ddc11966fe793aa6e9d2370c013bc
diff --git a/dev-util/kdevelop/files/kdevelop-3.5-lexer.patch b/dev-util/kdevelop/files/kdevelop-3.5-lexer.patch
new file mode 100644
index 000000000000..08a1d28a51b4
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.5-lexer.patch
@@ -0,0 +1,14 @@
+Index: lib/cppparser/lexer.cpp
+===================================================================
+--- lib/cppparser/lexer.cpp	(revision 926528)
++++ lib/cppparser/lexer.cpp	(working copy)
+@@ -241,7 +241,7 @@
+         m_startLine = false;
+         int ppe = preprocessorEnabled();
+ 	setPreprocessorEnabled( false );
+-	while( currentChar() && currentChar() != '\n' ){
++	while( !currentChar().isNull() && currentChar() != '\n' ){
+             Token tok(m_source);
+             nextToken( tok, true );
+         }
+
diff --git a/dev-util/kdevelop/files/kdevelop-3.5-parallel.patch b/dev-util/kdevelop/files/kdevelop-3.5-parallel.patch
new file mode 100644
index 000000000000..7061f899abe4
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.5-parallel.patch
@@ -0,0 +1,11 @@
+--- src/profileengine/editor/Makefile.am 2007-12-01 00:34:47.000000000 +0200
++++ src/profileengine/editor/Makefile.am 2009-05-02 20:26:30.000000000 +0300
+@@ -6,7 +6,7 @@
+ libprofileeditor_la_LDFLAGS = $(all_libraries)
+ libprofileeditor_la_LIBADD = $(top_builddir)/src/profileengine/lib/libprofileengine.la
+ noinst_LTLIBRARIES = libprofileeditor.la
+-libprofileeditor_COMPILE_FIRST = profileeditorbase.h
++libprofileeditor_COMPILE_FIRST = profileeditorbase.h addprofilewidget.h
+ libprofileeditor_la_SOURCES = profileeditorbase.ui profileeditor.cpp \
+ 	addprofilewidget.ui
+ noinst_HEADERS = profileeditor.h
diff --git a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..f7a09e2d1384
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild,v 1.1 2009/05/13 13:40:48 tampakrap Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+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.10/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
+
+DEPEND="!<dev-util/kdevelop-3.5.4-r1
+	sys-devel/gdb
+	>=sys-libs/db-4.1
+	cvs? ( || ( kde-base/cervisia:3.5 kde-base/kdesdk:3.5 ) )"
+
+RDEPEND="${DEPEND}
+	subversion? ( || ( kde-base/kdesdk-kioslaves:3.5 kde-base/kdesdk:3.5[subversion] ) )"
+DEPEND="${DEPEND}
+	>=sys-devel/flex-2.5.33"
+
+need-kde 3.5
+
+PATCHES=( "${FILESDIR}/kdevelop-3.5-lexer.patch"
+	"${FILESDIR}/kdevelop-3.5-parallel.patch" )
+
+pkg_setup() {
+	elog
+	elog "If you get build failure similar as bug 237304"
+	elog "please build with MAKEOPTS=\"-j1\""
+	elog
+}
+
+src_prepare() {
+	# 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"
+
+	kde_src_prepare
+}
+
+src_configure() {
+	local myconf
+	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 cvs) $(use_enable clearcase)
+		$(use_enable perforce) $(use_enable subversion)"
+
+	# Explicitly set db include directory (bug 128897)
+	myconf="${myconf} --with-db-includedir=$(db_includedir)
+			--with-db-lib=$(db_libname)"
+
+	kde_src_configure
+}
+
+src_install() {
+	kde_src_install
+
+	# Default to exuberant-ctags so that we don't end up trying to run emacs's
+	# ctags.
+	cat <<-EOF >> "${D}/usr/share/config/kdeveloprc"
+
+	[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:3.5:    (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:3.5:    (RECOMMENDED) show differences between files"
+	elog "media-gfx/graphviz:        (RECOMMENDED) support the new graphical classbrowser"
+	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."
+	elog
+	elog "If you get build failure similar as bug 237304"
+	elog "please build with MAKEOPTS=\"-j1\""
+	elog
+}