Add patch to make drkonqi work with splitdebug.

Package-Manager: portage-2.1_pre7-r3

6 files changed, 45 insertions, 6 deletions

diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index 0e443265e6c8..dbc53e9d6ab6 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.39 2006/04/01 20:05:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.40 2006/04/01 21:55:22 flameeyes Exp $
+
+  01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/drkonqui-3.5.2-splitdebug.patch, drkonqi-3.5.2.ebuild:
+  Add patch to make drkonqi work with splitdebug.
 
   01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> drkonqi-3.5.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/kde-base/drkonqi/drkonqi-3.5.2.ebuild b/kde-base/drkonqi/drkonqi-3.5.2.ebuild
index 26e801b58e74..383d81aa21da 100644
--- a/kde-base/drkonqi/drkonqi-3.5.2.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.2.ebuild,v 1.3 2006/04/01 20:05:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.2.ebuild,v 1.4 2006/04/01 21:55:22 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,4 +11,5 @@ DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
+PATCHES="${FILESDIR}/${P}-splitdebug.patch"
 
diff --git a/kde-base/drkonqi/files/drkonqui-3.5.2-splitdebug.patch b/kde-base/drkonqi/files/drkonqui-3.5.2-splitdebug.patch
new file mode 100644
index 000000000000..6bffd1715715
--- /dev/null
+++ b/kde-base/drkonqi/files/drkonqui-3.5.2-splitdebug.patch
@@ -0,0 +1,15 @@
+Index: kdebase-3.5.2/drkonqi/debuggers/gdbrc
+===================================================================
+--- kdebase-3.5.2.orig/drkonqi/debuggers/gdbrc
++++ kdebase-3.5.2/drkonqi/debuggers/gdbrc
+@@ -140,8 +140,8 @@ Comment[xh]=Text based debugger evela kw
+ Comment[zh_CN]=在控制台中运行的文本 GNU 调试器
+ Comment[zh_TW]=在 Konsole 中執行的 GNU 文字型除錯器
+ Comment[zu]=Umcoshi wamaphutha osekelwe umbhalo osuka kwi-GNU kwikhonsoli
+-Exec=konsole -e gdb -nw %execname %pid
+-ExecBatch=gdb -nw -n -batch -x %tempfile %execname %pid
++Exec=konsole -e gdb -nw --symbols %execname %execname %pid
++ExecBatch=gdb -nw -n -batch -x %tempfile --symbols %execname %execname %pid
+ TryExec=gdb
+ BacktraceCommand=bt
+ RemoveFromBacktraceRegExp=\(no debugging symbols found\)\.\.\.\\n?
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 81ae3b5206b2..8beb23d5a0d4 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.267 2006/03/26 18:40:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.268 2006/04/01 21:57:18 flameeyes Exp $
+
+  01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/drkonqui-3.5.2-splitdebug.patch, kdebase-3.5.2.ebuild:
+  Add patch to make drkonqi work with splitdebug.
 
   26 Mar 2006; Dan Armak <danarmak@gentoo.org> kdebase-3.5.2.ebuild:
   Remove patches from 3.5.1 which are no longer necessary in 3.5.2.
diff --git a/kde-base/kdebase/files/drkonqui-3.5.2-splitdebug.patch b/kde-base/kdebase/files/drkonqui-3.5.2-splitdebug.patch
new file mode 100644
index 000000000000..6bffd1715715
--- /dev/null
+++ b/kde-base/kdebase/files/drkonqui-3.5.2-splitdebug.patch
@@ -0,0 +1,15 @@
+Index: kdebase-3.5.2/drkonqi/debuggers/gdbrc
+===================================================================
+--- kdebase-3.5.2.orig/drkonqi/debuggers/gdbrc
++++ kdebase-3.5.2/drkonqi/debuggers/gdbrc
+@@ -140,8 +140,8 @@ Comment[xh]=Text based debugger evela kw
+ Comment[zh_CN]=在控制台中运行的文本 GNU 调试器
+ Comment[zh_TW]=在 Konsole 中執行的 GNU 文字型除錯器
+ Comment[zu]=Umcoshi wamaphutha osekelwe umbhalo osuka kwi-GNU kwikhonsoli
+-Exec=konsole -e gdb -nw %execname %pid
+-ExecBatch=gdb -nw -n -batch -x %tempfile %execname %pid
++Exec=konsole -e gdb -nw --symbols %execname %execname %pid
++ExecBatch=gdb -nw -n -batch -x %tempfile --symbols %execname %execname %pid
+ TryExec=gdb
+ BacktraceCommand=bt
+ RemoveFromBacktraceRegExp=\(no debugging symbols found\)\.\.\.\\n?
diff --git a/kde-base/kdebase/kdebase-3.5.2.ebuild b/kde-base/kdebase/kdebase-3.5.2.ebuild
index 8aff55228aa2..c65dbbe6a717 100644
--- a/kde-base/kdebase/kdebase-3.5.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2.ebuild,v 1.2 2006/03/26 18:40:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2.ebuild,v 1.3 2006/04/01 21:57:18 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -84,9 +84,9 @@ src_unpack() {
 
 	# Avoid using imake (kde bug 114466).
 	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+	rm -f ${S}/configure
 
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
+	epatch "${FILESDIR}/drkonqi-${PV}-splitdebug.patch"
 }
 
 src_compile() {