summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-03-15 13:20:06 +0000
committerPacho Ramos <pacho@gentoo.org>2015-03-15 13:20:06 +0000
commitd8e39f430a34f36a92380d450c270724df986d1c (patch)
tree15d4a6a29a989c25ea86f5b50c9ec219b330e12d /dev-util/meld
parentx86 stable, bug 534012 (diff)
downloadgentoo-2-d8e39f430a34f36a92380d450c270724df986d1c.tar.gz
gentoo-2-d8e39f430a34f36a92380d450c270724df986d1c.tar.bz2
gentoo-2-d8e39f430a34f36a92380d450c270724df986d1c.zip
x86 stable, bug 534012
(Portage version: 2.2.17/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-3.12.3.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index d047d840b30d..155e4b16e549 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.195 2015/03/14 18:30:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.196 2015/03/15 13:20:06 pacho Exp $
+
+ 15 Mar 2015; Pacho Ramos <pacho@gentoo.org> meld-3.12.3.ebuild:
+ x86 stable, bug 534012
14 Mar 2015; Pacho Ramos <pacho@gentoo.org> meld-3.12.3.ebuild:
amd64 stable, bug 534012
diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
index 583468a52975..18e78779cd91 100644
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ b/dev-util/meld/meld-3.12.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.2 2015/03/14 18:30:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.3 2015/03/15 13:20:06 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -15,7 +15,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=""
RDEPEND="