summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2014-07-22 10:44:47 +0000
committerAgostino Sarubbo <ago@gentoo.org>2014-07-22 10:44:47 +0000
commit71d78768fda9caf6a21082987016456e78c82dad (patch)
tree11512dad759df5c4ad529507a89ebb68f8535f6d /dev-util
parentStable for amd64, wrt bug #512912 (diff)
downloadgentoo-2-71d78768fda9caf6a21082987016456e78c82dad.tar.gz
gentoo-2-71d78768fda9caf6a21082987016456e78c82dad.tar.bz2
gentoo-2-71d78768fda9caf6a21082987016456e78c82dad.zip
Stable for amd64, wrt bug #512912
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)
Diffstat (limited to 'dev-util')
-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 8c86544c9e98..137fb7e7faa6 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.181 2014/05/31 10:37:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.182 2014/07/22 10:44:47 ago Exp $
+
+ 22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> meld-1.8.5.ebuild:
+ Stable for amd64, wrt bug #512912
*meld-1.8.5 (31 May 2014)
diff --git a/dev-util/meld/meld-1.8.5.ebuild b/dev-util/meld/meld-1.8.5.ebuild
index 951549a2365c..877a8afac410 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.1 2014/05/31 10:37:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild,v 1.2 2014/07/22 10:44:47 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}"