Fix desktop entry properly, get rid of arts use flag.

Package-Manager: portage-2.1.4.4

5 files changed, 114 insertions, 7 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/Manifest b/kde-misc/kdiff3/Manifest
index 88d59893807a..e6b62f5f69a8 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,7 @@
+AUX kdiff3-0.9.92-desktop-entry-fix.diff 2387 RMD160 4802bd372f778e547e2823134af09e323f05344e SHA1 d696d0e56fd0061a420519b5d6d4eb2591562198 SHA256 d482410a87ef734ba8af5b0463afbfe9a8b039a1234717e56288589176d8aa8f
 AUX kdiff3-0.9.92-fix-desktop-file.patch 704 RMD160 76f117113b51c56eece21f0879f376c836b62b73 SHA1 05280a698785bb154becd9b0ea650d1bc6873778 SHA256 c74e30dbab7af17f6cd6d477a68fe9ad396c8d749a509d7770e58823a07e7c51
 DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb8 SHA1 c97b98150a1f5de16736a399affe1b4243d1e6c2 SHA256 ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
-EBUILD kdiff3-0.9.92.ebuild 1996 RMD160 2cd6fffce86fd581df186abe6545ca47c786e0cb SHA1 23ada8535f6937f659aa654b62369157ab26fbd1 SHA256 b47163db62ac11ae5a3d69be43f65556afb6e4c27d7191952681f788f95473eb
-MISC ChangeLog 5706 RMD160 e69a2fbd5f1345d73a18c641e69ff2dd1a793e28 SHA1 7f682bbd11fc2cadfed9d38ed6258836a1ed3974 SHA256 6d8b1804911d0c21a1dab0983f26e10838e274238dca8e14733ed91374282a6a
+EBUILD kdiff3-0.9.92-r1.ebuild 630 RMD160 fffc32d1fcf3d41e3de8836948141d41fb1b1433 SHA1 6200ec7a367f134ee33934cf11c5014d96811aed SHA256 09bdb8cdb2d76d0925094f94e2d7366cfde8d43b2cdeed60cc27557bc277fb0c
+EBUILD kdiff3-0.9.92.ebuild 1992 RMD160 e53917aa05aa473992e0e1df172a959b4b9795d0 SHA1 7748d1d0005962a60e4f24dc89fa3330da98f88a SHA256 a0b154234054886070afe7741926ae3248ccfc9272b9fd354f1b87e7f6dc1e7f
+MISC ChangeLog 5937 RMD160 ceb1a49f85f9a6d12c33325895b48d579d96425f SHA1 bf120a089aba4a5f5a4ef9d75978cba8bee3d479 SHA256 bd02fea79f0d27c6c68a0fa894a57fb2401ab8bed9400ae7705d41b1ef8a2e82
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
 }