summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-03-09 10:46:08 +0000
committerPacho Ramos <pacho@gentoo.org>2014-03-09 10:46:08 +0000
commita696434843c11d477847f9aa32809e89cca35d0f (patch)
tree581527838939c2ae72f7ff248ef42608799c1a05 /dev-util/meld
parentamd64 stable, bug 499954 (diff)
downloadgentoo-2-a696434843c11d477847f9aa32809e89cca35d0f.tar.gz
gentoo-2-a696434843c11d477847f9aa32809e89cca35d0f.tar.bz2
gentoo-2-a696434843c11d477847f9aa32809e89cca35d0f.zip
amd64 stable, bug 499954
(Portage version: 2.2.8-r1/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-1.8.4.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 898dc54b1cae..1b399f94f215 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.177 2014/02/22 21:31:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.178 2014/03/09 10:46:08 pacho Exp $
+
+ 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> meld-1.8.4.ebuild:
+ amd64 stable, bug 499954
22 Feb 2014; Pacho Ramos <pacho@gentoo.org> meld-1.8.4.ebuild:
Fix wrong commit, bug 502160
diff --git a/dev-util/meld/meld-1.8.4.ebuild b/dev-util/meld/meld-1.8.4.ebuild
index c0500680c930..4e183ff94777 100644
--- a/dev-util/meld/meld-1.8.4.ebuild
+++ b/dev-util/meld/meld-1.8.4.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.4.ebuild,v 1.3 2014/02/22 21:31:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.4.ebuild,v 1.4 2014/03/09 10:46:08 pacho 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}"