gcc4.0 patch. Thanks to Thomas Chik <tshchik@gmail.com>. Bug #122985.

(Portage version: 2.1_pre4-r1)

5 files changed, 170 insertions, 8 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 759314ce4793..aa12e17aac22 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailutils
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.22 2005/09/16 02:48:24 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.23 2006/02/16 22:44:14 langthang Exp $
+
+*mailutils-0.6-r3 (16 Feb 2006)
+
+  16 Feb 2006; Tuấn Văn <langthang@gentoo.org>
+  +files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch, +mailutils-0.6-r3.ebuild:
+  gcc4.0 patch. Thanks to Thomas Chik <tshchik@gmail.com>. Bug #122985.
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> mailutils-0.6-r2.ebuild:
   Mark 0.6-r2 stable on alpha
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 6a1179891fe2..f9108e816dd8 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,12 +1,45 @@
-MD5 7b90159db6f10817e6dbc55379f4cd83 mailutils-0.6-r2.ebuild 2919
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 912a8d3e844071fa13177057edc9771c ChangeLog 3206
-MD5 d3019ee356eb19b3ef156ba338b92873 files/mailutils-getline.diff 667
-MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271
+MD5 230c3ada137f0e5445198700f88b701d ChangeLog 3438
+RMD160 24d5e2184df19725027bac1ed548e54a2d050aee ChangeLog 3438
+SHA256 7b6f33ff06d8a4aef19da7e5547bb8e658642c61a08f9345e12879f455f2e95f ChangeLog 3438
 MD5 ac9d32bbb54e8d1d2ea52039bea81c29 files/digest-mailutils-0.6-r2 67
+RMD160 1befc01d26b4a07696078a05a79ccd77e5d2b786 files/digest-mailutils-0.6-r2 67
+SHA256 7482905954488f85427ca5b184b03e423b7aeefec9de010e114dffce09a62368 files/digest-mailutils-0.6-r2 67
+MD5 e3ad82c6c73e4f4c8a788447cf85d929 files/digest-mailutils-0.6-r3 247
+RMD160 90bf24323b52c32941bf6e84a7368cc37e18a3d9 files/digest-mailutils-0.6-r3 247
+SHA256 adbf6c82f200f85005424862879f5136beb976969124e307bfa5d0a995b411aa files/digest-mailutils-0.6-r3 247
+MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271
+RMD160 aed3edf9939427b4a9c602daa0851b829634e088 files/mail.rc 271
+SHA256 b75b4e7770be8014baceb59a768697b72db9850fc07be8897a5ac851f169329c files/mail.rc 271
 MD5 0c8c39e5340273b1e8ad95f0c3c886e9 files/mailutils-0.6-imap4d-format-string.patch 469
+RMD160 86afa1767beccb5cc720d65b4745f44a31cb2e73 files/mailutils-0.6-imap4d-format-string.patch 469
+SHA256 a339bd53d12d297681f86bf065c7e74ebef07fb0caa25207a28bcc0581f326ac files/mailutils-0.6-imap4d-format-string.patch 469
+MD5 2e1c9a252f40d6c9bb60e760e17c79b1 files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch 763
+RMD160 7926a88b08a23ad1fe91acd01d4d83e48db6c7b9 files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch 763
+SHA256 4d83211cdedcbb65f6f74119abfb1739034a6ed7699eff3df21a8b689f41e3fc files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch 763
 MD5 57cb849f954ba9a185a41751d998d0fd files/mailutils-0.6-mh-Makefile.in.patch 536
+RMD160 1df7ef14eae8b7e64391c04273c61b2139ffbb08 files/mailutils-0.6-mh-Makefile.in.patch 536
+SHA256 de0a5f6c93da56089562ae93bdf24b3c11fb1aa80eadeaca133abd0008bd65c8 files/mailutils-0.6-mh-Makefile.in.patch 536
 MD5 5506f2c85d65395b8e6ebd712e308303 files/mailutils-IDEF0954-IDEF0955.patch 1952
-MD5 47773bdea3fdc18d485aadf3e41ca9c9 files/mailutils-IDEF0957.patch 590
+RMD160 a53eb991e96e1cc18f173478ff6aeab0adfe6d4a files/mailutils-IDEF0954-IDEF0955.patch 1952
+SHA256 1517f0a2e879bae94a30958b1d0d22684a0ab8f6eb6553cd6e3de9403471dbd3 files/mailutils-IDEF0954-IDEF0955.patch 1952
 MD5 c78624e9d37cb3a280aea7281b6bae45 files/mailutils-IDEF0956.patch 524
+RMD160 262d28edfea515c16cf6107c9c056ffe3125f194 files/mailutils-IDEF0956.patch 524
+SHA256 995076a8dc5063a48d0a5ba581efd11bbf64ad391659a4a03e9686e027b519d7 files/mailutils-IDEF0956.patch 524
+MD5 47773bdea3fdc18d485aadf3e41ca9c9 files/mailutils-IDEF0957.patch 590
+RMD160 ff2873ae4b79904272596bd97189098dced48d70 files/mailutils-IDEF0957.patch 590
+SHA256 7d47bf537181b979b080c6761a551aa55531ee8d5b84d6702794ef44dcaa76ae files/mailutils-IDEF0957.patch 590
 MD5 b173bd200556cc8df892bc4654ec5368 files/mailutils-SQLinjection.patch 460
