Fixed the desktop file as per bug 196889.

Package-Manager: portage-2.1.3.16

4 files changed, 20 insertions, 26 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index d78b29324198..fc5ae975c271 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.29 2007/08/20 18:42:25 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.30 2007/11/04 17:26:04 philantrop Exp $
+
+  04 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  files/kdiff3-0.9.92-fix-desktop-file.patch, kdiff3-0.9.92.ebuild:
+  Fixed the desktop file as per bug 196889.
 
   20 Aug 2007; Tobias Heinlein <keytoaster@gentoo.org>
   +files/kdiff3-0.9.92-fix-desktop-file.patch, kdiff3-0.9.92.ebuild:
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index d7caade102df..3ad6d3905f7c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kdiff3-0.9.92-fix-desktop-file.patch 712 RMD160 252e91681ceb34bde100042ce979a1529f928b47 SHA1 ff014b5514150c0db2b682db48734857c9fca584 SHA256 7d8753f3e9a230861132dd13689ec6919aaee185fa1d0b1e74f7a7763e838e9c
-MD5 59f8facf055924938e157cefad7c91fe files/kdiff3-0.9.92-fix-desktop-file.patch 712
-RMD160 252e91681ceb34bde100042ce979a1529f928b47 files/kdiff3-0.9.92-fix-desktop-file.patch 712
-SHA256 7d8753f3e9a230861132dd13689ec6919aaee185fa1d0b1e74f7a7763e838e9c files/kdiff3-0.9.92-fix-desktop-file.patch 712
+AUX kdiff3-0.9.92-fix-desktop-file.patch 704 RMD160 76f117113b51c56eece21f0879f376c836b62b73 SHA1 05280a698785bb154becd9b0ea650d1bc6873778 SHA256 c74e30dbab7af17f6cd6d477a68fe9ad396c8d749a509d7770e58823a07e7c51
+MD5 b66a5ce448af2f85d5bbb793519e3f00 files/kdiff3-0.9.92-fix-desktop-file.patch 704
+RMD160 76f117113b51c56eece21f0879f376c836b62b73 files/kdiff3-0.9.92-fix-desktop-file.patch 704
+SHA256 c74e30dbab7af17f6cd6d477a68fe9ad396c8d749a509d7770e58823a07e7c51 files/kdiff3-0.9.92-fix-desktop-file.patch 704
 DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb8 SHA1 c97b98150a1f5de16736a399affe1b4243d1e6c2 SHA256 ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
-EBUILD kdiff3-0.9.92.ebuild 1993 RMD160 e9977a995cb325b18f19544117932d9c934161d7 SHA1 bf00bb31d67eea693687c287e1809d88144f23e8 SHA256 a4b4eb36d1b77cda088e64f9bd9f13dff80209223b23ec89f15f9ae931ba939c
-MD5 d1552167e91aa7ff02483e424883a9df kdiff3-0.9.92.ebuild 1993
-RMD160 e9977a995cb325b18f19544117932d9c934161d7 kdiff3-0.9.92.ebuild 1993
-SHA256 a4b4eb36d1b77cda088e64f9bd9f13dff80209223b23ec89f15f9ae931ba939c kdiff3-0.9.92.ebuild 1993
-MISC ChangeLog 5538 RMD160 00e15b05d47554be5b84f360726f2b884b0d4375 SHA1 01c6369b007a4b89f6defe77c04d86781997c4ad SHA256 609bd8901e8f11d335944998afac702f778948e2f0034776c871a1238f60f745
-MD5 651de22646650409571a238c9db452c3 ChangeLog 5538
-RMD160 00e15b05d47554be5b84f360726f2b884b0d4375 ChangeLog 5538
-SHA256 609bd8901e8f11d335944998afac702f778948e2f0034776c871a1238f60f745 ChangeLog 5538
+EBUILD kdiff3-0.9.92.ebuild 1996 RMD160 2cd6fffce86fd581df186abe6545ca47c786e0cb SHA1 23ada8535f6937f659aa654b62369157ab26fbd1 SHA256 b47163db62ac11ae5a3d69be43f65556afb6e4c27d7191952681f788f95473eb
+MD5 084a101551e8172e738f12aa12480d5b kdiff3-0.9.92.ebuild 1996
+RMD160 2cd6fffce86fd581df186abe6545ca47c786e0cb kdiff3-0.9.92.ebuild 1996
+SHA256 b47163db62ac11ae5a3d69be43f65556afb6e4c27d7191952681f788f95473eb kdiff3-0.9.92.ebuild 1996
+MISC ChangeLog 5706 RMD160 e69a2fbd5f1345d73a18c641e69ff2dd1a793e28 SHA1 7f682bbd11fc2cadfed9d38ed6258836a1ed3974 SHA256 6d8b1804911d0c21a1dab0983f26e10838e274238dca8e14733ed91374282a6a
+MD5 b0d300ce4b4fda7dffa3b920531f41e9 ChangeLog 5706
+RMD160 e69a2fbd5f1345d73a18c641e69ff2dd1a793e28 ChangeLog 5706
+SHA256 6d8b1804911d0c21a1dab0983f26e10838e274238dca8e14733ed91374282a6a ChangeLog 5706
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -21,10 +18,3 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 a70cddbce1da0ea2aa919fc5c92c1a5a files/digest-kdiff3-0.9.92 244
 RMD160 d6992c504e971b1f6aad8f9277a390617055b94e files/digest-kdiff3-0.9.92 244
 SHA256 f1b0eafd901c24de2f85d244f2548f3df9df7609800f589106454962f7d560ed files/digest-kdiff3-0.9.92 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFGyeCIl1Qf6C0PV04RAj/mAKCBe89+ah1REXO4gZ3sJzsMcyv8wQCgpI9S
-pQJQCgWf7swX1cflpntaCHI=
-=Qgf3
------END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch b/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
index 77ad46e2cc45..056f07af6156 100644
--- a/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
@@ -12,7 +12,7 @@
  GenericName[zh_CN]=Diff/Patch 前端
  GenericName[zu]=Diff/PatchIsiqalo sokugcina
 -Exec=kdiff3 %i %m -caption "%c"
-+Exec=kdiff3 %i -caption "%c" --miniicon
++Exec=kdiff3 %i %m -caption "%c"
  Icon=kdiff3
  Type=Application
 +Categories=Qt;KDE;Development;
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
index 6dbaa92d0b1a..3a8da24cd372 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.9 2007/08/20 18:42:25 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.10 2007/11/04 17:26:04 philantrop Exp $
 
 inherit kde
 
@@ -62,5 +62,5 @@ src_unpack() {
 	fi
 
 	# Fixes bug 186942
-	epatch ${FILESDIR}/${P}-fix-desktop-file.patch
+	epatch "${FILESDIR}"/${P}-fix-desktop-file.patch
 }