summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2012-04-29 15:43:41 +0000
committerMarkus Meier <maekke@gentoo.org>2012-04-29 15:43:41 +0000
commit1a8aa5a7472026ceac024b5122622271474f2f0e (patch)
treedcaec96c32079260b852fea727472fbef34dc07e /dev-util/meld
parentx86 stable, bug #410611 (diff)
downloadgentoo-2-1a8aa5a7472026ceac024b5122622271474f2f0e.tar.gz
gentoo-2-1a8aa5a7472026ceac024b5122622271474f2f0e.tar.bz2
gentoo-2-1a8aa5a7472026ceac024b5122622271474f2f0e.zip
x86 stable, bug #410611
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.5.4.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index b75ae9b3591f..0af351ea26e4 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.141 2012/04/25 20:15:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.142 2012/04/29 15:43:41 maekke Exp $
+
+ 29 Apr 2012; Markus Meier <maekke@gentoo.org> meld-1.5.4.ebuild:
+ x86 stable, bug #410611
25 Apr 2012; Markus Meier <maekke@gentoo.org> meld-1.5.4.ebuild:
arm stable, bug #410611
diff --git a/dev-util/meld/meld-1.5.4.ebuild b/dev-util/meld/meld-1.5.4.ebuild
index f31b97203a53..821d828a7d10 100644
--- a/dev-util/meld/meld-1.5.4.ebuild
+++ b/dev-util/meld/meld-1.5.4.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.5.4.ebuild,v 1.4 2012/04/25 20:15:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.4.ebuild,v 1.5 2012/04/29 15:43:41 maekke 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="