summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-03-26 16:51:18 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-03-26 16:51:18 +0000
commita731e7607d600ee7dd10c471763a70abf53d6402 (patch)
treec15c0e600325dd85b110feda6b1e5c77d47d92b9 /dev-util/meld
parentStable for ppc, wrt bug #458984 (diff)
downloadgentoo-2-a731e7607d600ee7dd10c471763a70abf53d6402.tar.gz
gentoo-2-a731e7607d600ee7dd10c471763a70abf53d6402.tar.bz2
gentoo-2-a731e7607d600ee7dd10c471763a70abf53d6402.zip
Stable for ppc, wrt bug #458984
(Portage version: 2.1.11.52/cvs/Linux ppc64, RepoMan options: --force, 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 fd93d94f29dd..92e5859a71bf 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.157 2013/03/25 16:25:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.158 2013/03/26 16:51:18 ago Exp $
+
+ 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
+ Stable for ppc, wrt bug #458984
25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
Stable for x86, wrt bug #458984
diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild
index eb5be1b3a6ca..99e7f0de8fcb 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.3 2013/03/25 16:25:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.4 2013/03/26 16:51:18 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