Version bump

Package-Manager: portage-2.0.51-r15

6 files changed, 124 insertions, 10 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 94697dcde082..e00cdc194728 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2004/09/29 18:07:08 langthang Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.15 2005/02/01 17:08:09 langthang Exp $
+
+*mailutils-0.6 (01 Feb 2005)
+
+  01 Feb 2005; Tuấn Văn <langthang@gentoo.org>
+  +files/mailutils-0.6-mh-Makefile.in.patch, +mailutils-0.6.ebuild:
+  Version bump.
 
   29 Sep 2004; Tuan Van <langthang@gentoo.org> :
   stable on x86. Remove old ebuild.
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index d8732098cd30..ad25dd9f940a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 387d1768654d093159a78c09ac434cf6 mailutils-0.5.ebuild 2618
-MD5 300e244eba09be30d120597a2b2551e4 ChangeLog 1949
+MD5 7cd9336ccd898a7bc6416e9543729b4f mailutils-0.6.ebuild 2619
+MD5 2dc2cbe4719e086d2dd197a0ca504f51 mailutils-0.5.ebuild 2618
+MD5 a4743f0501510dac4bce13c0a7b8a656 ChangeLog 2114
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 57cb849f954ba9a185a41751d998d0fd files/mailutils-0.6-mh-Makefile.in.patch 536
 MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271
 MD5 57cb849f954ba9a185a41751d998d0fd files/mailutils-0.5-mh-Makefile.in.patch 536
 MD5 67ce1d29fd43d38b57485205ed97cf11 files/digest-mailutils-0.5 67
+MD5 ac9d32bbb54e8d1d2ea52039bea81c29 files/digest-mailutils-0.6 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBWvnM5FrxP71izLARAsACAJ0dONqqpLPIe9fqYb6fmGFjtfgTWQCfd9Yq
-CAUixfsvdiMgn5c0vk7jUuE=
-=4hCH
+iD8DBQFB/7eg5FrxP71izLARAt+1AJwO87gdYArvI/UAvMmZu09Q6bUikwCgv819
+RX1L+uYSktoIba05RpEXyb4=
+=8oS+
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/files/digest-mailutils-0.6 b/net-mail/mailutils/files/digest-mailutils-0.6
new file mode 100644
index 000000000000..f0e8fdbea34f
--- /dev/null
+++ b/net-mail/mailutils/files/digest-mailutils-0.6
@@ -0,0 +1 @@
+MD5 13e38442893a24f16798e4b5f634ba7d mailutils-0.6.tar.bz2 2025327
diff --git a/net-mail/mailutils/files/mailutils-0.6-mh-Makefile.in.patch b/net-mail/mailutils/files/mailutils-0.6-mh-Makefile.in.patch
new file mode 100644
index 000000000000..be0281fa4715
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-0.6-mh-Makefile.in.patch
@@ -0,0 +1,16 @@
+--- mh/Makefile.in.orig	2004-07-08 20:56:01.101223522 -0700
++++ mh/Makefile.in	2004-07-08 20:56:31.499212613 -0700
+@@ -976,11 +976,8 @@
+ install-exec-hook: @BUILD_MH_EXEC_HOOK@
+ 
+ mh_finish_install:
+-	@here=`pwd`; \
+-	cd $(DESTDIR)$(bindir); \
+-	rm -f folders; \
+-	$(LN_S) folder folders; \
+-	cd $$here
++	rm -f $(DESTDIR)/$(bindir)/folders; \
++	$(LN_S) folder $(DESTDIR)/$(bindir)/folders
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-mail/mailutils/mailutils-0.5.ebuild b/net-mail/mailutils/mailutils-0.5.ebuild
index bd6935ecd6ac..ff9479b6a7ec 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
+# Copyright 1999-2005 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.6 2004/09/29 17:58:53 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.5.ebuild,v 1.7 2005/02/01 17:08:09 langthang Exp $
 
 inherit eutils
 DESCRIPTION="A useful collection of mail servers, clients, and filters."
diff --git a/net-mail/mailutils/mailutils-0.6.ebuild b/net-mail/mailutils/mailutils-0.6.ebuild
new file mode 100644
index 000000000000..2a2c49fcc179
--- /dev/null
+++ b/net-mail/mailutils/mailutils-0.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6.ebuild,v 1.1 2005/02/01 17:08:09 langthang Exp $
+
+inherit eutils
+DESCRIPTION="A useful collection of mail servers, clients, and filters."
+HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="http://ftp.gnu.org/gnu/mailutils/${P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="mailwrapper nls pam mysql postgres gdbm"
+PROVIDE="virtual/mailx"
+DEPEND="!virtual/mailx
+	!mail-client/nmh
+	dev-util/guile
+	gdbm? ( sys-libs/gdbm )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	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)..."
+		epause 30
+	fi
+}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-mh-Makefile.in.patch
+}
+
+src_compile() {
+
+	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"
+	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=$(best_version virtual/mta)
+	mymta=${mymta%-[0-9]*}
+	mymta=${mymta##*\/}
+	if ! use mailwrapper && [ "$mymta" == "postfix" ]; then
+		myconf="${myconf} --enable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "enable-sendmail"
+	else
+		myconf="${myconf} --disable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "disable-sendmail"
+	fi
+
+	myconf="${myconf} $(use_enable nls) $(use_enable pam) $(use_enable gdbm)"
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	# mail.rc stolen from mailx, resolve bug #37302.
+	insinto /etc
+	doins "${FILESDIR}/mail.rc"
+}