summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-11-09 11:50:01 +0000
committerMarkus Meier <maekke@gentoo.org>2008-11-09 11:50:01 +0000
commitcc26d2ea226bcfc77f310c58fa3529264dd94eb6 (patch)
tree79813f0a01883fc64d1bf63237da1779949ba2fe /dev-util/meld
parentarm/s390/sh stable (diff)
downloadhistorical-cc26d2ea226bcfc77f310c58fa3529264dd94eb6.tar.gz
historical-cc26d2ea226bcfc77f310c58fa3529264dd94eb6.tar.bz2
historical-cc26d2ea226bcfc77f310c58fa3529264dd94eb6.zip
amd64/x86 stable, bug #246061
Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26.7 x86_64
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/Manifest10
-rw-r--r--dev-util/meld/meld-1.2.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 167fb73bcdc8..f5eb312b88e1 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.81 2008/09/21 21:38:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.82 2008/11/09 11:50:01 maekke Exp $
+
+ 09 Nov 2008; Markus Meier <maekke@gentoo.org> meld-1.2.ebuild:
+ amd64/x86 stable, bug #246061
21 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> meld-1.2.ebuild:
respect LINGUAS, bug #183086.
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 7332a57e2e8e..d0607c15de9e 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,13 +6,13 @@ DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4
DIST meld-1.2.tar.bz2 616975 RMD160 a06fee2f8f882a1edba329bd0be7797f89852920 SHA1 aa246307226332b865216d139c10de4c73562fc1 SHA256 361befb14a0391b21ab9d96ee1ebd93c09246a135c07a0636d6d50895ededc0f
EBUILD meld-1.1.5.1-r1.ebuild 1497 RMD160 1be9bf2a35108ae03fc121f621704ec781e183a1 SHA1 22220c6d5414f62c5d79b1b270a02d23fa925f72 SHA256 0f8607da349cf7dde2fe5afec815e70656d12c649cecc5d0421ddb481fb9f7ca
EBUILD meld-1.1.5.1.ebuild 1207 RMD160 3ba400cd955be3555f2bea1c0d38906a6aff899f SHA1 a9bfe86a1c653592c9fe8ccae83485a56171e0ef SHA256 55fad28cd6fd96ae958cf9852f675fd99b330916ef9cdeca06707076644abea4
-EBUILD meld-1.2.ebuild 1783 RMD160 79f59a4780d9777ee900f6e703cc094298b83733 SHA1 9f89ae48c51fde1b84f1038f4a7fe6afa3155384 SHA256 7a3dd39ff1509f1742a8acfbd881dcb981ea7d37477f621676edec84801ce61e
-MISC ChangeLog 11085 RMD160 c6863baf8c3b211e6bde5ce49ca9bfcae0dc6e80 SHA1 b5735da1d8008c100e5fe9321f6eb37ed9175ab1 SHA256 f3eea189e2cc891c8a23921e669adb92a639b939cbad70c968c8c4bd0df1b9b3
+EBUILD meld-1.2.ebuild 1784 RMD160 3312561fd27c5cee6d678356b6ff72342b9b52af SHA1 4c05010680f5997ca497d1a1c345dec82f4cc536 SHA256 f9d4283b88a9426bb495e7000fe580229d589c5547cd1ea385569fcf44c73f99
+MISC ChangeLog 11186 RMD160 02c9d74aea676b512397a92ed6e5c0b8f0316b4c SHA1 4f156324e9e83a28b7c00dc826ce7530859d002e SHA256 2377a45f5a20878e49a7f6f39721745335bb4a8ee14f9382080a7a81d94305ba
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkjWvuEACgkQ1fmVwcYIWAbQMgCeOKRiaZZDDApOj9TduhLCdW5w
-ZBoAnj5vxsyMSpbdIqGdQlTVyfEtM1Q+
-=Uxac
+iEYEARECAAYFAkkWznUACgkQkKaRLQcq0GKHIgCfURuAhQCodQUVZqEtqU1+XTxR
+1hwAnj8hlA372W/21v771xEqp2sP2kzB
+=+KxP
-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.2.ebuild b/dev-util/meld/meld-1.2.ebuild
index 91f97901dafa..34a398585d68 100644
--- a/dev-util/meld/meld-1.2.ebuild
+++ b/dev-util/meld/meld-1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2.ebuild,v 1.2 2008/09/21 21:38:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2.ebuild,v 1.3 2008/11/09 11:50:01 maekke Exp $
inherit python gnome2 eutils multilib
@@ -9,7 +9,7 @@ HOMEPAGE="http://meld.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc gnome"
RDEPEND=">=dev-lang/python-2.3