summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-03-25 15:46:33 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-03-25 15:46:33 +0000
commit39ca08c0391e6e1ea58cde56a4bc10c69bc8b75c (patch)
treecf084fe769a49e4ffd2fdc983c3ef2f33440c3f2 /dev-util/meld
parentStable for amd64, wrt bug #458984 (diff)
downloadgentoo-2-39ca08c0391e6e1ea58cde56a4bc10c69bc8b75c.tar.gz
gentoo-2-39ca08c0391e6e1ea58cde56a4bc10c69bc8b75c.tar.bz2
gentoo-2-39ca08c0391e6e1ea58cde56a4bc10c69bc8b75c.zip
Stable for amd64, wrt bug #458984
(Portage version: 2.1.11.52/cvs/Linux ppc64, signed Manifest commit with key 7194459F)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.7.0.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index a7d5cb25b278..525b595ac064 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.155 2013/03/07 08:10:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.156 2013/03/25 15:46:33 ago Exp $
+
+ 25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
+ Stable for amd64, wrt bug #458984
07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.6.1.ebuild:
Clean up old revisions.
diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild
index 66d252223893..052dd95afa61 100644
--- a/dev-util/meld/meld-1.7.0.ebuild
+++ b/dev-util/meld/meld-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.1 2012/11/25 10:51:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.2 2013/03/25 15:46:33 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+highlight gnome"
RDEPEND=">=dev-python/pygtk-2.14:2