summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-24 13:49:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-24 13:49:27 +0000
commitdc4b21499d3aca27c2432dbdd62724b355263fad (patch)
tree94dbee2e54c1d12d8adc8c77cc470f67ce251b78 /dev-util/meld
parentppc stable wrt #410611 (diff)
downloadhistorical-dc4b21499d3aca27c2432dbdd62724b355263fad.tar.gz
historical-dc4b21499d3aca27c2432dbdd62724b355263fad.tar.bz2
historical-dc4b21499d3aca27c2432dbdd62724b355263fad.zip
ppc stable wrt #410611
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64 RepoMan-Options: --force
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 21ae53a91b7f..25b81cdef136 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.143 2012/04/29 18:51:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.144 2012/05/24 13:49:27 ssuominen Exp $
+
+ 24 May 2012; Samuli Suominen <ssuominen@gentoo.org> meld-1.5.4.ebuild:
+ ppc stable wrt #410611
*meld-1.6.0 (29 Apr 2012)
diff --git a/dev-util/meld/meld-1.5.4.ebuild b/dev-util/meld/meld-1.5.4.ebuild
index 821d828a7d10..bc1acf05a822 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.5 2012/04/29 15:43:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.4.ebuild,v 1.6 2012/05/24 13:49:27 ssuominen 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="