summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-12-19 13:36:59 +0000
committerPacho Ramos <pacho@gentoo.org>2014-12-19 13:36:59 +0000
commit5fbbbbe5db7140604e18268121b9967a426f41a2 (patch)
treea2f8b839b7eb6331b078c352e6fd278af35e3ca3 /dev-util/meld
parentamd64 stable, bug 529964 (diff)
downloadhistorical-5fbbbbe5db7140604e18268121b9967a426f41a2.tar.gz
historical-5fbbbbe5db7140604e18268121b9967a426f41a2.tar.bz2
historical-5fbbbbe5db7140604e18268121b9967a426f41a2.zip
amd64 stable, bug 529964
Package-Manager: portage-2.2.15/cvs/Linux x86_64 RepoMan-Options: --include-arches="amd64" Manifest-Sign-Key: 0xA188FBD4
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-3.12.2.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 93675abb8d9f..bd3218457c0a 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.190 2014/12/18 14:56:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.191 2014/12/19 13:36:58 pacho Exp $
+
+ 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> meld-3.12.2.ebuild:
+ amd64 stable, bug 529964
18 Dec 2014; Pacho Ramos <pacho@gentoo.org> meld-3.12.2.ebuild:
x86 stable, bug 529964
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 8f68d0d1e77e..7abe1e06fc87 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,13 +6,13 @@ DIST meld-3.12.1.tar.xz 461632 SHA256 8e09284f8d50347386a428e1a2222f2b3a704bf84b
DIST meld-3.12.2.tar.xz 461932 SHA256 0938e6e6b4de59dbf66947f67c8c5c3d3c834feb8dabae3a047154af9544a101 SHA512 90158658fb620d3471aec8d093ef11d9bba60bd3bf14023c8ae5d685ac61aba41ca9beff9fff02c4b5e256d446752bdf27e3a23b56146c74ae4a24776c30c759 WHIRLPOOL 6bb2bf575d483f7d07d462fa675b085947d7e0717efdd606d6a43bd4dc7c5db9cdb6fb1fee0cf08b3ee94a8a840f3ecb5ccf23d0b630d729a1133959a073bf68
EBUILD meld-1.8.5.ebuild 1839 SHA256 0d32d790f5b87cea4409b262339441c443afeb9a79eaa9040b359862cf77aeb9 SHA512 85d6fb5266174888b8dbcf4f8e17678bcd4bfeb65410538577ce9a3b7a526c55efad5227da4b9e232a28c52f7487c94ff8867e9ae6c4e0717bc45689a9fb4ba6 WHIRLPOOL d8b283ad0d2d3d54d96c6503ba1dc8ff0bd336ba974b1b849f463bacd08eef942628e83cb1044f3d6be5538278f2d76b4ed6cedba93aac563b2054af7c1e1fd2
EBUILD meld-3.12.1.ebuild 1011 SHA256 0ab20001934a0f74cb87d20dce496d3d882c1e5ff58d3ef494d4cd6ca0d6c971 SHA512 7f11406df269e418faa118b4374a953a896a61895512dddc225608994c3f185b5bf709e035b4cca85b80cea00c12837b369f293fb2849244507f20562a5e4407 WHIRLPOOL 33238367964f3844e10af31a4f1d69137010805dab005b5683004f8f4b0836ebf28765096ab6e51f96fe160a564b15b1b283e1122d13b19330e4759faeec21b7
-EBUILD meld-3.12.2.ebuild 1012 SHA256 6fb4e36c17f24e4283986d478ab5424d08e061c3e985ac3e4895e041ca970d0c SHA512 0f66d27c683f0038e2bc759cb5b25d2e8ee3807a331aae42217afed5ae70115ab07202112e043f13920aef8c8b4f99c6af5d56fbf4a6db6216bc85e7ef1071be WHIRLPOOL 1fbd2f237922364f9f5814d43e8e209ad45d8a2658c577226beb0d6c2f1e1bfc87cfcaaf29257930fc3fbcc1768d297a3b6e300bd8a5d0c8086491a4713f8b0c
-MISC ChangeLog 24376 SHA256 abb75ccabaa724ab6be7f2449531a694dea0ee828321af79d88ae04a01ee6bbf SHA512 b488ab6706f6f7c5f5eaa2ab8076ca4f1a4db759518d8d85dcb877429889b6f7d44869b2af5c9d50aa686a76879684de1b8567bec28ad41ee7f90155fefc4621 WHIRLPOOL a425c49eceff47b445fd8d27d603e667daec5feda792c00e482573c901b3113f02221a243cc9286ffb1264fd4d5b28f040e72bb0fbb670db421795a272787342
+EBUILD meld-3.12.2.ebuild 1011 SHA256 803ef88e46be01eddd9f69fe26b23e94dc48e3fe672209a1a86929ac69156c02 SHA512 5270fddcb36926833ba2abf3344e99d4204500c7ee2f7c42ee091fdd277c2f0db94161c33c0bf747019585f8f60e2945531c5631e5cb737bff2d9055c48a4937 WHIRLPOOL aa64e052a137f7c2b4b2db9ca23c5c6d5218e47de5bcc7f74c88543d743f15b525db739df7f3041cfc0b3b1307f7175a409895b0df9250b84c5fe560906a4473
+MISC ChangeLog 24470 SHA256 2da956f4e3c43e7b62482b0b99c4ee8c52983b99a84e99b3fe9f7748a1f21e55 SHA512 d08a9a0f969495df4bff08db711aa0dad48a4b541c8a586e24100592da207cce6c365212cf5cb4bd277f1b64f0c855e802cdb15a2c98d00e2899e0bcbcf4b3b9 WHIRLPOOL 91ab8661038783e4a9fe5dda13abd9fa651bff40931cb15ea194c724cd43dae9adf4ddc802887bd865c5f2994a2bc9b06f226658b1c3236f7ec1709f67087a23
MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSS6wMACgkQCaWpQKGI+9QmswCfaqIOW9Ib3SN29FQLvaYVUotK
-HVgAnil/60EdD8huZh/tOwaXvDQGnR08
-=fi7z
+iEYEAREIAAYFAlSUKfsACgkQCaWpQKGI+9RkSACeKVASg8i9LonzeRcVh5luwpmu
+sWAAn3oilMPoC0IdUY8tVRHy9kKv/LiT
+=HZJY
-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-3.12.2.ebuild b/dev-util/meld/meld-3.12.2.ebuild
index 539e2e63b155..d59ffbfef352 100644
--- a/dev-util/meld/meld-3.12.2.ebuild
+++ b/dev-util/meld/meld-3.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.2 2014/12/18 14:56:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.3 2014/12/19 13:36:58 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -15,7 +15,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=""
RDEPEND="