summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-12-08 18:18:37 +0000
committerPacho Ramos <pacho@gentoo.org>2013-12-08 18:18:37 +0000
commitf0f8c70b1c9d6d4e72ff3a2c72afd9ec0ac89187 (patch)
treef526ed376c2d3d38acd5883aa97c92fdd46a6279 /dev-util/meld
parentx86 stable, bug #478252 (diff)
downloadhistorical-f0f8c70b1c9d6d4e72ff3a2c72afd9ec0ac89187.tar.gz
historical-f0f8c70b1c9d6d4e72ff3a2c72afd9ec0ac89187.tar.bz2
historical-f0f8c70b1c9d6d4e72ff3a2c72afd9ec0ac89187.zip
x86 stable, bug #478252
Package-Manager: portage-2.2.7/cvs/Linux x86_64 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-1.8.2.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 6bf0f832547f..416b8c77b36e 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.173 2013/11/30 18:59:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.174 2013/12/08 18:18:33 pacho Exp $
+
+ 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> meld-1.8.2.ebuild:
+ x86 stable, bug #478252
30 Nov 2013; Pacho Ramos <pacho@gentoo.org> meld-1.8.2.ebuild:
amd64 stable, bug #478252
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 6b22be999010..84faac01f04e 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,13 +6,13 @@ DIST meld-1.8.1.tar.xz 423336 SHA256 f1f13deeb74625a97f97c311eb00665d4a883f0ce70
DIST meld-1.8.2.tar.xz 423312 SHA256 f272f57f5475ad0b0a555c5e3ce5878feb2dcabb919753bb17534c8559027f69 SHA512 022e6a115c42739142a75d6d6fb4a867e23b832adbb4eaeb470f713e8f820866ecd6a4b4dd000cbacf71883a5a416a6fb5f6f24ca7e47c9145eb0784b236058a WHIRLPOOL a43163a7bb7cdde144f5a0d8a30e2f610c7b54f43a0e3cf010272f00d08ea741245912b654ec138a2df6f90f1a4c1585affbdacb265fb0cf4403d88b855ab60c
EBUILD meld-1.7.0.ebuild 2400 SHA256 ff06b718876b0b8e97af50147513466425e6026f9e9013570fd39fe73a7564ab SHA512 324e7212736463e4cdd96d83efaee92e613225983b4b2737ba0d078953226749f6225fd1b0abbd59e886fd4993a199acf73407603b48c20edc48d89dfc078a00 WHIRLPOOL db36e5e2d22d84ba6511e18f8fad36f4a6eddd52541261e7ff564b6c2e90c9fc55f76fe4c9a44fb2e7f4de99318b111fa697c939544087bc4b47d92ecda8763f
EBUILD meld-1.8.1.ebuild 1867 SHA256 9ea672b17c1ce569ef28967e8b560b37e1427f86f322d2f8f23fe0f6e9753f08 SHA512 5a8fc2bea6752f4169181abc7788bb16b679ec124079b46f9017b378fcff882bd971c207cad8846572ed7caa07710e3a1a85ecc0e6dcd81955510ec3a03cf28e WHIRLPOOL 74d386e8c5a32766f1ff81db87403e7e00848b244cfc18912304b122b51562ca0fc9938e721a8f6a9fb08423f9f551ac76e7b0c23c5d79b887ceef29100158e6
-EBUILD meld-1.8.2.ebuild 1866 SHA256 6ef697951a232ff976e73e427f14ecd8e96daafb1ad6bdbb119b0f8742b0e7f2 SHA512 e7af4e49ffb64c3afb09bd7e5a486a469196a813bec1665cbaa5427174900d2a761cda4729386901bb8e74429201ec6fee6fd52b4ec120fa73c833ce9cdb2af5 WHIRLPOOL 1a88190a2481baae2a0d1280b031e3af5d7f1b9f14350e0282f6e91c543689b798808742ecbfadac58d6cf7279cda3f09e06a511c00a5477a327af400511eab5
-MISC ChangeLog 22198 SHA256 09e557c1b54d43cb7ea955012a6cacac482e4d8e16289b32fd2c39e814386ccb SHA512 5c3efa9c1212029d6752be47b20db268cff7560438de313add1635cf6fb3c05fe3fd9d6e880775a82aa6d53d842e98168709e5f078bcbc1eb4d9401d9a410dcd WHIRLPOOL bb2d1cc6e078567c726fbb9c35ac23b8ccb60f025b53ff63a8331b883d867a2b493d640ff88bfef97258ba06aba9722747029c9aa1db1f1600c6027287518f30
+EBUILD meld-1.8.2.ebuild 1865 SHA256 8cb6a2b9f22875b13f8cb6325ffa1bcc4dd097e83d47bb23d20153bf55400f43 SHA512 6762bddbbeeac54a18d77cac423f925dcebeac8ccb8ffab89f3b87ff23540ea171280bc7e5c94a48210ab75ff0e923cee01880ba332454d4fcd6c08763691daa WHIRLPOOL 20c6b6cf336961aa5d3be268306cfcf0b1d6944905328b7acb718af0507d3e9cbda5d5327500457f62cf5ab04bc82cd5e199b312daede9ddc5b77a2974c8a226
+MISC ChangeLog 22290 SHA256 b62e26fae065b6eeda27cd7a25f851ea2c25759788542072f755289a03484d25 SHA512 8058b51a67fb9a72aedb1fcc7aeee5367e9e5548d7b94159236eb9d7d2909f51856175081c3a581317cbbaeebf4d797a43d5a9d7b77f5ee7c318fbab851e00cb WHIRLPOOL 8b997128fcd6de07998af1a7a2f95c65326d650968217ff88c0399483236d22458704d6711bc4db10b684479b0033afeaf1884a897a6dace7e75c1c50e37c0f2
MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlKaNacACgkQCaWpQKGI+9TNkwCfe7Eo7QQlvG4yf+U5rst5TbMK
-nUwAnRGJDYKIGQ7p0Kg1cw4MI2C3llij
-=0Gm3
+iEYEAREIAAYFAlKkt/oACgkQCaWpQKGI+9QoowCeIy0yL5ktmfkXt2eg53QUdQwU
+ErEAn1ovOSIPKcKCZ4WL91xCALtzv/W8
+=b2ok
-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.8.2.ebuild b/dev-util/meld/meld-1.8.2.ebuild
index b8fe96ec609e..f9ea5cf7bcd5 100644
--- a/dev-util/meld/meld-1.8.2.ebuild
+++ b/dev-util/meld/meld-1.8.2.ebuild
@@ -1,6 +1,6 @@
# 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.8.2.ebuild,v 1.2 2013/11/30 18:59:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.2.ebuild,v 1.3 2013/12/08 18:18:33 pacho Exp $
EAPI="5"
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"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"