summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2014-07-23 15:16:02 +0000
committerAgostino Sarubbo <ago@gentoo.org>2014-07-23 15:16:02 +0000
commit7abebc0c4b331809a3268db9dbacd843636af5b6 (patch)
tree527015fdda00adea219a935fcdaf6df5f5da71f6
parentStable for x86, wrt bug #512012 (diff)
downloadgentoo-2-7abebc0c4b331809a3268db9dbacd843636af5b6.tar.gz
gentoo-2-7abebc0c4b331809a3268db9dbacd843636af5b6.tar.bz2
gentoo-2-7abebc0c4b331809a3268db9dbacd843636af5b6.zip
Stable for x86, wrt bug #512012
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.8.5.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 137fb7e7faa6..33f6c40ec57e 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.182 2014/07/22 10:44:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.183 2014/07/23 15:16:02 ago Exp $
+
+ 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> meld-1.8.5.ebuild:
+ Stable for x86, wrt bug #512012
22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> meld-1.8.5.ebuild:
Stable for amd64, wrt bug #512912
diff --git a/dev-util/meld/meld-1.8.5.ebuild b/dev-util/meld/meld-1.8.5.ebuild
index 877a8afac410..4793f3d83195 100644
--- a/dev-util/meld/meld-1.8.5.ebuild
+++ b/dev-util/meld/meld-1.8.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild,v 1.2 2014/07/22 10:44:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild,v 1.3 2014/07/23 15:16:02 ago Exp $
EAPI="5"
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"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"