4 files changed, 110 insertions, 5 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index fc5ae975c271..576465bf4e32 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2007/11/04 17:26:04 philantrop Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.31 2008/06/21 10:33:41 carlo Exp $
+
+*kdiff3-0.9.92-r1 (21 Jun 2008)
+
+  21 Jun 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdiff3-0.9.92-desktop-entry-fix.diff, kdiff3-0.9.92.ebuild,
+  +kdiff3-0.9.92-r1.ebuild:
+  Fix desktop entry properly, get rid of arts use flag.
 
   04 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
   files/kdiff3-0.9.92-fix-desktop-file.patch, kdiff3-0.9.92.ebuild:
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff b/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff
new file mode 100644
index 000000000000..7517f81afa29
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff
@@ -0,0 +1,71 @@
+--- kdiff3plugin/kdiff3plugin.desktop	2006-11-14 23:06:16.000000000 +0100
++++ /dev/null	2008-06-15 10:46:49.536002197 +0200
+@@ -1,7 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Service
+-Name=Compare/Merge Files/Directories with KDiff3
+-Icon=kdiff3
+-X-KDE-ParentApp=konqueror
+-#DocPath=konq-plugins/kdiff3plugin/index.html
+\ No newline at end of file
+--- kdiff3plugin/Makefile.am.orig	2008-06-07 03:46:09.000000000 +0200
++++ kdiff3plugin/Makefile.am	2008-06-16 00:14:10.000000000 +0200
+@@ -13,8 +13,5 @@
+ pluginsdir   = $(kde_servicesdir)
+ plugins_DATA = kdiff3_plugin.desktop
+ 
+-appsdir = $(kde_appsdir)/.hidden
+-apps_DATA = kdiff3plugin.desktop
+-
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot
+--- src/Makefile.am.orig	2008-06-16 01:28:37.000000000 +0200
++++ src/Makefile.am	2008-06-16 01:30:58.000000000 +0200
+@@ -29,9 +29,9 @@
+ kdiff3_LDADD   = $(LIB_KPARTS)
+ 
+ # this is where the desktop file will go
+-shelldesktopdir   = $(kde_appsdir)/Development
++shelldesktopdir   = $(xdg_appsdir)
+ shelldesktop_DATA = kdiff3.desktop
+ 
+ # this is where the shell's XML-GUI resource file goes
+ shellrcdir   = $(kde_datadir)/kdiff3
+ shellrc_DATA = kdiff3_shell.rc
+--- src/kdiff3.desktop.orig	2008-06-16 01:35:21.000000000 +0200
++++ src/kdiff3.desktop	2008-06-16 01:36:24.000000000 +0200
+@@ -1,6 +1,4 @@
+-
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KDiff3
+ Name[hi]=के-डिफ3
+ Name[sv]=Kdiff3
+@@ -46,10 +44,11 @@
+ GenericName[xx]=xxDiff/Patch Frontendxx
+ GenericName[zh_CN]=Diff/Patch 前端
+ GenericName[zu]=Diff/PatchIsiqalo sokugcina
+-Exec=kdiff3 %i %m -caption "%c"
++Categories=Qt;KDE;Development;
++Exec=kdiff3 %i -caption "%c"
+ Icon=kdiff3
+ Type=Application
+-DocPath=kdiff3/index.html
++X-DocPath=kdiff3/index.html
+ Comment=A File And Directory Comparison And Merge Tool
+ Comment[ar]=أداة مقارنة  و دمج ملفات و دلائل (مجلًدات )
+ Comment[bg]=Инструмент за сравняване и сливане на файлове и директории
+--- src/kdiff3part.desktop.orig	2008-06-16 02:52:00.000000000 +0200
++++ src/kdiff3part.desktop	2008-06-16 02:53:07.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KDiff3Part
+ Name[cs]=Komponenta KDiff3
+ Name[fr]=Composant KDiff3
+@@ -16,3 +15,4 @@
+ ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+ X-KDE-Library=libkdiff3part
+ Type=Service
++Icon=kdiff3
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild
new file mode 100644
index 000000000000..2ff1c974411e
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/06/21 10:33:41 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+DESCRIPTION="KDE-based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
+IUSE=""
+
+RDEPEND="sys-apps/diffutils"
+
+need-kde 3.5
+
+PATCHES=( "${FILESDIR}/kdiff3-0.9.92-desktop-entry-fix.diff" )
+
+src_compile(){
+	rm "${S}"/configure
+	kde_src_compile
+}
+\ No newline at end of file
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
index 3a8da24cd372..ccf6fe57aa3f 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
+# Copyright 1999-2008 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.10 2007/11/04 17:26:04 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.11 2008/06/21 10:33:41 carlo 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
 }