summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2005-05-26 16:52:26 +0000
committerAndrej Kacian <ticho@gentoo.org>2005-05-26 16:52:26 +0000
commit492e18e4a5162b3db826ff333574a8c6c431f686 (patch)
tree1f18d0694f93111ab8338d539d0e08f0b41dcdad /mail-client/elm
parentversion bump (diff)
downloadgentoo-2-492e18e4a5162b3db826ff333574a8c6c431f686.tar.gz
gentoo-2-492e18e4a5162b3db826ff333574a8c6c431f686.tar.bz2
gentoo-2-492e18e4a5162b3db826ff333574a8c6c431f686.zip
Block net-mail/mailutils, due to conflicting (incompatible) files.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'mail-client/elm')
-rw-r--r--mail-client/elm/ChangeLog5
-rw-r--r--mail-client/elm/Manifest14
-rw-r--r--mail-client/elm/elm-2.4_rc100-r1.ebuild5
3 files changed, 9 insertions, 15 deletions
diff --git a/mail-client/elm/ChangeLog b/mail-client/elm/ChangeLog
index 3e4faaa3ea12..202fa9fd77ff 100644
--- a/mail-client/elm/ChangeLog
+++ b/mail-client/elm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for mail-client/elm
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/elm/ChangeLog,v 1.12 2005/01/03 16:12:27 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/elm/ChangeLog,v 1.13 2005/05/26 16:52:26 ticho Exp $
+
+ 26 May 2005; Andrej Kacian <ticho@gentoo.org> elm-2.4_rc100-r1.ebuild:
+ Added block on net-mail/mailutils, due to conflicting (incompatible) files.
03 Jan 2005; Andrej Kacian <ticho@gentoo.org> -elm-2.4_rc100.ebuild:
Old ebuild cleanup.
diff --git a/mail-client/elm/Manifest b/mail-client/elm/Manifest
index b9f8a6efad4e..eba2ab496b56 100644
--- a/mail-client/elm/Manifest
+++ b/mail-client/elm/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5d01fb30981a3d67f6010e378dea50b0 ChangeLog 2080
+MD5 421be3966c08bcb01ad76f5a7fd3fada elm-2.4_rc100-r1.ebuild 2153
+MD5 85d5cde06ba1e49388b17ce0350c28f1 ChangeLog 2232
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 32385eb9232dcc74b94e6fe5b8cbbe1f elm-2.4_rc100-r1.ebuild 2132
MD5 07d5c730af371c6220688b51c8a7ae14 files/digest-elm-2.4_rc100-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB2W70QlM6RnzZP+IRAh7/AJ9O59vGPlyImqeCQTrPWIFEjTCfuQCfQvuj
-xT71R4JAYX9J/O0gwbHhCPo=
-=YPd+
------END PGP SIGNATURE-----
diff --git a/mail-client/elm/elm-2.4_rc100-r1.ebuild b/mail-client/elm/elm-2.4_rc100-r1.ebuild
index 36cb563653f2..8f18d0f4ba3d 100644
--- a/mail-client/elm/elm-2.4_rc100-r1.ebuild
+++ b/mail-client/elm/elm-2.4_rc100-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/elm/elm-2.4_rc100-r1.ebuild,v 1.5 2005/01/03 08:13:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/elm/elm-2.4_rc100-r1.ebuild,v 1.6 2005/05/26 16:52:26 ticho Exp $
DESCRIPTION="a classic mail client enhanced by Michael Elkins"
HOMEPAGE="http://www.ozone.fmi.fi/KEH/"
@@ -15,7 +15,8 @@ IUSE="spell"
DEPEND="virtual/libc
>=net-mail/mailbase-0.00-r5
dev-libs/openssl
- spell? ( app-text/ispell )"
+ spell? ( app-text/ispell )
+ !net-mail/mailutils"
S=${WORKDIR}/elm2.4.ME+.100