4 files changed, 48 insertions, 14 deletions
diff --git a/net-mail/mpack/ChangeLog b/net-mail/mpack/ChangeLog
index 6a417b96014f..8a2dd09e8529 100644
--- a/net-mail/mpack/ChangeLog
+++ b/net-mail/mpack/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-mail/mpack
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/ChangeLog,v 1.1 2002/06/12 13:03:49 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/ChangeLog,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
+
+  22 May 2005; Simon Stelling <blubb@gentoo.org> mpack-1.5-r1.ebuild:
+  added ~amd64 keyword
+
+  12 Apr 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/mpack-1.5-malloc-fix.patch, mpack-1.5-r1.ebuild:
+  Fixed compile-time bug #84828, reported by Clemens Fruhwirth
+  <clemens@endorphin.org>. Patch provided by steveb <tp22a@softhome.net>. Also
+  install some documentation.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mpack-1.5-r1.ebuild,
+  mpack-1.5.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mpack-1.5-r1 (02 Aug 2002)
+
+  02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> mpack-1.5-r1.ebuild :
+  Security fix.
 
 *mpack-1.5 (12 Jun 2002)
 
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index e69de29bb2d1..2b90afb11e27 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -0,0 +1,8 @@
+MD5 43e6cd3f3750f49514a87262ca9a0cc5 ChangeLog 1058
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 5fdc507bb740e1f3a0e1d504d3b94da4 mpack-1.5-r1.ebuild 834
+MD5 a0ec8d1a38c674be9529da8d9b19878a mpack-1.5.ebuild 608
+MD5 1843f130c05da8fa55d7a7a2758f3944 files/digest-mpack-1.5 64
+MD5 1843f130c05da8fa55d7a7a2758f3944 files/digest-mpack-1.5-r1 64
+MD5 f653be3b702fa824d33ff732d834d4c8 files/mpack-1.5-malloc-fix.patch 824
+MD5 f57f0f4bb0328466f2638a75294fdfed files/mpack-1.5-r1.patch 2345
diff --git a/net-mail/mpack/mpack-1.5-r1.ebuild b/net-mail/mpack/mpack-1.5-r1.ebuild
index e1226c528e8c..1054ee7fd6aa 100644
--- a/net-mail/mpack/mpack-1.5-r1.ebuild
+++ b/net-mail/mpack/mpack-1.5-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5-r1.ebuild,v 1.1 2002/08/02 10:56:03 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Command-line MIME encoding and decoding utilities"
@@ -9,15 +11,16 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}-src.tar.Z"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${P}-src.tar.Z
 	cd ${S}
-	patch -l -p1 <${FILESDIR}/${P}-r1.patch
+	patch -l -p1 <${FILESDIR}/${P}-r1.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-malloc-fix.patch || die "epatch failed"
 }
 
 src_compile() {
@@ -27,4 +30,5 @@ src_compile() {
 src_install () {
 	dodir /usr
 	make DESTDIR=${D}/usr install || die
+	dodoc README.* SCOPTIONS
 }
diff --git a/net-mail/mpack/mpack-1.5.ebuild b/net-mail/mpack/mpack-1.5.ebuild
index abb14dc53d04..b89450d69c82 100644
--- a/net-mail/mpack/mpack-1.5.ebuild
+++ b/net-mail/mpack/mpack-1.5.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5.ebuild,v 1.1 2002/06/12 13:03:49 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
 
+S=${WORKDIR}/${PN}
 DESCRIPTION="Command-line MIME encoding and decoding utilities"
 HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
-LICENSE="as-is"
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}-src.tar.Z"
+
 SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc"
+IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
-S=${WORKDIR}/mpack
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die