Fix bug 233613, remove old ones

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 25 insertions, 575 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 204b919701c1..9d629631baec 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/kdevelop
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.176 2009/05/25 19:50:57 tampakrap Exp $
+
+  25 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kdevelop-3.5.0.ebuild, -kdevelop-3.5.1.ebuild, -kdevelop-3.5.2.ebuild,
+  -kdevelop-3.5.3.ebuild, -kdevelop-3.5.4.ebuild, kdevelop-3.5.4-r1.ebuild:
+  Fix bug 233613, remove old ones
 
 *kdevelop-3.5.4-r1 (13 May 2009)
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 25b13bcdb631..eaf7d57da599 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,21 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-DIST kdevelop-3.5.1.tar.bz2 9454994 RMD160 5183530fcacc318c1647bfc986433a9391ca9793 SHA1 a37168d0002d476cd3c037add53d58869ad3f4dd SHA256 d01765d01feadf011bfb56cfcdeb49f061475f94cae6f0a28755f100df5de97a
+DIST kdevelop-3.5-patchset-01.tar.bz2 28386 RMD160 4f7fd0317f1ce6f9e44bcdb20768473ee7b9a9cb SHA1 66e29714f6cc09293c8ad20e875df50c28657001 SHA256 b226bbd5d8f5aa22b9afdebd50befcc95df7e09868be7158d4c735df16306d7f
 DIST kdevelop-3.5.2-post-rev823459.diff.tar.bz2 4397 RMD160 03c4a7d2d0cfbbc8838c7ff8b9da181017fdb42a SHA1 665859106dfe0c20eab53ea55be1a62cf75249fa SHA256 6271a72c7991d4b2bc9728b00e9153c32a19d3fe513152793dd908336bd57788
 DIST kdevelop-3.5.2.tar.bz2 8422999 RMD160 fd4ab60b9ae79c0a65ce550c2ffed2f195be648c SHA1 b6a3c055977e2bb4b9904008ddb01e7e406dff7f SHA256 872f6787212b95cc11f6f0b02b93f8162447a9e5abf1d0ccccaac6d2e9431720
-DIST kdevelop-3.5.3.tar.bz2 9486955 RMD160 4c80dd81253fbca990f2987258e70b38681f0737 SHA1 1577f195c1e0b00d8121f0d2b61dd76c6a3c7b53 SHA256 5e51ab5f6f1b5a729e07d1ba17ec436c829bd3c9929c1cf63d9a01ab9fa34fa5
 DIST kdevelop-3.5.4.tar.bz2 9571281 RMD160 63282181bf8c66a556b451973d077a04d028db7e SHA1 4b51f23b26705de61fdbffa5f0ce31ff71586eed SHA256 51ea20606111f8cfaa8878951ab313199d6fdc0f920f3dcd53fd8f4bcf8de318
 DIST kdevelop-3.9.91.tar.bz2 2634061 RMD160 0023b6caf49657c94ca4b48007ef2d0c35d11c94 SHA1 4a3efa96066a5a0f39b65fbddb95115f23852141 SHA256 ea57e272d6161e5d152f322e0c4713acddcc4218e06c26bb486214a6aee74fb9
-EBUILD kdevelop-3.5.0.ebuild 3838 RMD160 5db7cd41b64b79df2501c552813c718f1c73e024 SHA1 b17d77ab6d4d2d13de0debe872ff2c93450cd542 SHA256 d358d0c2025c11d8d2299c8d32e285ab203acc23868c8deaf3caf33e40e972bf
-EBUILD kdevelop-3.5.1.ebuild 3811 RMD160 e08935d84acd66c7a2c41b648e4f8e4944db9bf7 SHA1 917a1120ace497886ae5932477fa4e655a460100 SHA256 5f4c8d1439f4798e98edfdad0dc1a6737b007d8e79f1bbf0a712e0d82baae942
 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.5.4-r1.ebuild 3864 RMD160 0c47dc9420eb8a63f628db81be29c315fcf3c8a9 SHA1 e88365fa05801fb9c05918a0d65cf2e40731c69a SHA256 86937970d6c6a9b9612146f6614b3f1e460fe6d44be59c2349333d1762b2f992
 EBUILD kdevelop-3.9.91.ebuild 1097 RMD160 747bc3fffae733823b685b0262a9e1335156dc77 SHA1 0cdea04de10868363d3f393ca1bf1a7a981b579d SHA256 2ba214db38d587707d20ce56cacad97bb752c9090ff53e9bc8331179f4eb36b8
-MISC ChangeLog 27014 RMD160 0651e0b71da1e50ecd68e9f0f1df1eb2878c4c59 SHA1 633acde5ecd5925618925367e475ae681c3ec5a5 SHA256 ef08c75d2309bd76f913328addcd50857f8c5c221ab1c2b6297240881be56977
+MISC ChangeLog 27255 RMD160 a6d1a1229ada7f0fa0a4454ab5609585a47d105d SHA1 964ffc98db24fe2850285a7b0b92927f52241bb7 SHA256 1a0719b7d3582c32ecaaae77316b2c7f737112c825eab3afc920a6341bd1fd99
 MISC metadata.xml 774 RMD160 302bfcd12495aacf01ffc4bdb03943b3af2353bd SHA1 ab99a32d6791631b9d256c1244a2962fcd853cd5 SHA256 88046dbf5f297870614fb4907fe6c88bbc7ddc11966fe793aa6e9d2370c013bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoa9qsACgkQjDdoMVfcAHiaUgCgxyOQ7ljpe3OYIaU82h7OIBht
