summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-02-12 16:17:25 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-02-12 16:17:25 +0000
commitdc793c54f7a2b475178ee38193bc0fa318794185 (patch)
tree93d62a83b9c9cfaad3180d6df08af825eaeedc8d /kde-misc/kdiff3
parentSparc stable, Bug #258525. (diff)
downloadgentoo-2-dc793c54f7a2b475178ee38193bc0fa318794185.tar.gz
gentoo-2-dc793c54f7a2b475178ee38193bc0fa318794185.tar.bz2
gentoo-2-dc793c54f7a2b475178ee38193bc0fa318794185.zip
Revision bump to change slot, suggested in bug #258384
(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.94-r1.ebuild (renamed from kde-misc/kdiff3/kdiff3-0.9.94.ebuild)7
2 files changed, 11 insertions, 4 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index ae9946d0c4d5..cefa93341948 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.32 2009/02/09 23:24:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.33 2009/02/12 16:17:25 voyageur Exp $
+
+*kdiff3-0.9.94-r1 (12 Feb 2009)
+
+ 12 Feb 2009; Bernard Cafarelli <voyageur@gentoo.org>
+ -kdiff3-0.9.94.ebuild, +kdiff3-0.9.94-r1.ebuild:
+ Revision bump to change slot, suggested in bug #258384
*kdiff3-0.9.94 (09 Feb 2009)
diff --git a/kde-misc/kdiff3/kdiff3-0.9.94.ebuild b/kde-misc/kdiff3/kdiff3-0.9.94-r1.ebuild
index 518ad97c4755..947dcb9ffa7c 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.94.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.94-r1.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.94.ebuild,v 1.2 2009/02/10 16:16:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.94-r1.ebuild,v 1.1 2009/02/12 16:17:25 voyageur Exp $
EAPI="2"
@@ -12,13 +12,14 @@ DESCRIPTION="KDE-based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
-SLOT="0"
+SLOT="1"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"
IUSE="debug htmlhandbook"
RDEPEND=">=kde-base/libkonq-${KDE_MINIMAL}[kdeprefix=]
- sys-apps/diffutils"
+ sys-apps/diffutils
+ !kdeprefix? ( !kde-misc/kdiff3:0 )"
src_prepare() {
# fix handbook