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
commite03de52936944e38e068b7d936d48940b959ce2c (patch)
tree4d5e72586c274195d5c213d0db23d69136bd358e /sys-apps/compare
parentcleanup/document patch (diff)
downloadhistorical-e03de52936944e38e068b7d936d48940b959ce2c.tar.gz
historical-e03de52936944e38e068b7d936d48940b959ce2c.tar.bz2
historical-e03de52936944e38e068b7d936d48940b959ce2c.zip
Added blocker to prevent collision
Package-Manager: portage-2.1
Diffstat (limited to 'sys-apps/compare')
-rw-r--r--sys-apps/compare/ChangeLog7
-rw-r--r--sys-apps/compare/Manifest28
-rw-r--r--sys-apps/compare/compare-1.16.ebuild6
-rw-r--r--sys-apps/compare/files/digest-compare-1.162
4 files changed, 25 insertions, 18 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/Manifest b/sys-apps/compare/Manifest
index 8e4e0632f113..f8cfea19244b 100644
--- a/sys-apps/compare/Manifest
+++ b/sys-apps/compare/Manifest
@@ -1,14 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 241614d99b4a0dc839dbdc644e893a86 compare-1.16.ebuild 613
-MD5 e0f31f568feebd8ce0014a1cdcafa5c2 ChangeLog 403
+DIST compare-1.16.tar.bz2 241004 RMD160 d594be80bc9f54fe5627683ea726f95513235a5a SHA1 34d4ad189650fba7a1de0d7de02e9e8d4e056e0e SHA256 7d91235bafa72fedf9687745c799332e1d341d6d19a44c0fe7710e40e70b9ccb
+EBUILD compare-1.16.ebuild 635 RMD160 90cb8998e970f8f6a7efbef3673d500676f13678 SHA1 b920d06d6e75ede20128514fc8ac260b87bcad13 SHA256 828205244cb67755f5768dd7d27dda1e37c3d30b9c5bef9e3e9d1f149ae402b2
+MD5 e5736fad1cdda6c68abca2d7076086f5 compare-1.16.ebuild 635
+RMD160 90cb8998e970f8f6a7efbef3673d500676f13678 compare-1.16.ebuild 635
+SHA256 828205244cb67755f5768dd7d27dda1e37c3d30b9c5bef9e3e9d1f149ae402b2 compare-1.16.ebuild 635
+MISC ChangeLog 540 RMD160 d30d8f1b6be089ff93249bd4dc9b127b6a2f63c2 SHA1 54e7ad82c69403c3e7944d9c0eaaa79c688ab18d SHA256 7450aa1c50d8a4bc34759744d41b6d55bc430010bc176bba344627bcea7e16bc
+MD5 f53aa99294b4e1a6ab0335e84ffd9ea6 ChangeLog 540
+RMD160 d30d8f1b6be089ff93249bd4dc9b127b6a2f63c2 ChangeLog 540
+SHA256 7450aa1c50d8a4bc34759744d41b6d55bc430010bc176bba344627bcea7e16bc ChangeLog 540
+MISC metadata.xml 222 RMD160 5d27e84dc0fadb664912c5ea4992fb0909f1b523 SHA1 a63624aa10decbf96d6799d1a66931d2525693e8 SHA256 ad1475a662bc88f3f7c5178e94806bcb1f51b5a8da52aee8f69efa4f2b4bba5a
MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
-MD5 9a3d86d6b1f89b6048a3ccb9d84ea94b files/digest-compare-1.16 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCf1+AI1lqEGTUzyQRAhEIAKCW7R5/NVNjirKlBiLct4q/Ptwz2wCgtohG
-EwrfAPdXEjszLtz7Wmlp1Y8=
-=Mif3
------END PGP SIGNATURE-----
+RMD160 5d27e84dc0fadb664912c5ea4992fb0909f1b523 metadata.xml 222
+SHA256 ad1475a662bc88f3f7c5178e94806bcb1f51b5a8da52aee8f69efa4f2b4bba5a metadata.xml 222
+MD5 64134eb38281d395ebf79f80347fbd6c files/digest-compare-1.16 241
+RMD160 3f1b40f6163230242d246043c0d538b4365f54d4 files/digest-compare-1.16 241
+SHA256 b4ae38547ecfb18e5508cddab9e1031f9cc474b879c9cd59684273ae86d5c8bf files/digest-compare-1.16 241
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