From c9c5490a09f4863244ba50f684389f043b948d48 Mon Sep 17 00:00:00 2001 From: Benedikt Morbach Date: Mon, 6 Feb 2012 00:56:56 +0100 Subject: [PATCH] bump meld to 1.5.3 --- metadata/layout.conf | 2 +- .../meld/{meld-1.5.1.exheres-0 => meld-1.5.3.exheres-0} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename packages/dev-util/meld/{meld-1.5.1.exheres-0 => meld-1.5.3.exheres-0} (93%) diff --git a/metadata/layout.conf b/metadata/layout.conf index 283ea1d..b83fbd3 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -2,4 +2,4 @@ layout = exheres eapi_when_unknown = exheres-0 eapi_when_unspecified = exheres-0 profile_eapi = exheres-0 -masters = arbor +masters = arbor x11 diff --git a/packages/dev-util/meld/meld-1.5.1.exheres-0 b/packages/dev-util/meld/meld-1.5.3.exheres-0 similarity index 93% rename from packages/dev-util/meld/meld-1.5.1.exheres-0 rename to packages/dev-util/meld/meld-1.5.3.exheres-0 index 3b2354f..344cf49 100644 --- a/packages/dev-util/meld/meld-1.5.1.exheres-0 +++ b/packages/dev-util/meld/meld-1.5.3.exheres-0 @@ -1,12 +1,12 @@ # Copyright 2009 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -require gnome.org +require gtk-icon-cache gnome.org [ suffix=.tar.xz ] SUMMARY="A visual diff and merge tool." DESCRIPTION="Rich featured diff and merge tool that integrates with most version control systems. It's also possible to do 3-way diffs." -HOMEPAGE="http://live.gnome.org/${PN^}" +HOMEPAGE="http://meldmerge.org/" LICENCES="GPL-2" SLOT="0"