summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-03-04 09:08:22 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-03-04 09:08:22 +0000
commit41c5eb0d96a813bf821837a9c3c83a9b477c457a (patch)
treecaae3574b87a5894a65f54adb5bdb3aeeac14578 /kde-misc/kdiff3
parentAdd fix from upstream for #253119 by Gilles Dartiguelongue and a change to ho... (diff)
downloadgentoo-2-41c5eb0d96a813bf821837a9c3c83a9b477c457a.tar.gz
gentoo-2-41c5eb0d96a813bf821837a9c3c83a9b477c457a.tar.bz2
gentoo-2-41c5eb0d96a813bf821837a9c3c83a9b477c457a.zip
Version bump, show line end style for each file, bugfixes
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/ChangeLog8
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.95.ebuild31
2 files changed, 38 insertions, 1 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 3555318db7db..c044b5753b08 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.35 2009/02/25 01:04:24 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.36 2009/03/04 09:08:22 voyageur Exp $
+
+*kdiff3-0.9.95 (04 Mar 2009)
+
+ 04 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
+ +kdiff3-0.9.95.ebuild:
+ Version bump, show line end style for each file, bugfixes
25 Feb 2009; Joseph Jezak <josejx@gentoo.org> kdiff3-0.9.94-r1.ebuild:
Marked ~ppc for bug #258384.
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
new file mode 100644
index 000000000000..4a138328337b
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.95.ebuild
@@ -0,0 +1,31 @@
+# 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.1 2009/03/04 09:08:22 voyageur 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"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug htmlhandbook"
+
+RDEPEND=">=kde-base/libkonq-${KDE_MINIMAL}[kdeprefix=]
+ sys-apps/diffutils
+ !kdeprefix? ( !kde-misc/kdiff3:0 )"
+
+src_prepare() {
+ # fix handbook
+ if ! use htmlhandbook; then
+ sed -i \
+ -e "/add_subdirectory(doc)*$/ s/^#DONOTWANT //" \
+ "${S}"/CMakeLists.txt || die "removing docs failed"
+ fi
+}