summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2006-06-11 14:33:46 +0000
committerStuart Herbert <stuart@gentoo.org>2006-06-11 14:33:46 +0000
commit4d37ea8d082a4e88372dec231e7a0ef603433ca5 (patch)
treeabdb7f75dad0bbaa9297f463ba2f0d9827199d6d /sys-apps/compare
parentcleanup/document patch (diff)
downloadgentoo-2-4d37ea8d082a4e88372dec231e7a0ef603433ca5.tar.gz
gentoo-2-4d37ea8d082a4e88372dec231e7a0ef603433ca5.tar.bz2
gentoo-2-4d37ea8d082a4e88372dec231e7a0ef603433ca5.zip
Added blocker to prevent collision
(Portage version: 2.1)
Diffstat (limited to 'sys-apps/compare')
-rw-r--r--sys-apps/compare/ChangeLog7
-rw-r--r--sys-apps/compare/compare-1.16.ebuild6
-rw-r--r--sys-apps/compare/files/digest-compare-1.162
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-apps/compare/ChangeLog b/sys-apps/compare/ChangeLog
index e974cf701793..8e16e50fc310 100644
--- a/sys-apps/compare/ChangeLog
+++ b/sys-apps/compare/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/compare
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/ChangeLog,v 1.1 2005/01/07 22:56:39 stuart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/ChangeLog,v 1.2 2006/06/11 14:33:46 stuart Exp $
+
+ 11 Jun 2006; Stuart Herbert <stuart@gentoo.org> compare-1.16.ebuild:
+ Added blocker against media-gfx/imagemagick; closes bug 117739
*compare-1.16 (07 Jan 2005)
diff --git a/sys-apps/compare/compare-1.16.ebuild b/sys-apps/compare/compare-1.16.ebuild
index 2d67cc6167aa..858b1f702a3c 100644
--- a/sys-apps/compare/compare-1.16.ebuild
+++ b/sys-apps/compare/compare-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/compare-1.16.ebuild,v 1.1 2005/01/07 22:56:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/compare-1.16.ebuild,v 1.2 2006/06/11 14:33:46 stuart Exp $
inherit eutils
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ppc"
IUSE=""
-DEPEND=""
+DEPEND="!media-gfx/imagemagick"
src_compile() {
make
diff --git a/sys-apps/compare/files/digest-compare-1.16 b/sys-apps/compare/files/digest-compare-1.16
index b9eb45edb578..29b72044af29 100644
--- a/sys-apps/compare/files/digest-compare-1.16
+++ b/sys-apps/compare/files/digest-compare-1.16
@@ -1 +1,3 @@
MD5 8f585d95cda420e3e91f98e39bc87431 compare-1.16.tar.bz2 241004
+RMD160 d594be80bc9f54fe5627683ea726f95513235a5a compare-1.16.tar.bz2 241004
+SHA256 7d91235bafa72fedf9687745c799332e1d341d6d19a44c0fe7710e40e70b9ccb compare-1.16.tar.bz2 241004