summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-03-29 13:32:00 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-03-29 13:32:00 +0000
commit947faac635f997c8948bd5a507afbd7a6c7af0f8 (patch)
tree42c2779652c26cd171ca7510e2eec0f810cbd055 /dev-util/meld
parentStable for ia64, wrt bug #458984 (diff)
downloadgentoo-2-947faac635f997c8948bd5a507afbd7a6c7af0f8.tar.gz
gentoo-2-947faac635f997c8948bd5a507afbd7a6c7af0f8.tar.bz2
gentoo-2-947faac635f997c8948bd5a507afbd7a6c7af0f8.zip
Stable for ia64, 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.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index e4d0a672a1b4..96d93cfb5eb7 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.160 2013/03/28 15:54:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.161 2013/03/29 13:32:00 ago Exp $
+
+ 29 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
+ Stable for ia64, wrt bug #458984
28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
Stable for arm, wrt bug #458984
diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild
index d2cc0abef5e7..f8bb42d29f7f 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-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.6 2013/03/28 15:54:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.7 2013/03/29 13:32:00 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