summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-10-07 00:57:26 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-10-07 00:57:26 +0000
commitfd15d6271d2f2b9d93c5f69c0fdc66606d7ad2e3 (patch)
tree97ad51c1225433cf1b4e08e67dfede95377fc6b9 /dev-util/meld
parentstable ppc64, bug #427544 (diff)
downloadgentoo-2-fd15d6271d2f2b9d93c5f69c0fdc66606d7ad2e3.tar.gz
gentoo-2-fd15d6271d2f2b9d93c5f69c0fdc66606d7ad2e3.tar.bz2
gentoo-2-fd15d6271d2f2b9d93c5f69c0fdc66606d7ad2e3.zip
stable ppc64, bug #427544
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog6
-rw-r--r--dev-util/meld/meld-1.6.0.ebuild4
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 4743eb38c0b6..6b5842fdefbc 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.148 2012/10/06 09:18:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.149 2012/10/07 00:57:26 blueness Exp $
+
+ 07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> meld-1.6.0.ebuild:
+ stable ppc64, bug #427544
06 Oct 2012; Markus Meier <maekke@gentoo.org> meld-1.6.0.ebuild:
arm stable, bug #427544
@@ -563,4 +566,3 @@
08 Jun 2003; Alastair Tse <liquidx@gentoo.org> meld-0.8.1.ebuild,
files/meld-0.8.1-gentoo.diff:
new package. thanks to suka <suka@t0.or.at> (#21578)
-
diff --git a/dev-util/meld/meld-1.6.0.ebuild b/dev-util/meld/meld-1.6.0.ebuild
index 2b48dffd3017..48960c764705 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.4 2012/10/06 09:18:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.0.ebuild,v 1.5 2012/10/07 00:57:26 blueness 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="