Fix the patch to fix the qmake parser.

Package-Manager: portage-2.1.2-r9

7 files changed, 31 insertions, 127 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index dcc5639b71de..f6a34c7dbbcf 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.138 2007/02/07 16:31:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.139 2007/02/08 15:26:17 flameeyes Exp $
+
+*kdevelop-3.4.0-r2 (08 Feb 2007)
+
+  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdevelop-3.4.0.ebuild,
+  -kdevelop-3.4.0-r1.ebuild, +kdevelop-3.4.0-r2.ebuild:
+  Fix the patch to fix the qmake parser.
 
 *kdevelop-3.4.0-r1 (07 Feb 2007)
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 947a6343969a..38d66b37b288 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 DIST kdevelop-3.3.2.tar.bz2 8147418 RMD160 b6a5889db770a6bb7aaf71970407fd8c439d25d3 SHA1 5763fdfc4f44f9828db42184243e3e3a95ffe54a SHA256 145c2996e4a9c90881487914aebe11803d2cedd6f363030eb53462c42fa0efd1
 DIST kdevelop-3.3.5.tar.bz2 8178575 RMD160 7c422d62073fd8984d1464fec7201d255b147b40 SHA1 5de503d814abc9c70130326b50484ebb5bac3364 SHA256 b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29
 DIST kdevelop-3.3.6.tar.bz2 8176547 RMD160 1a1356e9eb015b2947cd64ba9ba223479d1ef3a4 SHA1 90d56409cf1108b4469c1ce98e7517dc46633eb9 SHA256 1cd0daccc885d1e50fc169fc33fc3d78b5d7970cdd14f249d2b8450a92f0b685
-DIST kdevelop-3.4.0-qmake-parser.patch.bz2 36754 RMD160 8317d2145d7e859996fdfda0ddaa155423f7c006 SHA1 7a2c8b82cf24ca21835d6894bd543d69b3c856dd SHA256 3cb8f748640b26f4fd75cdbceec5a0235c2774049e2eb971a14f11e9cc480045
+DIST kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588 RMD160 abc7376f97b7b3cc1e1e0cb5c73d0979a58ca5a5 SHA1 29b8f3298414495ca75206eb376e8d10083b8213 SHA256 32fa957e622c8a3d4730c1124a2b343905c64196ca703129277baa6d8a3230d1
 DIST kdevelop-3.4.0.tar.bz2 9158370 RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 SHA1 d72f01ae6a0d3200339345d3557ada5c5f99112d SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194
 EBUILD kdevelop-3.3.2.ebuild 3062 RMD160 f11eac1750eaae5126f35391e4d86a820965340b SHA1 c35615dc48714d69c72d3b8df43df7929ba55d56 SHA256 61eea844b7c41389fde41c758e0de9a9f5ac52e950804a1ebfdb1120566af995
 MD5 553a1d274501ee9523f6018e865a5569 kdevelop-3.3.2.ebuild 3062
@@ -18,18 +18,14 @@ EBUILD kdevelop-3.3.6.ebuild 3110 RMD160 332788ba9d48dddadafc71c6d01989b9a4bc4a8
 MD5 7eeb0db8263e16cd944aee38e7d38ccd kdevelop-3.3.6.ebuild 3110
 RMD160 332788ba9d48dddadafc71c6d01989b9a4bc4a82 kdevelop-3.3.6.ebuild 3110
 SHA256 2bb00cbcc6bbb0bc5f7d87f44475117eaea1017c0d1c03a5e6dff46fcb392d4a kdevelop-3.3.6.ebuild 3110
