From 80e17ed1a61f7f167e3347fef8eb55af439f7480 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 9 Mar 2014 10:46:14 +0000 Subject: amd64 stable, bug 499954 Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 RepoMan-Options: --include-arches="amd64" Manifest-Sign-Key: 0xA188FBD4 --- dev-util/meld/ChangeLog | 5 ++++- dev-util/meld/Manifest | 10 +++++----- dev-util/meld/meld-1.8.4.ebuild | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'dev-util/meld') diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 898dc54b1cae..1b399f94f215 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.177 2014/02/22 21:31:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.178 2014/03/09 10:46:08 pacho Exp $ + + 09 Mar 2014; Pacho Ramos meld-1.8.4.ebuild: + amd64 stable, bug 499954 22 Feb 2014; Pacho Ramos meld-1.8.4.ebuild: Fix wrong commit, bug 502160 diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 5cd7d3cc6b21..b9a0ed0a9cca 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -8,13 +8,13 @@ DIST meld-1.8.4.tar.xz 421332 SHA256 b46e5786343f236d203037a7ace8f1b28145a51a3f8 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 1865 SHA256 8cb6a2b9f22875b13f8cb6325ffa1bcc4dd097e83d47bb23d20153bf55400f43 SHA512 6762bddbbeeac54a18d77cac423f925dcebeac8ccb8ffab89f3b87ff23540ea171280bc7e5c94a48210ab75ff0e923cee01880ba332454d4fcd6c08763691daa WHIRLPOOL 20c6b6cf336961aa5d3be268306cfcf0b1d6944905328b7acb718af0507d3e9cbda5d5327500457f62cf5ab04bc82cd5e199b312daede9ddc5b77a2974c8a226 -EBUILD meld-1.8.4.ebuild 1867 SHA256 02923358f37d8b1ca4b6441ca2ae29f2e265975761b76a6cca09fe8b85714741 SHA512 a97d2a18379f763775e47785efa77dd517417d32dc668b000995dc46fc4f82a1cc480c8c2357b1fd624004c6e16d9cff65f153def6e50c8941a00f3a6a69a88e WHIRLPOOL ff672081a1658436da6e86cb540a06e0162222ed06a4fbe8c39da7cd7484264be5d05f1a823765f9dc1ab5714955bd74d16bed1506541880f96492885ef4a8b3 -MISC ChangeLog 22594 SHA256 f75e4647b78737773779995b1d38e396c42f91015422dd91998ba1a43cedb79c SHA512 3bb18df55057b038a4619ca069d42fa9ddc9384a18299ac4406fcfec8273c255a424ba1b12c6abda05a799ebd68eb97162b933bc26d8e0a54a0c0a9cc210b892 WHIRLPOOL 36c8a00aa3048838e67659df494e2869bbf0209d0820709afb2bc29dc5cc9476a874784663c99c26ca184c661f36ea69d4f4d4e668cf65f7fdd16d4139375c50 +EBUILD meld-1.8.4.ebuild 1866 SHA256 806679e81e8e038af38901624fa40a490b8f203c552d22e0bd877674444c0625 SHA512 8595f0737a6cf14c6ad5ae1b799c4cb69b7d2b9c5313ab5895a4fec3ac4b69c47c2c05e5915a3803091fdaa6ebaa4835f1047f76f1adb4c520c4c601d6658aa0 WHIRLPOOL 3b402e47ff0e2b77fd7c1aba9959ef1133f1056104c05e6bd8e42032d77c04d8dc71078edf066a262e98bb391c24022ae5524f500ab21e50a6d99a7c3c9540e3 +MISC ChangeLog 22687 SHA256 70379b0a27de7a591397e02584fff4164edcad0f61b988ac39672e1b7903a5bb SHA512 3678ec0f9586fb5fb7caf9cbfd9e4dd29a3c7a1328b04e5745f3c9b775e813b1a2a04ee33c5fc014c2d6b377709cb41fcb080f45ae4d2cda3951d2ffefdbfc1b WHIRLPOOL c9cd291af2236516343f9071ce8d65026eac1f6a95f666bd5e7d609f268e1d48c10fe71c2c5021622fb6aac5da7f9fb1abbca3533285d27a2ed4b11069f81dc7 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlMJFxgACgkQCaWpQKGI+9SkigCfaNJWuoKfTTESL7XcLlnWXGbl -5awAniOJrb9IoX/zA1XhPQCIAKYZPVRT -=+RR5 +iEYEAREIAAYFAlMcRnEACgkQCaWpQKGI+9R87ACcDo70CmJdGFJPMway9GNwJJ3E +RzcAn1Ucf0Zi+YvYprnNbit9hz5lLrFr +=66xA -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.8.4.ebuild b/dev-util/meld/meld-1.8.4.ebuild index c0500680c930..4e183ff94777 100644 --- a/dev-util/meld/meld-1.8.4.ebuild +++ b/dev-util/meld/meld-1.8.4.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-1.8.4.ebuild,v 1.3 2014/02/22 21:31:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.4.ebuild,v 1.4 2014/03/09 10:46:08 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}" -- cgit v1.2.3-65-gdbad