Fixes bug #149034.

(Portage version: 2.1.1)

4 files changed, 54 insertions, 1 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index c507823a3327..bc3a82e07c9d 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.57 2006/09/17 22:53:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.58 2006/09/25 13:15:01 deathwing00 Exp $
+
+*konqueror-3.5.4-r1 (25 Sep 2006)
+
+  25 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/konqueror-3.5.4-clear-history.patch, +konqueror-3.5.4-r1.ebuild:
+  Fixes bug #149034 as requested by Toralf Förster.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org> -konqueror-3.4.3.ebuild:
   Drop KDE 3.4.
diff --git a/kde-base/konqueror/files/digest-konqueror-3.5.4-r1 b/kde-base/konqueror/files/digest-konqueror-3.5.4-r1
new file mode 100644
index 000000000000..8eb5c75cbf22
--- /dev/null
+++ b/kde-base/konqueror/files/digest-konqueror-3.5.4-r1
@@ -0,0 +1,3 @@
+MD5 882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 23636847
+RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 kdebase-3.5.4.tar.bz2 23636847
+SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 kdebase-3.5.4.tar.bz2 23636847
diff --git a/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch b/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch
new file mode 100644
index 000000000000..9e8a9d88b877
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-3.5.4-clear-history.patch
@@ -0,0 +1,13 @@
+diff -U 4 -H -b -w -B -E -d -i -r konqueror-3.5.4-orig/konqueror/konq_combo.cc konqueror-3.5.4/konqueror/konq_combo.cc
+--- konqueror-3.5.4-orig/konqueror/konq_combo.cc	2006-09-25 15:00:01.000000000 +0200
++++ konqueror-3.5.4/konqueror/konq_combo.cc	2006-09-25 15:00:57.000000000 +0200
+@@ -121,8 +121,9 @@
+ 
+     // Make the lineedit consume the Key_Enter event...
+     setTrapReturnKey( true );
+ 
++    connect( KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()) );
+     connect( this, SIGNAL(cleared() ), SLOT(slotCleared()) );
+     connect( this, SIGNAL(highlighted( int )), SLOT(slotSetIcon( int )) );
+     connect( this, SIGNAL(activated( const QString& )),
+              SLOT(slotActivated( const QString& )) );
diff --git a/kde-base/konqueror/konqueror-3.5.4-r1.ebuild b/kde-base/konqueror/konqueror-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..062db803c78a
--- /dev/null
+++ b/kde-base/konqueror/konqueror-3.5.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.4-r1.ebuild,v 1.1 2006/09/25 13:15:01 deathwing00 Exp $
+
+KMNAME=kdebase
+# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="java"
+
+DEPEND="
+$(deprange $PV $MAXKDEVER kde-base/libkonq)"
+
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+$(deprange $PV $MAXKDEVER kde-base/kfind)
+java? ( >=virtual/jre-1.4 )"
+
+KMCOPYLIB="libkonq libkonq"
+KMEXTRACTONLY=kdesktop/KDesktopIface.h
+
+src_unpack() {
+	kde-meta_src_unpack
+	epatch "${FILESDIR}/${P}-clear-history.patch"
+}
+