summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2012-10-04 14:51:49 +0000
committerAgostino Sarubbo <ago@gentoo.org>2012-10-04 14:51:49 +0000
commitf5aa312b03e3b0abaa725dbdfe9bb302d27c4244 (patch)
tree937bd5a1dfb6f64524a64e974aec50e5d92d15f6 /dev-util
parentStable for amd64, wrt bug #427544 (diff)
downloadgentoo-2-f5aa312b03e3b0abaa725dbdfe9bb302d27c4244.tar.gz
gentoo-2-f5aa312b03e3b0abaa725dbdfe9bb302d27c4244.tar.bz2
gentoo-2-f5aa312b03e3b0abaa725dbdfe9bb302d27c4244.zip
Stable for amd64, wrt bug #427544
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.6.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 382a96eee44f..99c545addf85 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.146 2012/10/03 11:40:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.147 2012/10/04 14:51:49 ago Exp $
+
+ 04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> meld-1.6.0.ebuild:
+ Stable for amd64, wrt bug #427544
03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> meld-1.6.0.ebuild:
x86 stable wrt bug #427544
diff --git a/dev-util/meld/meld-1.6.0.ebuild b/dev-util/meld/meld-1.6.0.ebuild
index 93b979f63312..f24a3ab6f2ce 100644
--- a/dev-util/meld/meld-1.6.0.ebuild
+++ b/dev-util/meld/meld-1.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.0.ebuild,v 1.2 2012/10/03 11:40:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.0.ebuild,v 1.3 2012/10/04 14:51:49 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="doc gnome"
RDEPEND="