From cc80fbbb9e81e2012ba5910dc1d54f0d2b11a8c3 Mon Sep 17 00:00:00 2001 From: Scott W Taylor Date: Wed, 15 Dec 2004 21:40:52 +0000 Subject: [PATCH] rearrange gnupg dependancy --- mail-mta/courier/ChangeLog | 6 +++++- mail-mta/courier/Manifest | 8 ++++---- mail-mta/courier/courier-0.47-r1.ebuild | 6 +++--- mail-mta/courier/courier-0.47.20041129.ebuild | 6 +++--- mail-mta/courier/courier-0.48_pre.ebuild | 6 +++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog index e99b2e3353aa..4a2d34d33088 100644 --- a/mail-mta/courier/ChangeLog +++ b/mail-mta/courier/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-mta/courier # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.40 2004/12/10 19:47:28 swtaylor Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.41 2004/12/15 21:40:51 swtaylor Exp $ + + 15 Dec 2004; Scott W Taylor courier-0.47-r1.ebuild, + courier-0.47.20041129.ebuild, courier-0.48_pre.ebuild: + move gnupg to fix circular dependancy 10 Dec 2004; Scott W Taylor -courier-0.46.20040825.ebuild, -courier-0.46.ebuild, -courier-0.47.ebuild: diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest index bb2dcf35828a..bd93d20819e1 100644 --- a/mail-mta/courier/Manifest +++ b/mail-mta/courier/Manifest @@ -1,9 +1,9 @@ -MD5 2b721652d7b8b5dc5aded95060038dbc courier-0.48_pre.ebuild 8685 -MD5 7081e569469cea4e56aeb1a0873f5197 courier-0.47.20041129.ebuild 8638 +MD5 773373838bcb16bafeaf01303d59e84d courier-0.48_pre.ebuild 8685 +MD5 ac775a20e2248fd59d3bbbf69c496f7a courier-0.47.20041129.ebuild 8638 MD5 7428e4492712d927ef9d824ed3e21d85 courier-0.46.20040902.ebuild 10010 -MD5 90c3829e6a5c549978daff934dda325b ChangeLog 16549 +MD5 6b7ef3e7ec59e72280635a1e9a40f765 ChangeLog 16723 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392 -MD5 f1aff7a3783a8d47aa594e304c0f966f courier-0.47-r1.ebuild 10994 +MD5 0878d7a7642bea7979e4a2574dc44ec0 courier-0.47-r1.ebuild 10994 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489 diff --git a/mail-mta/courier/courier-0.47-r1.ebuild b/mail-mta/courier/courier-0.47-r1.ebuild index 529ac3c880b0..ee863d3301d5 100644 --- a/mail-mta/courier/courier-0.47-r1.ebuild +++ b/mail-mta/courier/courier-0.47-r1.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-mta/courier/courier-0.47-r1.ebuild,v 1.4 2004/12/08 01:13:58 swtaylor Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47-r1.ebuild,v 1.5 2004/12/15 21:40:51 swtaylor Exp $ inherit eutils @@ -21,7 +21,6 @@ DEPEND="virtual/libc >=dev-libs/openssl-0.9.6 >=sys-libs/gdbm-1.8.0 || ( app-misc/mime-types net-www/apache ) - crypt? ( >=app-crypt/gnupg-1.0.4 ) fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 ) @@ -38,7 +37,8 @@ RDEPEND="${DEPEND} dev-lang/perl sys-apps/procps" -PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )" +PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + crypt? ( >=app-crypt/gnupg-1.0.4 )" src_unpack() { unpack ${A} diff --git a/mail-mta/courier/courier-0.47.20041129.ebuild b/mail-mta/courier/courier-0.47.20041129.ebuild index b3dfb3369a57..cd6e87cb546b 100644 --- a/mail-mta/courier/courier-0.47.20041129.ebuild +++ b/mail-mta/courier/courier-0.47.20041129.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-mta/courier/courier-0.47.20041129.ebuild,v 1.7 2004/12/08 01:13:58 swtaylor Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.8 2004/12/15 21:40:52 swtaylor Exp $ inherit eutils @@ -22,7 +22,6 @@ DEPEND="virtual/libc >=dev-libs/openssl-0.9.6 >=sys-libs/gdbm-1.8.0 || ( app-misc/mime-types net-www/apache ) - crypt? ( >=app-crypt/gnupg-1.0.4 ) fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 ) pam? ( >=sys-libs/pam-0.75 ) mysql? ( >=dev-db/mysql-3.23.36 ) @@ -37,7 +36,8 @@ RDEPEND="${DEPEND} dev-lang/perl sys-apps/procps" -PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )" +PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + crypt? ( >=app-crypt/gnupg-1.0.4 )" src_unpack() { unpack ${A} diff --git a/mail-mta/courier/courier-0.48_pre.ebuild b/mail-mta/courier/courier-0.48_pre.ebuild index 9cbd2b07b45e..d80d959fe0a3 100644 --- a/mail-mta/courier/courier-0.48_pre.ebuild +++ b/mail-mta/courier/courier-0.48_pre.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-mta/courier/courier-0.48_pre.ebuild,v 1.2 2004/12/10 06:52:37 swtaylor Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48_pre.ebuild,v 1.3 2004/12/15 21:40:52 swtaylor Exp $ inherit eutils @@ -24,7 +24,6 @@ DEPEND="virtual/libc >=dev-libs/openssl-0.9.6 >=sys-libs/gdbm-1.8.0 || ( app-misc/mime-types net-www/apache ) - crypt? ( >=app-crypt/gnupg-1.0.4 ) fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 ) pam? ( >=sys-libs/pam-0.75 ) mysql? ( >=dev-db/mysql-3.23.36 ) @@ -39,7 +38,8 @@ RDEPEND="${DEPEND} dev-lang/perl sys-apps/procps" -PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )" +PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + crypt? ( >=app-crypt/gnupg-1.0.4 )" src_unpack() { unpack ${A} -- 2.26.2