summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-03-14 18:30:54 +0000
committerPacho Ramos <pacho@gentoo.org>2015-03-14 18:30:54 +0000
commit22b6e13c078b8f5b79e7b4002d3b0af4a6d27621 (patch)
treef95e79f1abbfb5ad9c43ff1c9aad79b32661e828 /dev-util/meld
parentamd64 stable, bug 534012 (diff)
downloadgentoo-2-22b6e13c078b8f5b79e7b4002d3b0af4a6d27621.tar.gz
gentoo-2-22b6e13c078b8f5b79e7b4002d3b0af4a6d27621.tar.bz2
gentoo-2-22b6e13c078b8f5b79e7b4002d3b0af4a6d27621.zip
amd64 stable, bug 534012
(Portage version: 2.2.17/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-3.12.3.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 2c1dd2a37b85..d047d840b30d 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.194 2015/01/17 16:29:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.195 2015/03/14 18:30:54 pacho Exp $
+
+ 14 Mar 2015; Pacho Ramos <pacho@gentoo.org> meld-3.12.3.ebuild:
+ amd64 stable, bug 534012
17 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
Repoman says: unused local USE-description: 'highlight'
diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
index feefa5f3ee6f..583468a52975 100644
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ b/dev-util/meld/meld-3.12.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.1 2015/01/11 12:24:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.2 2015/03/14 18:30:54 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -15,7 +15,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=""
RDEPEND="