Move some items to RDEPEND #60134

4 files changed, 20 insertions, 18 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 67967c252676..e0b436591c5b 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.11 2004/07/29 13:37:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.12 2004/08/17 18:18:18 agriffis Exp $
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.6-r2.ebuild, mutt-1.5.6.ebuild:
+  Move some items to RDEPEND #60134
 
   29 Jul 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
   Fix bug 54177: Increase range of pgp_timeout setting with patch from
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
index 7d5acb07b176..226f9be7a816 100644
--- a/mail-client/mutt/mutt-1.4.2.1.ebuild
+++ b/mail-client/mutt/mutt-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.4 2004/07/14 16:22:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.5 2004/08/17 18:18:18 agriffis Exp $
 
 IUSE="cjk imap mbox nls slang ssl vanilla"
 
@@ -18,11 +18,11 @@ SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
 	cjk? ( http://www.emaillab.org/mutt/1.4/${cjk_patch} )"
 #	http://www.spinnaker.de/mutt/compressed/${compressed_patch}
 
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
+RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( >=sys-libs/slang-1.4.2 )"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
index b7aa262ba925..a758cb319db9 100644
--- a/mail-client/mutt/mutt-1.5.6-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.9 2004/07/29 13:37:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.10 2004/08/17 18:18:18 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -26,16 +26,14 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 #	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
 #	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
 
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
+RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
-	net-mail/mailbase
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	slang? ( >=sys-libs/slang-1.4.2 )
-	!vanilla? (
-		sys-libs/gdbm
-		nntp? ( sys-devel/automake sys-devel/autoconf )
-	)"
+	!vanilla? ( sys-libs/gdbm )"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/mail-client/mutt/mutt-1.5.6.ebuild b/mail-client/mutt/mutt-1.5.6.ebuild
index ea21c9a8d279..6ab2e8b30ea4 100644
--- a/mail-client/mutt/mutt-1.5.6.ebuild
+++ b/mail-client/mutt/mutt-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6.ebuild,v 1.5 2004/07/13 00:29:51 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6.ebuild,v 1.6 2004/08/17 18:18:18 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -20,13 +20,13 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 #	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
 #	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
 
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
+RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	net-mail/mailbase
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
 	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
 
 SLOT="0"