Fix desktop entry. amd64 stable.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 24 insertions, 5 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 273a3910de10..c40f090ad202 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.40 2009/06/22 12:35:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.41 2009/10/13 14:12:59 ssuominen Exp $
+
+  13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> kdiff3-0.9.95.ebuild:
+  amd64 stable wrt #288883
+
+  13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> kdiff3-0.9.95.ebuild,
+  +files/kdiff3-0.9.95-desktop-entry.patch:
+  Fix desktop entry wrt #270666, thanks to BT <amak79 at gmail.com> for
+  reporting.
 
   22 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org> kdiff3-0.9.95.ebuild,
   metadata.xml:
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 993293b10f31..c47f0aeaacc3 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,9 +1,10 @@
 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
+AUX kdiff3-0.9.95-desktop-entry.patch 440 RMD160 1f064018c4d8992f9f360152ce2df74f128c536c SHA1 666c0fab0aec64f66d3373828790a33206ccf0b2 SHA256 c333be340fc1ad636c3c90f29c7ac28a3ca720dcfe9428d316f363329faed948
 DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb8 SHA1 c97b98150a1f5de16736a399affe1b4243d1e6c2 SHA256 ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
 DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
 EBUILD kdiff3-0.9.92-r1.ebuild 635 RMD160 78a6c93d90c2ee40293c83095069d8614924fd01 SHA1 fd7c3b062b015b03504b1d085fefb6ea2a54f326 SHA256 6f62b6f203afabcf40bde95799a1f387515ba0aea858353e17ab21d8936d8494
 EBUILD kdiff3-0.9.92.ebuild 1992 RMD160 e53917aa05aa473992e0e1df172a959b4b9795d0 SHA1 7748d1d0005962a60e4f24dc89fa3330da98f88a SHA256 a0b154234054886070afe7741926ae3248ccfc9272b9fd354f1b87e7f6dc1e7f
-EBUILD kdiff3-0.9.95.ebuild 825 RMD160 2893ba11de962b9a71af6622de5a0328bfe5061b SHA1 4feab7a0a8a649c92f17142ef32c879782485b37 SHA256 00d46d6a70aef7d7fa3bba4d59f864f6738ff59314d6be6f0e2506215e9b6049
-MISC ChangeLog 7449 RMD160 1b901a626d3189b778cdf4c7836031cb696c8efd SHA1 d035fac656bf7bdaa1a53a43a7663fa0a9d57687 SHA256 848ac62bef088b4d87f009e6c38fcd6c600506dc925b2f2b6a5d895985076d88
+EBUILD kdiff3-0.9.95.ebuild 876 RMD160 2c211b23bc4cbd0e7216d305133ed82282a38042 SHA1 917f419061911a81043dd9a367826008333661b3 SHA256 29f7f801f4886353718d523c1772d79f3165f31ba154e2d3b89f5d4608321e5a
+MISC ChangeLog 7760 RMD160 3ef9bc2c0d011d6ed352b6b7bc9c90887b3e1256 SHA1 72b25fb832d463b2d73777a5a3f4dae2b1b2920e SHA256 59f2b2640a7e8e6fe13706378504b7f408efd5b9a29f349b987b18de05909b41
 MISC metadata.xml 337 RMD160 987f2ea930df64c8621ce9e9ad2bc3e4b493f87c SHA1 05eb9bceea062c2393a1b12adca0df1cfb3b2c5e SHA256 efb6060c548053f718e7d63581e8a2637b5b5d6ee7f386e628c34292a40f180b
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch b/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch
new file mode 100644
index 000000000000..467155fc02c3
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch
@@ -0,0 +1,8 @@
+diff -ur kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop kdiff3-0.9.95/src-QT4/kdiff3.desktop
+--- kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop	2009-03-03 21:34:53.000000000 +0200
++++ kdiff3-0.9.95/src-QT4/kdiff3.desktop	2009-10-13 17:08:39.000000000 +0300
+@@ -60,3 +60,4 @@
+ Comment[zh_CN]=一个文件和目录的比较和合并的工具
+ Comment[zh_TW]=一個檔案與目錄比較與合併的工具
+ Terminal=false
++Categories=Qt;KDE;Development;
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
index d75f6c3c8667..37e811aa101d 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.6 2009/06/25 08:18:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95.ebuild,v 1.7 2009/10/13 14:12:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -14,9 +14,11 @@ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug handbook konqueror"
 
+PATCHES=( "${FILESDIR}/${P}-desktop-entry.patch" )
+
 RDEPEND="konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
 	sys-apps/diffutils
 	!kde-misc/kdiff3:0"