Version bump for the security fix. Used debian testing/unstable's patch for this rather than the woody patch, as they seem to have added fixes: http://packages.debian.org/changelogs/pool/main/m/metamail/metamail_2.7-45.3/changelog. Also, enforcing autoconf-2.1 for the autoreconf step, which fails with 2.59. Closes bug #42133 by Carsten Lohrke <current@myrealbox.com>

7 files changed, 25 insertions, 55 deletions

diff --git a/net-mail/metamail/ChangeLog b/net-mail/metamail/ChangeLog
index edd6592ea7c0..85b978cf7697 100644
--- a/net-mail/metamail/ChangeLog
+++ b/net-mail/metamail/ChangeLog
@@ -1,7 +1,18 @@
 # ChangeLog for net-mail/metamail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # Distributed under the terms of the GNU General Public License v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.10 2004/05/08 14:56:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.11 2004/05/11 19:05:56 seemant Exp $
+
+*metamail-2.7.45.3 (11 May 2004)
+
+  11 May 2004; Seemant Kulleen <seemant@gentoo.org>
+  -metamail-2.7.45-r1.ebuild, +metamail-2.7.45.3.ebuild,
+  -metamail-2.7.45.ebuild:
+  Version bump for the security fix. Used debian testing/unstable's patch for
+  this rather than the woody patch, as they seem to have added fixes:
+  http://packages.debian.org/changelogs/pool/main/m/metamail/metamail_2.7-45.3/c
+  hangelog. Also, enforcing autoconf-2.1 for the autoreconf step, which fails
+  with 2.59. Closes bug #42133 by Carsten Lohrke <current@myrealbox.com>
 
   08 May 2004; Guy Martin <gmsoft@gentoo.org> metamail-2.7.45-r1.ebuild:
   Marked ~hppa.
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 14130b39b861..98017475a6e2 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -1,7 +1,5 @@
-MD5 8379a880210bc4de74aeb60ab05d7f0d ChangeLog 1506
+MD5 d0309573c59c4add30df55d33644f9a3 metamail-2.7.45.3.ebuild 1073
+MD5 a0698d5bf460bf20b360662968568f68 ChangeLog 2058
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 0a4bc5581b11cbd50999c73af8234959 metamail-2.7.45.ebuild 964
-MD5 fc63ddd855065df5502708d134fa2823 metamail-2.7.45-r1.ebuild 999
-MD5 79de73ebab5989884bdb693118f0b2bb files/digest-metamail-2.7.45 124
+MD5 b421f8d33431489dece46eb18ef7c643 files/digest-metamail-2.7.45.3 126
 MD5 2c155e17aab4712ce1deb01c3601cc18 files/mime.types 16442
-MD5 79de73ebab5989884bdb693118f0b2bb files/digest-metamail-2.7.45-r1 124
diff --git a/net-mail/metamail/files/digest-metamail-2.7.45 b/net-mail/metamail/files/digest-metamail-2.7.45
deleted file mode 100644
index 822bccdd2052..000000000000
--- a/net-mail/metamail/files/digest-metamail-2.7.45
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd5617ea87e20d7f2fa839e1d1fede60 mm2.7.tar.Z 262881
-MD5 6191586c968c194a17760b20d44291e4 metamail_2.7-45.diff.gz 329537
diff --git a/net-mail/metamail/files/digest-metamail-2.7.45-r1 b/net-mail/metamail/files/digest-metamail-2.7.45-r1
deleted file mode 100644
index 822bccdd2052..000000000000
--- a/net-mail/metamail/files/digest-metamail-2.7.45-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd5617ea87e20d7f2fa839e1d1fede60 mm2.7.tar.Z 262881
-MD5 6191586c968c194a17760b20d44291e4 metamail_2.7-45.diff.gz 329537
diff --git a/net-mail/metamail/files/digest-metamail-2.7.45.3 b/net-mail/metamail/files/digest-metamail-2.7.45.3
new file mode 100644
index 000000000000..36a562f01aaf
--- /dev/null
+++ b/net-mail/metamail/files/digest-metamail-2.7.45.3
@@ -0,0 +1,2 @@
+MD5 fd5617ea87e20d7f2fa839e1d1fede60 mm2.7.tar.Z 262881
+MD5 dbdec335a800cafac0c3353649ed01ac metamail_2.7-45.3.diff.gz 337924
diff --git a/net-mail/metamail/metamail-2.7.45-r1.ebuild b/net-mail/metamail/metamail-2.7.45.3.ebuild
index d888b2762b4e..3ebbe9148dd2 100644
--- a/net-mail/metamail/metamail-2.7.45-r1.ebuild
+++ b/net-mail/metamail/metamail-2.7.45.3.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.45-r1.ebuild,v 1.3 2004/05/08 14:56:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.45.3.ebuild,v 1.1 2004/05/11 19:05:56 seemant Exp $
 
 inherit eutils
 
 IUSE=""
 
-S=${WORKDIR}/mm2.7/src
+MY_PV=${PV%.*.*}-${PV#*.*.}
+S=${WORKDIR}/mm${PV%.*.*}/src
 DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
 HOMEPAGE="ftp://thumper.bellcore.com/pub/nsb/"
-SRC_URI="ftp://thumper.bellcore.com/pub/nsb/mm2.7.tar.Z
-	http://ftp.debian.org/debian/pool/main/m/metamail/${PN}_2.7-45.diff.gz"
+SRC_URI="ftp://thumper.bellcore.com/pub/nsb/mm${PV%.*.*}.tar.Z
+	http://ftp.debian.org/debian/pool/main/m/metamail/metamail_${MY_PV}.diff.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~sparc ~s390 ~amd64 ~hppa"
+KEYWORDS="x86 ~ppc ~alpha ~ia64 ~sparc ~s390 ~amd64 ~hppa"
 
 DEPEND="sys-libs/ncurses
 	app-arch/sharutils
@@ -22,8 +23,9 @@ DEPEND="sys-libs/ncurses
 
 src_unpack() {
 	unpack ${A}
+	export WANT_AUTOCONF=2.1
 	cd ${S}
-	epatch ${WORKDIR}/metamail_2.7-45.diff
+	epatch ${WORKDIR}/metamail_${MY_PV}.diff
 	autoreconf
 	chmod +x ${S}/configure
 }
diff --git a/net-mail/metamail/metamail-2.7.45.ebuild b/net-mail/metamail/metamail-2.7.45.ebuild
deleted file mode 100644
index c33f9010af1e..000000000000
--- a/net-mail/metamail/metamail-2.7.45.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.45.ebuild,v 1.8 2004/04/15 23:16:49 randy Exp $
-
-inherit eutils
-
-IUSE=""
-
-S=${WORKDIR}/mm2.7/src
-DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
-HOMEPAGE="ftp://thumper.bellcore.com/pub/nsb/"
-SRC_URI="ftp://thumper.bellcore.com/pub/nsb/mm2.7.tar.Z
-	http://ftp.debian.org/debian/pool/main/m/metamail/${PN}_2.7-45.diff.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha ia64 sparc s390"
-
-DEPEND="sys-libs/ncurses
-	app-arch/sharutils
-	net-mail/mailbase"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/metamail_2.7-45.diff
-	chmod +x ${S}/configure
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING CREDITS README
-	rm man/mmencode.1
-	doman man/*
-	doman debian/mimencode.1 debian/mimeit.1
-	insinto /etc
-	doins ${FILESDIR}/mime.types
-}
-