summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-12-19 13:36:58 +0000
committerPacho Ramos <pacho@gentoo.org>2014-12-19 13:36:58 +0000
commit60f4758a17cdeb0e4314efd66e27133ecfd769e1 (patch)
treedb65fb5f3a85cf27dff27a6f0249a898ced32481 /dev-util/meld
parentamd64 stable, bug 529964 (diff)
downloadgentoo-2-60f4758a17cdeb0e4314efd66e27133ecfd769e1.tar.gz
gentoo-2-60f4758a17cdeb0e4314efd66e27133ecfd769e1.tar.bz2
gentoo-2-60f4758a17cdeb0e4314efd66e27133ecfd769e1.zip
amd64 stable, bug 529964
(Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", 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.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 93675abb8d9f..bd3218457c0a 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.190 2014/12/18 14:56:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.191 2014/12/19 13:36:58 pacho Exp $
+
+ 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> meld-3.12.2.ebuild:
+ amd64 stable, bug 529964
18 Dec 2014; Pacho Ramos <pacho@gentoo.org> meld-3.12.2.ebuild:
x86 stable, bug 529964
diff --git a/dev-util/meld/meld-3.12.2.ebuild b/dev-util/meld/meld-3.12.2.ebuild
index 539e2e63b155..d59ffbfef352 100644
--- a/dev-util/meld/meld-3.12.2.ebuild
+++ b/dev-util/meld/meld-3.12.2.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-3.12.2.ebuild,v 1.2 2014/12/18 14:56:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.3 2014/12/19 13:36:58 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="