Stable for amd64, wrt bug #458984

Package-Manager: portage-2.1.11.52/cvs/Linux ppc64
Manifest-Sign-Key: 0x7194459F

3 files changed, 23 insertions, 10 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index a7d5cb25b278..525b595ac064 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.155 2013/03/07 08:10:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.156 2013/03/25 15:46:33 ago Exp $
+
+  25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
+  Stable for amd64, wrt bug #458984
 
   07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.6.1.ebuild:
   Clean up old revisions.
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 08d4008a1ffd..7c4520945707 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST meld-1.6.0.tar.xz 343800 SHA256 a0ec4e19e85ea4df0214da4c92a4069095d37a252ab240fc1bc00f29a627fea8 SHA512 049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d WHIRLPOOL 91ceeddfbedd96d7f8f2433f049fff8dc64ff1f79892d322a560b8315474d305eb29b0f728c374e69d2207accc9a894182dae71ba224f5af5afd94a910e38abd
 DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
 EBUILD meld-1.6.0.ebuild 2170 SHA256 bc9f3432ea8e3fbd70e5bc85dd2a92537eb947531c791c79377cb4d6c1f73608 SHA512 3b47b28ecd938e275179b410fb05e1662c054142623a39b4d77d8d918e0408d9694440d7673fcd5f323e22bb1a75fe515e7e02d2e5a1cec21a4acd5d5a38469f WHIRLPOOL 0ba136fc28122740179166ef2911c17012e2845c50a21ca33aa3bb69f891ba538c1cbc2457344406cc7abaa9c660a83476254a2efdee8b167525604dea15310a
-EBUILD meld-1.7.0.ebuild 2408 SHA256 1861fb0c276b6c9d29825dd536a655b8e4fd1676f09d83640005e1d2c58daa66 SHA512 bb45290ace317d1de00affcd7cdf257496c911ad76c96ee751adee6abd273ce5f7f1283dffe538456c9025f80da40bc84c8e820e4613e6c201bc7787973c75a7 WHIRLPOOL 045117ef2c06725e45dd8d6bd8cd5098cb2a7d71c6af287c31e562eaf247c4716522f751cd8babe16a34e15fc6c78692afad1d656369cfca26534200e02d7e41
-MISC ChangeLog 20026 SHA256 89a562fe951bae6bffcd70962caa5d3735188d95d11cd1bf23dda291e27b7deb SHA512 91f2b435882a787f0c1a6d412ac7a12404621fd129f61b436682d47d8d06b264b60066729aeb991ae90a82e30bb23a9dfe36b4fdc882f6916b8809859828581a WHIRLPOOL f55c9d8cffda750ebe4ea816105fa165c39623107f18ee0f9f6f8f324c1f9d5949eec191fc1e4c8f0c7a9f8cc2d5009eab936e5918fc10935524b7f2391dd418
+EBUILD meld-1.7.0.ebuild 2407 SHA256 50723216c8f08f2d1e176236d3ef158ab15f246cbec5e74d8c0e537a4fdc28e4 SHA512 17324653a5b5ead173b172e0d3d750db6b3070d0a793067ec1f5a9bf6710169e4dfa4ead60441eb317b02f51b3b56e1c730a1546f23366aec8ba261cfcdd86a5 WHIRLPOOL b71fdcf22dc89d9a10335e2ce1020865c82ff1396d7d4019a728ff84f7b4355abc52203f21a4f729551c9feaaa8d1988670891ba446e256bacdff360eb8a4ff4
+MISC ChangeLog 20131 SHA256 3e9f9e926b126c9ed87a3d0c79c8fe1ab7bab9d49983da2413d752cbfc8da1e3 SHA512 aaf47c4074cd691e800608c59b68f3287506206480849c31092c536ae32ea79ba0481e6bc8b18c8a327b49aa3d36aa9c365cf9bd9f6dd584111924851902c373 WHIRLPOOL 45a872fced30ff3d117fb2a561978a7143c4721b64f1a8371315f52f37929e046788d4b91862ecd2e308913b7d4d3e3e535b3c2b4ed71530472987fccd5da237
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE4S18ACgkQ1fmVwcYIWAZ6PgCgi8pco7KLOrwU/Qe2RdDPXmvN
-+r0AoJltGGGafDDTvOPYEeSLUqEB9+zm
-=/avC
+iQIcBAEBCgAGBQJRUHDIAAoJELp701BxlEWfxKcP/23QVBxJzTmBYPKRwBVV/0UU
+h+0/BUMAGpPcgeF8P2g2QqWxNi4dNMqT+6FIq+MULYiRg5jgtkBCATJj7F4JDkqN
+zNLVOWpaTVqA5cCY6BGy4aHdfKzJ0H/DtSlyOpNGBA/JlTEPpmtuPJFkUf4mQ+ix
+AfWuQ/bxrBme753Yyv+oh1bBjqh8OPTLSEc9dokovg/hVz+bWwHtJJjXMjjP0bnL
+D+zbibmKgWAtPd9nFoFaR26zoZxzKuLKvzs5OnFbTyirazmIDLhtZ9XHSaEjJuxC
+QNimKpW0kBTjSPJISv7V2su1brJZzrpKHFrt+/U+WXbZkKBJ3sZook1Z/KB8YZrO
+Mnycd0WpA7FW5DSdFZJN8Nx7ygEX24W76/VTjeDSF1ENesFcgn7cg25Ym3eEenih
+4XxK2Pz2h0kxlzDPUp+1497pn5y7kPoYkSRpeJ6iyoBm8JoQ263LMoDSa3kPQ/fs
+1QmO23OLhT7IIxOC81MmQTpWGDFBcbvcisxsuWnL/PqYxXfUHaFrJ5fysqmHh367
+b6ecpLkOn5rIAWk6sFbHCyH/L/1WlPNayfHgrRJXurRnYA57CgWfq9MQJ+m56xEv
+rpqZ2E8M4Le9f6DeakHyGkGnBOz0XXT1ZTjcEo47p2BhcXPTDgTAPzCjMlKICc6/
+v7mkpAYTATiVcuL0Hlvj
+=hQGc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild
index 66d252223893..052dd95afa61 100644
--- a/dev-util/meld/meld-1.7.0.ebuild
+++ b/dev-util/meld/meld-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.1 2012/11/25 10:51:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.2 2013/03/25 15:46:33 ago 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="+highlight gnome"
 
 RDEPEND=">=dev-python/pygtk-2.14:2