diff options
-rw-r--r-- | kde-misc/kdiff3/ChangeLog | 10 | ||||
-rw-r--r-- | kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch | 8 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.95.ebuild | 6 |
3 files changed, 21 insertions, 3 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/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" |