+RMD160 ac574075624823151d8e0dba16b4a598a4fd35a1 files/mailutils-SQLinjection.patch 460
+SHA256 f062c09200e01257aea31452b1d76355c37ba5f67a8fe7f69cfa7a4d071cba5d files/mailutils-SQLinjection.patch 460
+MD5 d3019ee356eb19b3ef156ba338b92873 files/mailutils-getline.diff 667
+RMD160 731f7e4af498ef0ab0d800fe5d7ab387061594b6 files/mailutils-getline.diff 667
+SHA256 3a7e33585aa82ff8a151b46ae9d89b8f388ae65d784d4cecbeb43a24c11e0fc0 files/mailutils-getline.diff 667
+MD5 7b90159db6f10817e6dbc55379f4cd83 mailutils-0.6-r2.ebuild 2919
+RMD160 35eba7fe35e56044f06ced08ebb2e9b988521765 mailutils-0.6-r2.ebuild 2919
+SHA256 5cdad919689762d820b922330c300b85061b5badfb6585b0bf73413fedc3b87e mailutils-0.6-r2.ebuild 2919
+MD5 56ca03d18ef427ede28554bf1432c936 mailutils-0.6-r3.ebuild 3008
+RMD160 62eb9ec57b31a0d03a2bb43bb0a1bf5e840b552e mailutils-0.6-r3.ebuild 3008
+SHA256 49a4a83ab26ecd26c1765ed6a6b98bc1628bc04aee1bee0a0f163234e5d2d9da mailutils-0.6-r3.ebuild 3008
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
diff --git a/net-mail/mailutils/files/digest-mailutils-0.6-r3 b/net-mail/mailutils/files/digest-mailutils-0.6-r3
new file mode 100644
index 000000000000..87d314e8df50
--- /dev/null
+++ b/net-mail/mailutils/files/digest-mailutils-0.6-r3
@@ -0,0 +1,3 @@
+MD5 13e38442893a24f16798e4b5f634ba7d mailutils-0.6.tar.bz2 2025327
+RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec mailutils-0.6.tar.bz2 2025327
+SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c mailutils-0.6.tar.bz2 2025327
diff --git a/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch b/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch
new file mode 100644
index 000000000000..48134e334ac4
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch
@@ -0,0 +1,21 @@
+diff -urN mailutils-0.6.1/imap4d/fetch.c mailutils-0.6.1/imap4d/fetch.c
+--- mailutils-0.6.1/imap4d/fetch.c	2004-06-02 09:30:52.000000000 +0200
++++ mailutils-0.6.1/imap4d/fetch.c	2005-03-22 12:38:54.000000000 +0100
+@@ -63,8 +63,6 @@
+ static int fetch_header_fields_not __P ((message_t, char **, unsigned long, unsigned long));
+ static int fetch_send_address      __P ((const char *));
+ 
+-static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command[]));
+-
+ struct fetch_command
+ {
+   const char *name;
+@@ -101,6 +99,8 @@
+   { NULL, 0, 0}
+ };
+ 
++static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command[]));
++
+ /* Go through the fetch array sub command and returns the the structure.  */
+ 
+ static struct fetch_command *
diff --git a/net-mail/mailutils/mailutils-0.6-r3.ebuild b/net-mail/mailutils/mailutils-0.6-r3.ebuild
new file mode 100644
index 000000000000..8cbdd71c0e27
--- /dev/null
+++ b/net-mail/mailutils/mailutils-0.6-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r3.ebuild,v 1.1 2006/02/16 22:44:14 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="~alpha ~ppc ~sparc ~x86"
+IUSE="mailwrapper nls pam mysql postgres gdbm"
+PROVIDE="virtual/mailx"
+DEPEND="!virtual/mailx
+	!mail-client/nmh
+	!mail-client/elm
+	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
+	epatch ${FILESDIR}/${PN}-IDEF0954-IDEF0955.patch
+	epatch ${FILESDIR}/${PN}-IDEF0956.patch
+	epatch ${FILESDIR}/${PN}-IDEF0957.patch
+	epatch ${FILESDIR}/${PN}-getline.diff
+	epatch ${FILESDIR}/${PN}-SQLinjection.patch
+	epatch ${FILESDIR}/${P}-imap4d-format-string.patch
+	epatch ${FILESDIR}/${P}-imap4d-gcc4.0-ftbfs.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.
+	has_postfix=$(best_version mail-mta/postfix)
+	has_postfix=${has_postfix%-[0-9]*}
+	has_postfix=${has_postfix##*\/}
+
+	if [ "$has_postfix" == "postfix" ]; then
+		einfo "postfix detected"
+		einfo "enable-sendmail"
+	else
+		if ! use mailwrapper; then
+			myconf="${myconf} --enable-sendmail"
+		else
+			myconf="${myconf} --disable-sendmail"
+			einfo "disable-sendmail"
+		fi
+	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"
+}