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
commitaff5d81e40baa04fb4c33cb1a7af8bc07eea2867 (patch)
tree8108821f62136be6a8cffe009bad5edef8d7d3d1 /kde-misc/kdiff3
parentAdd fix from upstream for #253119 by Gilles Dartiguelongue and a change to ho... (diff)
downloadhistorical-aff5d81e40baa04fb4c33cb1a7af8bc07eea2867.tar.gz
historical-aff5d81e40baa04fb4c33cb1a7af8bc07eea2867.tar.bz2
historical-aff5d81e40baa04fb4c33cb1a7af8bc07eea2867.zip
Version bump, show line end style for each file, bugfixes
Package-Manager: portage-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/Manifest4
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.95.ebuild31
3 files changed, 41 insertions, 2 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/Manifest b/kde-misc/kdiff3/Manifest
index 689deae0cb8f..9251152b07f5 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -2,8 +2,10 @@ AUX kdiff3-0.9.92-desktop-entry-fix.diff 2387 RMD160 4802bd372f778e547e2823134af
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
DIST kdiff3-0.9.94.tar.gz 1500507 RMD160 7b6b84bc1c42bd795236c3cac39f2e9246bf34bf SHA1 6c59764ea48e19adcf42f0121e1e3aac80777815 SHA256 b675d7dd164d9955d5c8bb296d6ca30e1afe0d6933aa53ed95cd1a71fbd11c6d
+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.94-r1.ebuild 901 RMD160 f1c16c09d70bfd9af53af843fd280cc6e8d670e6 SHA1 ac28702cca3c44e40e35704690d56e51c70bd1b7 SHA256 ab7926fd721c0ca225e520b11f94d10c8a4e4a3799ce594f51a648833ee05ea7
-MISC ChangeLog 6693 RMD160 55444a141f3475180745604e3396afaae3dae751 SHA1 020abd938411fc26c6f41dfd3e81db4d10ac0eb4 SHA256 94606e3fb32543d1a88310075755670cb53c3a0bc74e083ff1c162d4276fe6bf
+EBUILD kdiff3-0.9.95.ebuild 900 RMD160 4cd8d21d987d8bf9cb2b37ca58b4a037fcf06e8b SHA1 0b1956c0a51edb3d8dc5284b3c09144e29ae2b84 SHA256 b6210f9687da484dfba61155981d5eeac8e2f34f75eb5592cb9fb04b352fc4fd
+MISC ChangeLog 6866 RMD160 75fa7cad5f279bd80008477973b234a6524742b1 SHA1 8aac6e61e1fe1a3def4022d27872b57740cc114b SHA256 6b3eae5969d42d53998f2998ad40bf3dfd4bc6543a92dc0d7b6b056fb2c36356
MISC metadata.xml 256 RMD160 3526c65ba29a53056fed7f794bf33e65fe65ea29 SHA1 c0eb80e73ccee8051579d03bf1f468fc98167e1e SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839
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
+}