Some cleanup, add support for postgres, add mh-utils, address Bug 22864

5 files changed, 101 insertions, 3 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 6a39646bb4ac..b84ae07de254 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.4 2004/06/24 23:24:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.5 2004/06/30 17:52:11 merlin Exp $
+
+*mailutils-0.3.1-r1 (30 Jun 2004)
+
+  30 Jun 2004; Cory Visi <merlin@gentoo.org> mailutils-0.3.1-r1.ebuild,
+  files/mailutils-0.3.1-mh-Makefile.in.patch:
+  Some cleanup, add support for postgres, add mh-utils, address Bug 22864
 
   30 May 2004; Robin H. Johnson <robbat2@gentoo.org> mailutils-0.3.1.ebuild,
   mailutils-0.3.ebuild:
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 4de716cf5162..ddda6c9012e5 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,9 @@
+MD5 fbf9ca2b4c9e458497f0e6976e5aa2f5 ChangeLog 937
 MD5 d7d0b811d715eb8533f026fec453d0b8 mailutils-0.3.1.ebuild 1179
 MD5 4c18aa007bf81287a40efadbaa77fd30 mailutils-0.3.ebuild 1176
-MD5 68c0dead0a93fe03d2e5ee487afacab4 ChangeLog 711
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 d2daee4409fb153be65f6189e96e7eeb files/digest-mailutils-0.3.1 69
+MD5 929b9ebc39ab3bdc26814ec5c8ed5348 mailutils-0.3.1-r1.ebuild 1945
 MD5 98d36f988dc828db603038c31bdb6ad5 files/digest-mailutils-0.3 67
+MD5 d2daee4409fb153be65f6189e96e7eeb files/digest-mailutils-0.3.1 69
+MD5 03c7a853d2d764ed51622770eaeabb81 files/mailutils-0.3.1-mh-Makefile.in.patch 557
+MD5 d2daee4409fb153be65f6189e96e7eeb files/digest-mailutils-0.3.1-r1 69
diff --git a/net-mail/mailutils/files/digest-mailutils-0.3.1-r1 b/net-mail/mailutils/files/digest-mailutils-0.3.1-r1
new file mode 100644
index 000000000000..9e0b6409be0a
--- /dev/null
+++ b/net-mail/mailutils/files/digest-mailutils-0.3.1-r1
@@ -0,0 +1 @@
+MD5 d2f0192b3dd95b33e764a0d480085cdd mailutils-0.3.1.tar.bz2 1744493
diff --git a/net-mail/mailutils/files/mailutils-0.3.1-mh-Makefile.in.patch b/net-mail/mailutils/files/mailutils-0.3.1-mh-Makefile.in.patch
new file mode 100644
index 000000000000..2c0514e75da5
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-0.3.1-mh-Makefile.in.patch
@@ -0,0 +1,16 @@
+--- mh/Makefile.in.orig	2003-06-07 05:37:31.000000000 -0400
++++ mh/Makefile.in	2004-06-30 12:14:46.979325522 -0400
+@@ -952,11 +952,8 @@
+ install-exec-hook: @BUILD_MH_EXEC_HOOK@
+ 
+ mh_finish_install:
+-	@here=`pwd`; \
+-	cd $(DESTDIR); \
+-	rm -f $(bindir)/folders; \
+-	$(LN_S) $(bindir)/folder $(bindir)/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.3.1-r1.ebuild b/net-mail/mailutils/mailutils-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..9aa3d9d31959
--- /dev/null
+++ b/net-mail/mailutils/mailutils-0.3.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.3.1-r1.ebuild,v 1.1 2004/06/30 17:52:11 merlin Exp $
+
+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="nls pam mysql postgres gdbm"
+DEPEND="!mail-client/mailx
+	!mail-client/nmh
+	dev-util/guile
+	gdbm? ( sys-libs/gdbm )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-mh-Makefile.in.patch
+}
+
+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=""
+
+	# 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"
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--infodir=/usr/share/info \
+		--sharedstatedir=/var \
+		--mandir=/usr/share/man \
+		--disable-sendmail \
+		--enable-mh-utils \
+		`use_enable nls` \
+		`use_enable pam` \
+		`use_with gdbm` \
+		${myconf} || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}