Version bump with removed mailwrapper magic (bug #158501). Marked ~hppa.

Package-Manager: portage-2.1.4.4

4 files changed, 99 insertions, 17 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 16317f493c9f..2efaba2aba00 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-mail/mailutils
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.32 2008/03/03 04:13:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.33 2008/03/03 15:48:58 jer Exp $
 
-  03 Mar 2008; Jeroen Roovers <jer@gentoo.org> ChangeLog:
-  Fix name in ChangeLog entry.
+*mailutils-1.2 (03 Mar 2008)
+
+  03 Mar 2008; Jeroen Roovers <jer@gentoo.org> mailutils-0.6-r3.ebuild,
+  +mailutils-1.2.ebuild:
+  Version bump with removed mailwrapper magic (bug #158501). Marked ~hppa.
 
   27 Jan 2007; Olivier Crête <tester@gentoo.org> mailutils-0.6-r3.ebuild:
   Added ~amd64 keyword for bug #158295
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 760f932a73b2..af438e82ee31 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -8,6 +8,8 @@ AUX mailutils-IDEF0957.patch 590 RMD160 ff2873ae4b79904272596bd97189098dced48d70
 AUX mailutils-SQLinjection.patch 460 RMD160 ac574075624823151d8e0dba16b4a598a4fd35a1 SHA1 83b6b3c63e990b6b4d28eea266afa6d1fbaf2c6f SHA256 f062c09200e01257aea31452b1d76355c37ba5f67a8fe7f69cfa7a4d071cba5d
 AUX mailutils-getline.diff 667 RMD160 731f7e4af498ef0ab0d800fe5d7ab387061594b6 SHA1 25af2f77b7dc9ba8056685545e9b36019da7dfab SHA256 3a7e33585aa82ff8a151b46ae9d89b8f388ae65d784d4cecbeb43a24c11e0fc0
 DIST mailutils-0.6.tar.bz2 2025327 RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec SHA1 dc9b50aa8e22a6c84e295499ff6ac2871ccf8fb7 SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c
-EBUILD mailutils-0.6-r3.ebuild 3014 RMD160 221c58fb295b3d264ca986c691a12f9f345f05c4 SHA1 87017b5f176df3fcf23168658c6e7bd958a9f15b SHA256 cd69917d9325e631d18ad66b4f2a7d04f54561749481c91dabde18833d266ee1
-MISC ChangeLog 4412 RMD160 daa5f1635e2b299fac72e6ffaaa06c03071d9ad1 SHA1 93a3062f0631ac4c5341e99c4a909092233fb6a1 SHA256 bb228722a39552cb06c531e1955afa6ace45e61cbc02d04a4ec3956fbe08fd3c
+DIST mailutils-1.2.tar.bz2 2507082 RMD160 85cc53d578aa80439c6a3ec8aba87137b5fcc263 SHA1 54381259604b8736ea2bb4a2927be79e6f472416 SHA256 bc2cc54caeedda83883279d5880d22eb20eca39ecefcc7eec6ea190911c53de4
+EBUILD mailutils-0.6-r3.ebuild 3031 RMD160 f602d3185674702c5e7b2d427fdbb6fd3feec9df SHA1 623287cb77449e9d2eb5ff2eb2c1447ea4cd5403 SHA256 0b4556d3c880dd1f89ffc67cb844782b2b4db574b10f4991a61898147f5e2001
+EBUILD mailutils-1.2.ebuild 2369 RMD160 c6eee40e0eea4888486e984672e660e7e9ea3bff SHA1 37a8a38cc4eae1282d1ef36fbbdd8ecf3e3ae49a SHA256 f529f5eae197db5d697c90ec872cb36b1a70addc903a5b561d46b0c2e9bc3691
+MISC ChangeLog 4525 RMD160 454a12995ce11614c2c30e54d3e788ff1c61ae66 SHA1 8a112a786ad54fefdd659bde9752ca02bd301d01 SHA256 d45d01f8a73db0684ee487b211ebebcc852b7946c873b62d8ba9903d7f51277d
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/net-mail/mailutils/mailutils-0.6-r3.ebuild b/net-mail/mailutils/mailutils-0.6-r3.ebuild
index bee17d2c8dfa..00290c80b93f 100644
--- a/net-mail/mailutils/mailutils-0.6-r3.ebuild
+++ b/net-mail/mailutils/mailutils-0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.6 2007/01/27 04:36:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r3.ebuild,v 1.7 2008/03/03 15:48:58 jer Exp $
 
 inherit eutils
 DESCRIPTION="A useful collection of mail servers, clients, and filters."
@@ -38,16 +38,16 @@ pkg_setup() {
 }
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+	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() {
@@ -92,7 +92,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	# mail.rc stolen from mailx, resolve bug #37302.
 	insinto /etc
 	doins "${FILESDIR}/mail.rc"
diff --git a/net-mail/mailutils/mailutils-1.2.ebuild b/net-mail/mailutils/mailutils-1.2.ebuild
new file mode 100644
index 000000000000..34a85b23e485
--- /dev/null
+++ b/net-mail/mailutils/mailutils-1.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-1.2.ebuild,v 1.1 2008/03/03 15:48:58 jer 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 ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="nls pam mysql postgres gdbm"
+PROVIDE="virtual/mailx"
+DEPEND="!virtual/mailx
+	!mail-client/nmh
+	!mail-client/elm
+	dev-scheme/guile
+	gdbm? ( sys-libs/gdbm )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/libpq )
+	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, then change your"
+		ewarn "USE flags and emerge this package again."
+	fi
+}
+
+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, 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 - enabling sendmail"
+	else
+		myconf="${myconf} --disable-sendmail"
+		einfo "disabling 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"
+}