stable x86, bug #152878

Package-Manager: portage-2.1.1-r2

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 2a7b1c38eb9770c87e370d069ad38ab136269944..056c6bec7ae84a0513c0658b7404ecf87e8dc6d8 100644 (file)
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.48 2007/01/10 09:38:51 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.49 2007/01/10 10:56:50 opfer Exp $
+
+  10 Jan 2007; Christian Faulhammer <opfer@gentoo.org> meld-1.1.4.ebuild:
+  stable x86, bug #152878
 
   10 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> meld-1.1.3.ebuild,
   meld-1.1.4.ebuild:

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index c8c342d71d6eb9d027852ea0e9a30b9ed9fd4bcf..cc8a1522723a540a636c13cd365d3feca3c36a0a 100644 (file)
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 SHA1 d2c84e9db6971f8cd23787e0dda53f09c8f17e56 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b
 MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005
 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005
@@ -8,14 +11,14 @@ EBUILD meld-1.1.3.ebuild 1197 RMD160 bd4653730b5d49b23c85e5786d42f329e3f20352 SH
 MD5 9033dfac0da73cf0005b0278949afefb meld-1.1.3.ebuild 1197
 RMD160 bd4653730b5d49b23c85e5786d42f329e3f20352 meld-1.1.3.ebuild 1197
 SHA256 126459a06fea36e205cddee4ef0ab61b36afae8baaedc3931aa381438c898d3b meld-1.1.3.ebuild 1197
-EBUILD meld-1.1.4.ebuild 1312 RMD160 c110f4c2c71ff79f1d4ed75885b15bec577bc9e2 SHA1 d6607a20cc7a2595a800dca3ca190a666c56ea6d SHA256 3311762253f9dc3b13e8985813c1a90728410652d667e5f2b329b51f78540387
-MD5 e612d94ce23e7e91e530bd4f192b3786 meld-1.1.4.ebuild 1312
-RMD160 c110f4c2c71ff79f1d4ed75885b15bec577bc9e2 meld-1.1.4.ebuild 1312
-SHA256 3311762253f9dc3b13e8985813c1a90728410652d667e5f2b329b51f78540387 meld-1.1.4.ebuild 1312
-MISC ChangeLog 7180 RMD160 b2ad554dd016966816d0dc9bd0b9ce6c341e1399 SHA1 e29c3a370f62310a3a6c67946152557661d4741e SHA256 819a8e4e209f4e33ee14e6980698237b954438833c3be39626e37a080bbf9ccc
-MD5 34388409f8d5071f8596083a30954bb7 ChangeLog 7180
-RMD160 b2ad554dd016966816d0dc9bd0b9ce6c341e1399 ChangeLog 7180
-SHA256 819a8e4e209f4e33ee14e6980698237b954438833c3be39626e37a080bbf9ccc ChangeLog 7180
+EBUILD meld-1.1.4.ebuild 1308 RMD160 5185e2226755764067e0df192d9f5db06f239143 SHA1 5b5fec54f4cfad6e3038d9ae195e76e2c2d1e184 SHA256 2375831bdd1070040364c46e927dfe3370308447c769962872ac2591ade4352c
+MD5 a38275735ba008fc2f793ad72f582824 meld-1.1.4.ebuild 1308
+RMD160 5185e2226755764067e0df192d9f5db06f239143 meld-1.1.4.ebuild 1308
+SHA256 2375831bdd1070040364c46e927dfe3370308447c769962872ac2591ade4352c meld-1.1.4.ebuild 1308
+MISC ChangeLog 7278 RMD160 4602981885fbdda4783a4df679a84874db8667b0 SHA1 9d966a8e55af62efd1779dd5bf23fd2b96528e54 SHA256 1c21881a3a4a961cc17c68b8768c34f5a889d1a9dc6637087b9eadff1f157a25
+MD5 504bfbe3eca9f0d045dd01bae44cc1a1 ChangeLog 7278
+RMD160 4602981885fbdda4783a4df679a84874db8667b0 ChangeLog 7278
+SHA256 1c21881a3a4a961cc17c68b8768c34f5a889d1a9dc6637087b9eadff1f157a25 ChangeLog 7278
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -26,3 +29,10 @@ SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/di
 MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpMZlNQqtfCuFneMRAjAsAJoC+VhygCtCZmDqs3rBkTrs+XUOCgCgjThz
+WdSGNxO0OE9PgQEpxdW38+U=
+=Ek/2
+-----END PGP SIGNATURE-----

diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild
index ff07b7c59063f0a380b7b82b229c4cb0c0edfa70..945f9678186311c557d8477b94527f218efc3bd3 100644 (file)
--- a/dev-util/meld/meld-1.1.4.ebuild
+++ b/dev-util/meld/meld-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.7 2007/01/10 09:38:51 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.8 2007/01/10 10:56:50 opfer Exp $
 
 inherit python gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://meld.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc sparc x86"
 IUSE="doc gnome"
 
 DEPEND=">=dev-lang/python-2.3