summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-10-03 11:40:32 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-10-03 11:40:32 +0000
commitb620ff506a01e1c4b4d73ea4003452aa3c8fab3c (patch)
treec068fd9d18c4db5f2da81a795689218754ee1109 /dev-util/meld
parentx86 stable wrt bug #427544 (diff)
downloadgentoo-2-b620ff506a01e1c4b4d73ea4003452aa3c8fab3c.tar.gz
gentoo-2-b620ff506a01e1c4b4d73ea4003452aa3c8fab3c.tar.bz2
gentoo-2-b620ff506a01e1c4b4d73ea4003452aa3c8fab3c.zip
x86 stable wrt bug #427544
(Portage version: 2.1.11.9/cvs/Linux i686)
Diffstat (limited to 'dev-util/meld')
-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 c43be78f70c2..382a96eee44f 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.145 2012/07/15 17:19:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.146 2012/10/03 11:40:32 phajdan.jr Exp $
+
+ 03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> meld-1.6.0.ebuild:
+ x86 stable wrt bug #427544
15 Jul 2012; Raúl Porcel <armin76@gentoo.org> meld-1.5.4.ebuild:
alpha/ia64/sparc stable wrt #410611
diff --git a/dev-util/meld/meld-1.6.0.ebuild b/dev-util/meld/meld-1.6.0.ebuild
index 366107322e5c..93b979f63312 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.1 2012/04/29 18:51:22 pacho Exp $
+# $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 $
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="