[kde-misc/kdiff3] - fixed linguas, fixed menu entry (missing Categories), added konqueror USE flag (synced from live

ebuild)

5 files changed, 63 insertions, 15 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index f3850f16067..c2d808eb98d 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kdiff3-0.9.95 (06 Jun 2009)
+
+  06 Jun 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  -files/kdiff3-desktop-menu-fix.patch, +kdiff3-0.9.95-r1.ebuild,
+  kdiff3-9999.ebuild:
+  Fixed LINGUAS, fixed .desktop icon
+
   20 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   +files/kdiff3-desktop-menu-fix.patch, kdiff3-9999.ebuild:
   Added temporary menu entry fix
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a0e6d66e1be..a48e469c5ea 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,5 @@
-AUX kdiff3-desktop-menu-fix.patch 338 RMD160 8b10e136d8604af10361d3d96ac040ba128b6d8c SHA1 868c0f85a64a97ade1dd82c15d8459898adfb38e SHA256 62563d26cdad605167be4a0149d0b0b057e1137d8db8c2b4df9ce108f38afdf4
-EBUILD kdiff3-9999.ebuild 652 RMD160 35278de80ad6b5d9fb29304636b0f8c8c84fe4da SHA1 209c2cc0f7e3adbaaa36215c6c8f23d4f155aca3 SHA256 fce8e1e1b924b4962c93bcc1fe42db289a79fa3e24f190f3d2be690183f68959
-MISC ChangeLog 745 RMD160 cfd384b478442c1811443369cee186328e483dbc SHA1 bf5754e08d107423b95e6f00730e4ad58c095538 SHA256 fd8358386dc9ca2a9e192ade92574ee01fc6da0f0fe0fe6e7d0d4a5e654a2825
+DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
+EBUILD kdiff3-0.9.95-r1.ebuild 1171 RMD160 e7f91f6c1d4fd7f3e1ba4cd2e9b94d1ca07a6660 SHA1 cbbd0e7874fa5f9fe2cf2e7f57d271b4081c8910 SHA256 a323d371dae0dcdeebb61f8471223fac79371544d8406b6ecde57028a59b0b69
+EBUILD kdiff3-9999.ebuild 729 RMD160 1482ac72c206a6f8e88dad4fc8754be776832614 SHA1 a2fcc699a71d8ba79901276e35d837ddf08c64f2 SHA256 8e15ba9a4a01572955c86fbf8e9b671888cfa6d8958399bed760254b5425eead
+MISC ChangeLog 965 RMD160 e23a294ea710d5afd9fe82c890a6101aa69cafa4 SHA1 9056fd2eea6ca7a4c867ba8e790e1e42cf46c685 SHA256 62bafe5700a6e0b3a8be7a183660641ae09089ffc801a82b7d27615200a6d2c1
 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
diff --git a/kde-misc/kdiff3/files/kdiff3-desktop-menu-fix.patch b/kde-misc/kdiff3/files/kdiff3-desktop-menu-fix.patch
deleted file mode 100644
index a12c85a94bb..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-desktop-menu-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/kdiff3.desktop
-===================================================================
---- src/kdiff3.desktop	(revision 969772)
-+++ src/kdiff3.desktop	(working copy)
-@@ -1,5 +1,6 @@
- [Desktop Entry]
- Name=KDiff3
-+Categories=Qt;KDE;Development;
- Name[hi]=के-डिफ3
- Name[hne]=के-डिफ3
- Name[ml]=കെഡിഫ്3
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
new file mode 100644
index 00000000000..63d6abeaa92
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
@@ -0,0 +1,46 @@
+# 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.3 2009/06/05 17:50:28 scarabeus Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
+nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="KDE-based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="1"
+IUSE="debug +handbook konqueror"
+
+DEPEND="
+	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
+"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Append missing categories
+	echo "Categories=Qt;KDE;Development;" >> src-QT4/kdiff3.desktop
+
+	# fix handbook
+	if ! use handbook; then
+		sed -e "/add_subdirectory(doc)/ s/^#DONOTWANT /" \
+			-i CMakeLists.txt || die "removing docs failed"
+	fi
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with konqueror LibKonq)"
+
+	kde4-base_src_configure
+}
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index c2b852d5c88..dda377bc3fb 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -23,7 +23,12 @@ RDEPEND="${DEPEND}
 	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-desktop-menu-fix.patch" )
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Append missing categories
+	echo "Categories=Qt;KDE;Development;" >> src/kdiff3.desktop
+}
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}