new patch, fixing a bug in the previous one

(Portage version: 2.0.51.19)

7 files changed, 16 insertions, 24 deletions

diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 906cc8f698f6..3663f81725f8 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.8 2005/04/20 11:51:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.9 2005/05/02 22:49:28 carlo Exp $
+
+*kommander-3.4.0-r2 (02 May 2005)
+
+  02 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/post-3.4-kdewebdev.diff, +files/post-3.4-kdewebdev-2.diff,
+  -kommander-3.4.0.ebuild, -kommander-3.4.0-r1.ebuild,
+  +kommander-3.4.0-r2.ebuild:
+  new patch, fixing a bug in the previous one
 
   20 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
   files/post-3.4-kdewebdev.diff:
diff --git a/kde-base/kommander/Manifest b/kde-base/kommander/Manifest
index b23ed303a31f..07b9834e7e2b 100644
--- a/kde-base/kommander/Manifest
+++ b/kde-base/kommander/Manifest
@@ -1,7 +1,5 @@
-MD5 5140df9fc6c95a2e04e723b97ae50de3 kommander-3.4.0.ebuild 394
-MD5 a34c0153512d123e061e72187511a32e kommander-3.4.0-r1.ebuild 477
-MD5 0f30f53e717c19a84222d4ef66981a6a ChangeLog 1530
+MD5 10aa065d57e48aa293a01502facd9432 kommander-3.4.0-r2.ebuild 374
+MD5 42c1d8163417afeaf5f4f3bd0264cc7e ChangeLog 1814
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 a6863fd743a5d77407c2de68efec9b90 files/digest-kommander-3.4.0-r1 69
-MD5 a39adba926c0ea862356b01191d762a1 files/post-3.4-kdewebdev.diff 2698
-MD5 a6863fd743a5d77407c2de68efec9b90 files/digest-kommander-3.4.0 69
+MD5 a6863fd743a5d77407c2de68efec9b90 files/digest-kommander-3.4.0-r2 69
+MD5 64933746cbdc378bd6d40e0b56eac91f files/post-3.4-kdewebdev-2.diff 2703
diff --git a/kde-base/kommander/files/digest-kommander-3.4.0-r1 b/kde-base/kommander/files/digest-kommander-3.4.0-r1
deleted file mode 100644
index 0af1ae241535..000000000000
--- a/kde-base/kommander/files/digest-kommander-3.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
diff --git a/kde-base/kommander/files/digest-kommander-3.4.0 b/kde-base/kommander/files/digest-kommander-3.4.0-r2
index 0af1ae241535..0af1ae241535 100644
--- a/kde-base/kommander/files/digest-kommander-3.4.0
+++ b/kde-base/kommander/files/digest-kommander-3.4.0-r2
diff --git a/kde-base/kommander/files/post-3.4-kdewebdev.diff b/kde-base/kommander/files/post-3.4-kdewebdev-2.diff
index 937c99d97257..5bf3f475f94b 100644
--- a/kde-base/kommander/files/post-3.4-kdewebdev.diff
+++ b/kde-base/kommander/files/post-3.4-kdewebdev-2.diff
@@ -25,7 +25,7 @@ diff -u -3 -d -p -r1.49 instance.cpp
 +  
 +  bool inTemp = false;
 +  for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-+    if (m_uiFileName.directory().startsWith(*I))
++    if (m_uiFileName.directory(false).startsWith(*I))
 +      inTemp = true;
 +        
 +  if (inTemp)
diff --git a/kde-base/kommander/kommander-3.4.0-r1.ebuild b/kde-base/kommander/kommander-3.4.0-r2.ebuild
index 0f27954a74c7..36947707ae73 100644
--- a/kde-base/kommander/kommander-3.4.0-r1.ebuild
+++ b/kde-base/kommander/kommander-3.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.0-r1.ebuild,v 1.1 2005/04/19 23:59:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.0-r2.ebuild,v 1.1 2005/05/02 22:49:28 carlo Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -13,5 +13,5 @@ DEPEND=""
 
 src_unpack(){
 	kde-meta_src_unpack
-	epatch ${FILESDIR}/post-3.4-kdewebdev.diff
+	epatch ${FILESDIR}/post-3.4-kdewebdev-2.diff
 }
diff --git a/kde-base/kommander/kommander-3.4.0.ebuild b/kde-base/kommander/kommander-3.4.0.ebuild
deleted file mode 100644
index 2d3b5d630101..000000000000
--- a/kde-base/kommander/kommander-3.4.0.ebuild
+++ /dev/null
@@ -1,13 +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/kommander/kommander-3.4.0.ebuild,v 1.2 2005/03/18 17:48:50 morfic Exp $
-KMNAME=kdewebdev
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
-
-DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-DEPEND=""
-