+gDkAoMLAq0Bl19xdnooR3mnsJg0bYM/y
+=2eWN
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/kdevelop-3.5.0.ebuild b/dev-util/kdevelop/kdevelop-3.5.0.ebuild
deleted file mode 100644
index b68326d5c019..000000000000
--- a/dev-util/kdevelop/kdevelop-3.5.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.7 2008/02/03 14:26:38 zlin 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/3.5.8/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"
-
-DEPEND="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* ) )"
-DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if use subversion && \
-		has_version =kde-base/kdesdk-3.5* && \
-		! built_with_use =kde-base/kdesdk-3.5* subversion; then
-		eerror "To build this package with USE=subversion"
-		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
-		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
-	fi
-}
-
-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
-
-	# Fix some post-3.5.8 quirks in qmake.
-	epatch "${FILESDIR}/${P}-scope.patch"
-
-	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=$(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 <<-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 "OR =kde-base/kdebase-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."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.5.1.ebuild b/dev-util/kdevelop/kdevelop-3.5.1.ebuild
deleted file mode 100644
index 3704c63a755d..000000000000
--- a/dev-util/kdevelop/kdevelop-3.5.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.1.ebuild,v 1.2 2008/03/19 11:31:21 zlin 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/3.5.9/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"
-
-DEPEND="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* ) )"
-DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if use subversion && \
-		has_version =kde-base/kdesdk-3.5* && \
-		! built_with_use =kde-base/kdesdk-3.5* subversion; then
-		eerror "To build this package with USE=subversion"
-		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
-		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
-	fi
-}
-
-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
-
-	epatch "${FILESDIR}"/${P}_fix_missing_output.patch
-
-	rm -f "${S}/configure"
-}
-
-src_compile() {
-	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_compile
-}
-
-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 "OR =kde-base/kdebase-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."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.5.2.ebuild b/dev-util/kdevelop/kdevelop-3.5.2.ebuild
deleted file mode 100644
index df65d01fc0f3..000000000000
--- a/dev-util/kdevelop/kdevelop-3.5.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.2.ebuild,v 1.1 2008/05/19 00:18:23 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://gentoo/${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"
-
-DEPEND="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* ) )"
-DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if use subversion && \
-		has_version =kde-base/kdesdk-3.5* && \
-		! built_with_use =kde-base/kdesdk-3.5* subversion; then
-		eerror "To build this package with USE=subversion"
-		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
-		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
-	fi
-}
-
-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
-	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_compile
-}
-
-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 "OR =kde-base/kdebase-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."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.5.3.ebuild b/dev-util/kdevelop/kdevelop-3.5.3.ebuild
deleted file mode 100644
index 23a57aa9fa17..000000000000
--- a/dev-util/kdevelop/kdevelop-3.5.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.3.ebuild,v 1.1 2008/09/02 10:49:34 keytoaster Exp $
-
-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://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="3"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
-
-DEPEND="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* ) )"
-DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-# -j5 went flawlessly, here...
-#MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if use subversion && \
-		has_version =kde-base/kdesdk-3.5* && \
-		! built_with_use =kde-base/kdesdk-3.5* subversion; then
-		eerror "To build this package with USE=subversion"
-		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
-		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
-	fi
-}
-
-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
-	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_compile
-}
-
-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 "OR =kde-base/kdebase-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."
-}
diff --git a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
index f7a09e2d1384..7d6011e6c976 100644
--- a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild,v 1.2 2009/05/25 19:50:57 tampakrap Exp $
 
 EAPI="2"
 
@@ -10,7 +10,8 @@ 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"
+SRC_URI="mirror://kde/stable/3.5.10/src/${P}.tar.bz2
+	mirror://gentoo/kdevelop-3.5-patchset-01.tar.bz2"
 
 LICENSE="GPL-2"
 
@@ -31,7 +32,9 @@ DEPEND="${DEPEND}
 need-kde 3.5
 
 PATCHES=( "${FILESDIR}/kdevelop-3.5-lexer.patch"
-	"${FILESDIR}/kdevelop-3.5-parallel.patch" )
+	"${FILESDIR}/kdevelop-3.5-parallel.patch"
+	"${WORKDIR}/kdevelop-3.5-libtool.m4.in.patch"
+	"${WORKDIR}/kdevelop-3.5-ltmain.sh.patch" )
 
 pkg_setup() {
 	elog
diff --git a/dev-util/kdevelop/kdevelop-3.5.4.ebuild b/dev-util/kdevelop/kdevelop-3.5.4.ebuild
deleted file mode 100644
index d3e56e2ba9d2..000000000000
--- a/dev-util/kdevelop/kdevelop-3.5.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.ebuild,v 1.1 2009/01/05 16:38:50 patrick Exp $
-
-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"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
-
-DEPEND="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* ) )"
-DEPEND="${DEPEND}
-	>=sys-devel/flex-2.5.33"
-
-need-kde 3.5
-
-# -j5 went flawlessly, here...
-#MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if use subversion && \
-		has_version =kde-base/kdesdk-3.5* && \
-		! built_with_use =kde-base/kdesdk-3.5* subversion; then
-		eerror "To build this package with USE=subversion"
-		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
-		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
-	fi
-}
-
-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
-	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_compile
-}
-
-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 "OR =kde-base/kdebase-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."
-}