Use patch from tarball in mirrors. Drop old version.

(Portage version: 2529-svn)

7 files changed, 23 insertions, 62 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 870ae18dbcb7..56d7870970f9 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konqueror
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.39 2005/12/17 12:09:08 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.40 2006/01/14 09:20:35 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/konqueror-3.5.0-location-bar-focus.patch, -konqueror-3.5.0.ebuild,
+  konqueror-3.5.0-r1.ebuild:
+  Use patch from tarball in mirrors. Drop old version.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> konqueror-3.5.0-r1.ebuild:
   Added ~ppc64
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index d8c2fe9e6a23..81ba85397f18 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c4db2c8bd4be92c6f38269fd469e5aad ChangeLog 4989
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-konqueror-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-konqueror-3.4.2 287
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-konqueror-3.4.2-r1 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-konqueror-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-konqueror-3.5.0 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-konqueror-3.5.0-r1 68
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-konqueror-3.5.0-r1 142
 MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
-MD5 f557526f4d82f563d8d69f986303d30d files/konqueror-3.5.0-location-bar-focus.patch 433
 MD5 56e97c5040d28b656c9e7c9c6e05a95f konqueror-3.4.1.ebuild 774
 MD5 0451e0225115ecd1a652e2ecfebc180f konqueror-3.4.2-r1.ebuild 969
 MD5 9de0d7f28bcceea80bbdb2a1b1def058 konqueror-3.4.2.ebuild 780
 MD5 cd85cd458abebe64de2b4aff9b503bcb konqueror-3.4.3.ebuild 780
-MD5 2980995757ae7f56c49c02cd964c2bbf konqueror-3.5.0-r1.ebuild 808
-MD5 0b22513d45005afeb6d684591062b784 konqueror-3.5.0.ebuild 745
+MD5 32312f631f8a017146e3206897a4537a konqueror-3.5.0-r1.ebuild 966
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrS6iI1lqEGTUzyQRAjYKAKCvlrOv8MaFEwRlfmc6pJAdYtkjOgCgylSk
-7xpowHcrqidyP+T5a1nJzEU=
-=xkc5
------END PGP SIGNATURE-----
diff --git a/kde-base/konqueror/files/digest-konqueror-3.5.0 b/kde-base/konqueror/files/digest-konqueror-3.5.0
deleted file mode 100644
index 7ccd6e40bb2a..000000000000
--- a/kde-base/konqueror/files/digest-konqueror-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185
diff --git a/kde-base/konqueror/files/digest-konqueror-3.5.0-r1 b/kde-base/konqueror/files/digest-konqueror-3.5.0-r1
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/konqueror/files/digest-konqueror-3.5.0-r1
+++ b/kde-base/konqueror/files/digest-konqueror-3.5.0-r1
@@ -1 +1,2 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185
diff --git a/kde-base/konqueror/files/konqueror-3.5.0-location-bar-focus.patch b/kde-base/konqueror/files/konqueror-3.5.0-location-bar-focus.patch
deleted file mode 100644
index aef33c5ed2cf..000000000000
--- a/kde-base/konqueror/files/konqueror-3.5.0-location-bar-focus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Patch to fix location bar focus KDE bugzilla 
-# http://bugs.kde.org/show_bug.cgi?id=117031, Gentoo bug 114329.
---- konqueror/konq_mainwindow.cc.orig	2005-12-03 12:34:06.000000000 +0000
-+++ konqueror/konq_mainwindow.cc	2005-12-03 12:34:44.000000000 +0000
-@@ -3648,7 +3648,7 @@
- 
- void KonqMainWindow::focusLocationBar()
- {
--  if ( m_combo->isVisible() )
-+  if ( m_combo->isVisible() || !isVisible() )
-     m_combo->setFocus();
- }
- 
diff --git a/kde-base/konqueror/konqueror-3.5.0-r1.ebuild b/kde-base/konqueror/konqueror-3.5.0-r1.ebuild
index f4ed29f23afc..6876841ac3c5 100644
--- a/kde-base/konqueror/konqueror-3.5.0-r1.ebuild
+++ b/kde-base/konqueror/konqueror-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.2 2005/12/17 09:37:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.0-r1.ebuild,v 1.3 2006/01/14 09:20:36 flameeyes Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -8,11 +8,13 @@ MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2"
+
 DESCRIPTION="KDE: Web browser, file manager, ..."
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java"
 
-
 DEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkonq)"
 
@@ -21,7 +23,13 @@ $(deprange $PV $MAXKDEVER kde-base/kcontrol)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
 java? ( >=virtual/jre-1.4 )"
 
-PATCHES="${FILESDIR}/${P}-location-bar-focus.patch"
-
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY=kdesktop/KDesktopIface.h
+
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	# Fix the location bar focus, bug 114329.
+	epatch "${WORKDIR}/patches/${P}-location-bar-focus.patch"
+}
diff --git a/kde-base/konqueror/konqueror-3.5.0.ebuild b/kde-base/konqueror/konqueror-3.5.0.ebuild
deleted file mode 100644
index 051201aecea9..000000000000
--- a/kde-base/konqueror/konqueror-3.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.0.ebuild,v 1.3 2005/12/04 10:25:01 kloeri 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 ~ppc ~sparc ~x86"
-IUSE="java"
-
-
-DEPEND="
-$(deprange $PV $MAXKDEVER kde-base/libkonq)"
-
-RDEPEND="${DEPEND}
-$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
-java? ( >=virtual/jre-1.4 )"
-
-KMCOPYLIB="libkonq libkonq"
-KMEXTRACTONLY=kdesktop/KDesktopIface.h
-