summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog6
-rw-r--r--dev-util/meld/Manifest10
-rw-r--r--dev-util/meld/meld-1.6.0.ebuild4
3 files changed, 11 insertions, 9 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/Manifest b/dev-util/meld/Manifest
index 9d0f0614654c..71ac206171ea 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,13 +6,13 @@ DIST meld-1.5.4.tar.xz 339728 SHA256 fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e8896
DIST meld-1.6.0.tar.xz 343800 SHA256 a0ec4e19e85ea4df0214da4c92a4069095d37a252ab240fc1bc00f29a627fea8 SHA512 049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d WHIRLPOOL 91ceeddfbedd96d7f8f2433f049fff8dc64ff1f79892d322a560b8315474d305eb29b0f728c374e69d2207accc9a894182dae71ba224f5af5afd94a910e38abd
EBUILD meld-1.5.2.ebuild 2400 SHA256 1d7dce11a3ca9b34ed6490ec92948e8712c5c5e89dd1b380d1b6fa974a652623 SHA512 5bd739d2245c844fc97c35bf352974bc1bfd90ca2827c99281601958a3e78d9245ad270f49aa92c1e691f87de200acf0b74ead7007938dbbce3d8a469cdd2efd WHIRLPOOL 2df14431e42d9e63e258e41e0fb9d6fe7d20203ef50e2b850f285529606b2304d4792e1f4aa93edca98400d28de2889440aaa2ba3146dcfd084aee0fb42d9830
EBUILD meld-1.5.4.ebuild 2170 SHA256 ae280b3825468d9f1af2b9f14783b6f675e019ee6382b9ab2eb643158bac8e83 SHA512 29ae41d4ce6d5af7476eed36233d466100491a9ae108f6d924d2d0e08b1d6d1fdfe627f90e1c28228f061b927be23f0bd568b70d98e8eb74478f504100ffccba WHIRLPOOL 3052019c65bc69b16d0cb86512435b5f7fa35d06f35c398512fba61aed754429c40786d36871763d2590703820222aaef2819b8851cf46f631ddab552ba94910
-EBUILD meld-1.6.0.ebuild 2174 SHA256 3bc8b1d9fdca0696cb97a8b7e991f9389a2b861936ca7a3270c50c9f51b38b1e SHA512 6608342409222742d7e1c9a1f6c34ffbce323271344b353e4fed5df92dfe76dd226c6d96236819a9e917f2037a2077b8b66b92dd55913281bc41df8a3f3f2e8b WHIRLPOOL 4e10ca0a0f4e216e817a7af8aa4d8a739bee1e39bbe1bf5d9c12086f014d8acdc26bdabcacc8490a120d4ba8be7adc9c53d970481160de4cedc978c5f5716adc
-MISC ChangeLog 19171 SHA256 9fc401c8283fe55e0041f8d1c668936acfc8b77167a33078b67f183b72fe0534 SHA512 664aa9e7a7dbb7f24963f4b769890715b35d6449a4234737a880f4bc51d60f788b3afd496d9101ee95f395dbe187a2521057d67996aaac9ce2e58e5327abf56b WHIRLPOOL 7a2e349000446aa46192b2fa2b14d5ebe478851e99f706ab9ea1018fde54e12f6851e03980457c868a18e6c13ac04e4c2bfc3f0b73a6e0029c751bef5e9e53c3
+EBUILD meld-1.6.0.ebuild 2175 SHA256 a5f934d1a53f74e5e4b7d4174a86b665886f6dc5ab2cd4ad51be58ebbfb4e346 SHA512 1a4c84ce60a406546aa1262567664b371958d81c7510dd474bbc73bf8f88410b98e8bfe3a0df73ab5d927981ba8fe111d98ad14dd26c3e15ee7ab73b854a2ffd WHIRLPOOL e5170f84e6e8cda4b34eeaddc0b154dfd975abbf7292aff0bca5025f0a4a9084ba2bf9fd806907612ac78ec9be73e507363369ccec1200b3d4d38aedc165312f
+MISC ChangeLog 19275 SHA256 56732a147d8f54e1b36c67b4f7a4d6cd421cbee6f3d7c824a863fd8ed15ee81f SHA512 5cdea184f6579ed42d65dbbafa7817e59b877fb840313fa8690e6ccf2c8f9bb6adfb6e05160f6cfabe8009e4f53f600ed4c47a8afa3b2615ef757c60f66027cb WHIRLPOOL e698e6feae8acea1f793b61ac251f7a200efb5deafc99f9bd727706e96726c4309f2bfdede804385c916216a1c3608974ae1d3b36f0d69c5e0a4c582f916c2b4
MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBv+DsACgkQkKaRLQcq0GK5RwCeNVueG9ualo6ljQiSUrVfRRXI
-MSsAn19yNtKYjKsU/akEOnaq7wiHgl4m
-=dVSJ
+iEYEAREIAAYFAlBw00EACgkQl5yvQNBFVTUQoACePo6BSs/03UH36vaQn0xxNyhS
+n1wAn3yJzjONVt+K2nCXqxbd2NO1mn+S
+=vLp0
-----END PGP SIGNATURE-----
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="