-EBUILD kdevelop-3.4.0-r1.ebuild 3292 RMD160 33aea26994406cd19cdae1b2a4e1f6cb24e0f33d SHA1 03530447ec0f27472003d760763c53ea48938857 SHA256 a8fce37ee0086d573decc36fca9352dafaaeef710ab4eba29d26cae1c794ee0a
-MD5 08e5a1aa3a4a6cf0e72b4c6296a416d9 kdevelop-3.4.0-r1.ebuild 3292
-RMD160 33aea26994406cd19cdae1b2a4e1f6cb24e0f33d kdevelop-3.4.0-r1.ebuild 3292
-SHA256 a8fce37ee0086d573decc36fca9352dafaaeef710ab4eba29d26cae1c794ee0a kdevelop-3.4.0-r1.ebuild 3292
-EBUILD kdevelop-3.4.0.ebuild 3170 RMD160 c9da6f4ec0b45631973feb21c473824997d783b6 SHA1 97c6476708015a8992e4eebf022454b62ca4e9b4 SHA256 34cc81e8324b4c4c1733b4d5aaca4abd06129f27fe78fcb78a17954327298582
-MD5 19a544f84b109d54c53cc5643bf7d489 kdevelop-3.4.0.ebuild 3170
-RMD160 c9da6f4ec0b45631973feb21c473824997d783b6 kdevelop-3.4.0.ebuild 3170
-SHA256 34cc81e8324b4c4c1733b4d5aaca4abd06129f27fe78fcb78a17954327298582 kdevelop-3.4.0.ebuild 3170
-MISC ChangeLog 21427 RMD160 631d2f58208dec3b091d6cac4aed916cc9ad9604 SHA1 6bc22418122157814d136ee832fc1fa7fcbdbafb SHA256 d1c29d6ff0b61dd89126c046f21f8b2f679b0eeac98ff059b9e099bfc7a44f31
-MD5 efde6713c0e81a999757ac29977cf9e9 ChangeLog 21427
-RMD160 631d2f58208dec3b091d6cac4aed916cc9ad9604 ChangeLog 21427
-SHA256 d1c29d6ff0b61dd89126c046f21f8b2f679b0eeac98ff059b9e099bfc7a44f31 ChangeLog 21427
+EBUILD kdevelop-3.4.0-r2.ebuild 3296 RMD160 386548e926be472bfd89ba1d713bbb7cae47566a SHA1 528c5160f1c041eb98b7c19917eaeee96e85d803 SHA256 2b9ea34f0c75f80fe5921ef8cb07833638c32eb36d69f844541cb57119938ed0
+MD5 3d409d0a46ad5411d6f35d497b38f62b kdevelop-3.4.0-r2.ebuild 3296
+RMD160 386548e926be472bfd89ba1d713bbb7cae47566a kdevelop-3.4.0-r2.ebuild 3296
+SHA256 2b9ea34f0c75f80fe5921ef8cb07833638c32eb36d69f844541cb57119938ed0 kdevelop-3.4.0-r2.ebuild 3296
+MISC ChangeLog 21636 RMD160 252d382114e4f94498798a64fa8de885caa51cd9 SHA1 ae3e71db0fd54520cd21b44e4384df32e1d03943 SHA256 81f99bf6748bda0f4e2d6c777e064b25c2a240640205482f8fe026f6c0be4e97
+MD5 ecced1e3450831563f1c5030f68c2d50 ChangeLog 21636
+RMD160 252d382114e4f94498798a64fa8de885caa51cd9 ChangeLog 21636
+SHA256 81f99bf6748bda0f4e2d6c777e064b25c2a240640205482f8fe026f6c0be4e97 ChangeLog 21636
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -43,16 +39,13 @@ SHA256 1999a1306fe7c9242b83850ba3a4aed089216b2709170afe3216a175dc779a81 files/di
 MD5 77d03bb3ed11aa086a3d63a8b3abdf5a files/digest-kdevelop-3.3.6 250
 RMD160 1fb856d79055868485d583409fb5be13630cd70d files/digest-kdevelop-3.3.6 250
 SHA256 15d021ae3f66947fb298f426091768a2609c970c1f506194d2d399fcec0d94c8 files/digest-kdevelop-3.3.6 250
