diff options
| -rw-r--r-- | net-mail/mailutils/ChangeLog | 6 | ||||
| -rw-r--r-- | net-mail/mailutils/Manifest | 4 | ||||
| -rw-r--r-- | net-mail/mailutils/mailutils-0.5.ebuild | 51 |
3 files changed, 38 insertions, 23 deletions
diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog index f7647fb9cbee..7689db620a2b 100644 --- a/net-mail/mailutils/ChangeLog +++ b/net-mail/mailutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/mailutils # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.9 2004/07/14 20:55:53 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.10 2004/07/27 00:39:13 langthang Exp $ + + 26 Jul 2004; Tuan Van <langthang@gentoo.org> mailutils-0.5.ebuild: + add virtual/mailx, wrt bug #58164. + default to 'mysql', wrt bug #58162. 14 Jul 2004; <tvan@gentoo.org> mailutils-0.5.ebuild: stay away from awk. diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index 6e23cd4fd8c9..9bb52abfcadf 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -1,6 +1,6 @@ MD5 571072a81d5d5b0b905269dea16377ea mailutils-0.3.1-r1.ebuild 1942 -MD5 e9fae46269e3d7c65604b7aba8bbffbd mailutils-0.5.ebuild 2341 -MD5 f8bd173c410b621250dad613271bf624 ChangeLog 1587 +MD5 cc6ccb4bf9202671bae3a995a5261d0a mailutils-0.5.ebuild 2618 +MD5 7717738ac4df3a5e8bb6c91a4b017d87 ChangeLog 1733 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271 MD5 03c7a853d2d764ed51622770eaeabb81 files/mailutils-0.3.1-mh-Makefile.in.patch 557 diff --git a/net-mail/mailutils/mailutils-0.5.ebuild b/net-mail/mailutils/mailutils-0.5.ebuild index 4c68aa319c34..ce659291c6cb 100644 --- a/net-mail/mailutils/mailutils-0.5.ebuild +++ b/net-mail/mailutils/mailutils-0.5.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/net-mail/mailutils/mailutils-0.5.ebuild,v 1.3 2004/07/14 20:55:53 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.5.ebuild,v 1.4 2004/07/27 00:39:13 langthang Exp $ inherit eutils DESCRIPTION="A useful collection of mail servers, clients, and filters." @@ -10,7 +10,8 @@ LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~x86 ~ppc" IUSE="mailwrapper nls pam mysql postgres gdbm" -DEPEND="!mail-client/mailx +PROVIDE="virtual/mailx" +DEPEND="!virtual/mailx !mail-client/nmh dev-util/guile gdbm? ( sys-libs/gdbm ) @@ -19,6 +20,21 @@ DEPEND="!mail-client/mailx nls? ( sys-devel/gettext ) virtual/mta" +pkg_setup() { + # Default to MySQL if USE="mysql postgres', bug #58162. + if use mysql && use postgres; then + echo + ewarn "You have both 'mysql' and 'postgres' in your USE flags." + ewarn "Portage will build this package with MySQL support." + echo + ewarn "If this is not what you want; please hit Control-C now;" + ewarn "change you USE flags then emerge this package again." + echo + ewarn "Waiting 30 seconds before continuing..." + ewarn "(Control-C to abort)..." + sleep 30 + fi +} src_unpack() { unpack ${A} cd ${S} @@ -27,31 +43,26 @@ src_unpack() { } src_compile() { - # Shamelessly stolen from nagios-core - if use mysql && use postgres; then - eerror "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time." - eerror "You have to remove either 'mysql' or 'postgres' from your USE flags before emerging this." - - has_version ">=sys-apps/portage-2.0.50" && ( - einfo "You can alternatively add" - einfo "net-mail/mailutils [use flags]" - einfo "to the file:" - einfo "/etc/portage/package.use" - einfo "to permamently set this package's USE flags" - ) - - exit 1 - fi local myconf="--localstatedir=/var --sharedstatedir=/var --enable-mh-utils" # bug in autoconf logic treats both --with and --without as set, # so we cannot do use_with - use mysql && myconf="${myconf} --with-mysql" - use postgres && myconf="${myconf} --with-postgres" + # use mysql && myconf="${myconf} --with-mysql" + # use postgres && myconf="${myconf} --with-postgres" + if use mysql && use postgres; then + einfo "build with MySQL support." + myconf="${myconf} --with-mysql" + elif use mysql; then + einfo "build with MySQL support." + myconf="${myconf} --with-mysql" + elif use postgres; then + einfo "build with PotsgreSQL support." + myconf="${myconf} --with-postgres" + fi # do not disable-sendmail for postfix user w/o mailwrapper, bug #44249. - mymta=$(portageq best_version / virtual/mta) + mymta=$(best_version virtual/mta) mymta=${mymta%-[0-9]*} mymta=${mymta##*\/} if ! use mailwrapper && [ "$mymta" == "postfix" ]; then |