Added block of pine to deps, to prevent file collisions.

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-mail/uw-mailutils/ChangeLog b/net-mail/uw-mailutils/ChangeLog
index a5bea6a6d5ea9bc9ca11f06b09b317bca83dfe9d..3da8c6012b152f0861b88c14c07bf2c034a5e6ee 100644 (file)
--- a/net-mail/uw-mailutils/ChangeLog
+++ b/net-mail/uw-mailutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/uw-mailutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.7 2005/10/07 11:47:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.8 2005/10/07 13:28:32 ticho Exp $
+
+  07 Oct 2005; Andrej Kacian <ticho@gentoo.org> uw-mailutils-2004g.ebuild:
+  Added block of pine to deps, to prevent file collisions.
 
   07 Oct 2005; Simon Stelling <blubb@gentoo.org> uw-mailutils-2004g.ebuild:
   marked stable on amd64 wrt bug 108206

diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
index e7fe9b6474ebc69a4d1279839f54403c52245a7e..089c7a7aacfe77fe25e776479b5eab8b647ba6c7 100644 (file)
--- a/net-mail/uw-mailutils/Manifest
+++ b/net-mail/uw-mailutils/Manifest
@@ -1,5 +1,15 @@
-MD5 3417f07c9a792603148349dd5afd2012 ChangeLog 1185
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 974bfda2ea91f3611f8f043151f59e9b uw-mailutils-2004g.ebuild 1057
+MD5 5e04b5c90a5fcec1ccddab82d701033c ChangeLog 1320
 MD5 1bb83f4e84ad8336fcdc25c821ccb680 metadata.xml 272
-MD5 b3b55b228e7f7aaabab61d39bafd9f26 uw-mailutils-2004g.ebuild 1027
 MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-mailutils-2004g 62
 MD5 59c4ba0421f60657457e0aecf07be7be files/uw-mailutils-2004g.patch 1210
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRngcQlM6RnzZP+IRAsdYAKCuNeqJ99Uj1zPasegnGngE5NP1uwCeIuO1
+usVorltVk+BRkpo3g4AJbhY=
+=hzG0
+-----END PGP SIGNATURE-----

diff --git a/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild b/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild
index 63c089a3cbb7e29e19c53fdeb66709537f5d75b5..be8b6f7c4271c85bb1f5321394eca9dd5e1e45b7 100644 (file)
--- a/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild
+++ b/net-mail/uw-mailutils/uw-mailutils-2004g.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/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild,v 1.7 2005/10/07 11:47:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild,v 1.8 2005/10/07 13:28:32 ticho Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,7 +17,8 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
-       !<=net-mail/uw-imap-2004g"
+       !<net-mail/uw-imap-2004g-r1
+       !<mail-client/pine-4.64-r1"
 
 src_unpack() {
        unpack ${A}