-MD5 26090896b0d944888164287fc4d6d6da files/digest-kdevelop-3.4.0 250
-RMD160 d7200069e8c509f1b34da931506752cfd105ca64 files/digest-kdevelop-3.4.0 250
-SHA256 4a445439dedd084f84708dd12ccd5d416dcf9af6f8910887c0a91f6f33fd9601 files/digest-kdevelop-3.4.0 250
-MD5 385aef89789dd3ede822492785a47206 files/digest-kdevelop-3.4.0-r1 539
-RMD160 9964b9c3201b62c1907fb5df762588f7d8f1ef05 files/digest-kdevelop-3.4.0-r1 539
-SHA256 95e4fce0c3bcb71185f762adcfe8d350383cb6c6193430a6d694d3631ce5c26c files/digest-kdevelop-3.4.0-r1 539
+MD5 807f18a53dcf87c3a52e386f2f560a95 files/digest-kdevelop-3.4.0-r2 545
+RMD160 984c3274dcd077bf5688853067b6cc802e775101 files/digest-kdevelop-3.4.0-r2 545
+SHA256 c74aa9bf3182ed76a08955d12e2cc94d797168b94eb4a323c9eb73eb8d8827aa files/digest-kdevelop-3.4.0-r2 545
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyf7tAiZjviIA2XgRAsorAKDzCgoFvNqpDJ4GgBLcDURYQ+kmsgCfdJdQ
-4221j+Cbp8ad4wJCz35XXaM=
-=oONz
+iD8DBQFFy0EhAiZjviIA2XgRArUqAKDwZSkhIxv+BtnB2P3H8+IlHhJawQCgiT+/
+6bIcd1lIVrgGypydUa2DDg0=
+=664q
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.4.0 b/dev-util/kdevelop/files/digest-kdevelop-3.4.0
deleted file mode 100644
index d7f1a8549d12..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cf367c89329acf23738e23c0b663ee9 kdevelop-3.4.0.tar.bz2 9158370
-RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 kdevelop-3.4.0.tar.bz2 9158370
-SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194 kdevelop-3.4.0.tar.bz2 9158370
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r1 b/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r1
deleted file mode 100644
index 7361292eb8ba..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 45772000febb6e2ebb7a5c4a6eef6085 kdevelop-3.4.0-qmake-parser.patch.bz2 36754
-RMD160 8317d2145d7e859996fdfda0ddaa155423f7c006 kdevelop-3.4.0-qmake-parser.patch.bz2 36754
-SHA256 3cb8f748640b26f4fd75cdbceec5a0235c2774049e2eb971a14f11e9cc480045 kdevelop-3.4.0-qmake-parser.patch.bz2 36754
-MD5 9cf367c89329acf23738e23c0b663ee9 kdevelop-3.4.0.tar.bz2 9158370
-RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 kdevelop-3.4.0.tar.bz2 9158370
-SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194 kdevelop-3.4.0.tar.bz2 9158370
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2 b/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2
new file mode 100644
index 000000000000..5682a766ae63
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.4.0-r2
@@ -0,0 +1,6 @@
+MD5 3ee48fd1a951678ce4a4f90ade0f5c90 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
+RMD160 abc7376f97b7b3cc1e1e0cb5c73d0979a58ca5a5 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
+SHA256 32fa957e622c8a3d4730c1124a2b343905c64196ca703129277baa6d8a3230d1 kdevelop-3.4.0-qmake-parser-2.patch.bz2 35588
+MD5 9cf367c89329acf23738e23c0b663ee9 kdevelop-3.4.0.tar.bz2 9158370
+RMD160 7a3fb362e456965f5c35f2a8a3293178d596c845 kdevelop-3.4.0.tar.bz2 9158370
+SHA256 c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194 kdevelop-3.4.0.tar.bz2 9158370
diff --git a/dev-util/kdevelop/kdevelop-3.4.0-r1.ebuild b/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild
index 737d6803114a..08c41f294228 100644
--- a/dev-util/kdevelop/kdevelop-3.4.0-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.0-r1.ebuild,v 1.1 2007/02/07 16:31:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.0-r2.ebuild,v 1.1 2007/02/08 15:26:17 flameeyes 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/${P}/src/${P}.tar.bz2
-	mirror://gentoo/${P}-qmake-parser.patch.bz2"
+	mirror://gentoo/${P}-qmake-parser-2.patch.bz2"
 
 LICENSE="GPL-2"
 
@@ -26,7 +26,7 @@ DEPEND="${DEPEND}
 	sys-devel/flex"
 need-kde 3.5
 
-PATCHES="${DISTDIR}/${P}-qmake-parser.patch.bz2"
+PATCHES="${DISTDIR}/${P}-qmake-parser-2.patch.bz2"
 
 src_unpack() {
 	kde_src_unpack
diff --git a/dev-util/kdevelop/kdevelop-3.4.0.ebuild b/dev-util/kdevelop/kdevelop-3.4.0.ebuild
deleted file mode 100644
index bc37e688b42d..000000000000
--- a/dev-util/kdevelop/kdevelop-3.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.0.ebuild,v 1.1 2007/01/27 17:43:55 flameeyes 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/${P}/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 graphviz"
-
-DEPEND="sys-devel/gdb
-	>=sys-libs/db-4.1
-	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )
-	graphviz? ( media-gfx/graphviz )"
-
-RDEPEND="${DEPEND}
-	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
-DEPEND="${DEPEND}
-	sys-devel/flex"
-need-kde 3.5
-
-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
-}
-
-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=${ROOT}$(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 - >> "${D}/usr/share/config/kdeveloprc" <<EOF
-
-[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 almost"
-	elog "complete list. All these packages can be emerged after kdevelop."
-	elog
-	elog "kde-base/kdebase:			   (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:			   (RECOMMENDED) show differences between files"
-	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."
-}