12 files changed, 64 insertions, 115 deletions
diff --git a/app-misc/muttprint/ChangeLog b/app-misc/muttprint/ChangeLog
index ba056037bb63..458be037110c 100644
--- a/app-misc/muttprint/ChangeLog
+++ b/app-misc/muttprint/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/muttprint
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/ChangeLog,v 1.15 2004/06/24 22:25:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/ChangeLog,v 1.16 2004/08/17 18:09:54 agriffis Exp $
+
+*muttprint-0.72a (17 Aug 2004)
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/muttprint-0.72a-platex.patch, -muttprint-0.62b.ebuild,
+  -muttprint-0.63a.ebuild, -muttprint-0.64.ebuild, muttprint-0.71.ebuild,
+  +muttprint-0.72a.ebuild:
+  Add psutils to RDEPEND #59477. Mark 0.71 stable and trim old versions. Add
+  0.72 with improved ptex support
 
   19 Jun 2004; <malc@gentoo.org> muttprint-0.71.ebuild:
   add ~amd64 - fixes bug #54410
diff --git a/app-misc/muttprint/Manifest b/app-misc/muttprint/Manifest
index ed09c42319dc..95370acbe8ef 100644
--- a/app-misc/muttprint/Manifest
+++ b/app-misc/muttprint/Manifest
@@ -1,9 +1,5 @@
-MD5 4aae271ad74363423e03b9da5f2d0afd muttprint-0.64.ebuild 1132
-MD5 afd729e84f854c46b65b1c7cbb672bad muttprint-0.63a.ebuild 711
-MD5 4ed4757d6c48abe07756bb79991c9b35 muttprint-0.71.ebuild 670
-MD5 7ec88a644bdacf5f76816debb439554b muttprint-0.62b.ebuild 711
 MD5 8cf0317e5b06e8e0182434fdeb50236a ChangeLog 1898
-MD5 d4b2567e46b8d2d51bb1c79d210b4dae files/digest-muttprint-0.62b 67
-MD5 a1c66f4b58129048d98c90388dfac898 files/digest-muttprint-0.63a 67
-MD5 ac006cd555c0f2dc37c054b04b706478 files/digest-muttprint-0.64 66
+MD5 ba6cf3a003697185ad8d937126149eb8 muttprint-0.72a.ebuild 692
+MD5 ba6cf3a003697185ad8d937126149eb8 muttprint-0.71.ebuild 692
+MD5 4f1eb6f695cc9ae2070de833996803ad files/digest-muttprint-0.72a 67
 MD5 d24659b3f96503a4377d11eb6616928d files/digest-muttprint-0.71 66
diff --git a/app-misc/muttprint/files/digest-muttprint-0.62b b/app-misc/muttprint/files/digest-muttprint-0.62b
deleted file mode 100644
index 2b8a06043fad..000000000000
--- a/app-misc/muttprint/files/digest-muttprint-0.62b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a52e4e827ff7a2d9d2aabca2d6f244eb muttprint-0.62b.tar.gz 645494
diff --git a/app-misc/muttprint/files/digest-muttprint-0.63a b/app-misc/muttprint/files/digest-muttprint-0.63a
deleted file mode 100644
index 40f2f536fa75..000000000000
--- a/app-misc/muttprint/files/digest-muttprint-0.63a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4455972e21a5f1d2af6a43bbffdaf6be muttprint-0.63a.tar.gz 724771
diff --git a/app-misc/muttprint/files/digest-muttprint-0.64 b/app-misc/muttprint/files/digest-muttprint-0.64
deleted file mode 100644
index eddb5b5ad31d..000000000000
--- a/app-misc/muttprint/files/digest-muttprint-0.64
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf248c768af2293cd55aad677e9a1939 muttprint-0.64.tar.gz 727206
diff --git a/app-misc/muttprint/files/digest-muttprint-0.72a b/app-misc/muttprint/files/digest-muttprint-0.72a
new file mode 100644
index 000000000000..5e4c6d0bdacf
--- /dev/null
+++ b/app-misc/muttprint/files/digest-muttprint-0.72a
@@ -0,0 +1 @@
+MD5 eda4de2a2777795ddb1a5b59f810bb29 muttprint-0.72a.tar.gz 864054
diff --git a/app-misc/muttprint/files/muttprint-0.72a-platex.patch b/app-misc/muttprint/files/muttprint-0.72a-platex.patch
new file mode 100644
index 000000000000..3204ded7fd4d
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.72a-platex.patch
@@ -0,0 +1,15 @@
+--- muttprint-0.72a/muttprint.agriffis	2004-04-07 13:27:31.000000000 -0400
++++ muttprint-0.72a/muttprint	2004-08-17 13:42:22.000000000 -0400
+@@ -598,8 +598,10 @@
+ 
+ #
+ # running latex twice because of the "page ... of ..."
+-system("latex -interaction=nonstopmode mail.tex >> $errorRedirection 2>&1");
+-system("latex -interaction=nonstopmode mail.tex >> $errorRedirection 2>&1");
++use File::Which;
++my $latex = which('platex') || 'latex';
++system("$latex -interaction=nonstopmode mail.tex >> $errorRedirection 2>&1");
++system("$latex -interaction=nonstopmode mail.tex >> $errorRedirection 2>&1");
+ 
+ #
+ # no check of the exit code because we do this here
diff --git a/app-misc/muttprint/muttprint-0.62b.ebuild b/app-misc/muttprint/muttprint-0.62b.ebuild
deleted file mode 100644
index cc5bfd3b2168..000000000000
--- a/app-misc/muttprint/muttprint-0.62b.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.62b.ebuild,v 1.9 2004/06/24 22:25:58 agriffis Exp $
-
-DESCRIPTION="pretty printing of your mails"
-HOMEPAGE="http://muttprint.sf.net/"
-SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/tetex"
-
-src_compile() {
-
-	if has_version 'app-text/ptex' ; then
-		cp muttprint muttprint.in
-		sed -e "s/latex/platex/g" muttprint.in > muttprint
-	fi
-}
-
-src_install() {
-	# understanding the install part of the Makefiles.
-	make prefix=${D}/usr docdir=${D}/usr/share/doc/ install || die
-}
diff --git a/app-misc/muttprint/muttprint-0.63a.ebuild b/app-misc/muttprint/muttprint-0.63a.ebuild
deleted file mode 100644
index 22b36fcaa855..000000000000
--- a/app-misc/muttprint/muttprint-0.63a.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.63a.ebuild,v 1.7 2004/06/24 22:25:58 agriffis Exp $
-
-DESCRIPTION="pretty printing of your mails"
-HOMEPAGE="http://muttprint.sf.net/"
-SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/tetex"
-
-src_compile() {
-
-	if has_version 'app-text/ptex' ; then
-		cp muttprint muttprint.in
-		sed -e "s/latex/platex/g" muttprint.in > muttprint
-	fi
-}
-
-src_install() {
-	# understanding the install part of the Makefiles.
-	make prefix=${D}/usr docdir=${D}/usr/share/doc/ install || die
-}
diff --git a/app-misc/muttprint/muttprint-0.64.ebuild b/app-misc/muttprint/muttprint-0.64.ebuild
deleted file mode 100644
index e45e3de69105..000000000000
--- a/app-misc/muttprint/muttprint-0.64.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.64.ebuild,v 1.7 2004/06/24 22:25:58 agriffis Exp $
-
-DESCRIPTION="pretty printing of your mails"
-HOMEPAGE="http://muttprint.sf.net/"
-SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/tetex"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv Makefile ${T}/Makefile
-	sed -e "s:(docdir)/muttprint:(docdir)/muttprint-${PV}:" \
-		${T}/Makefile > Makefile
-
-	#here comes some ugly hacks to install the docs in the right spot
-	for lang in de en es it; do
-		cd ${S}/doc/manual/$lang
-		mv Makefile ${T}/Makefile-$lang
-		sed -e "s:(docdir)/muttprint:(docdir)/muttprint-${PV}:" \
-			${T}/Makefile-$lang > Makefile
-		cd ${S}
-	done
-
-}
-
-src_compile() {
-
-	if has_version 'app-text/ptex' ; then
-		cp muttprint muttprint.in
-		sed -e "s/latex/platex/g" muttprint.in > muttprint
-	fi
-}
-
-src_install() {
-	# understanding the install part of the Makefiles.
-	make prefix=${D}/usr docdir=${D}/usr/share/doc/ install || die
-}
diff --git a/app-misc/muttprint/muttprint-0.71.ebuild b/app-misc/muttprint/muttprint-0.71.ebuild
index a6b15215e8f9..ba2c7180b6fa 100644
--- a/app-misc/muttprint/muttprint-0.71.ebuild
+++ b/app-misc/muttprint/muttprint-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.71.ebuild,v 1.11 2004/06/24 22:25:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.71.ebuild,v 1.12 2004/08/17 18:09:54 agriffis Exp $
 
 DESCRIPTION="Script for pretty printing of your mails"
 HOMEPAGE="http://muttprint.sf.net/"
@@ -8,14 +8,14 @@ SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha ~amd64"
+KEYWORDS="x86 alpha amd64 ia64"
 IUSE=""
 
-DEPEND="virtual/tetex
-	dev-perl/TimeDate"
+RDEPEND="virtual/tetex
+	dev-perl/TimeDate
+	app-text/psutils"
 
 src_compile() {
-
 	if has_version 'app-text/ptex' ; then
 		sed -i -e "s/latex/platex/g" muttprint
 	fi
diff --git a/app-misc/muttprint/muttprint-0.72a.ebuild b/app-misc/muttprint/muttprint-0.72a.ebuild
new file mode 100644
index 000000000000..f84ebe050d57
--- /dev/null
+++ b/app-misc/muttprint/muttprint-0.72a.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.72a.ebuild,v 1.1 2004/08/17 18:09:54 agriffis Exp $
+
+inherit eutils
+
+DESCRIPTION="Script for pretty printing of your mails"
+HOMEPAGE="http://muttprint.sf.net/"
+SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~alpha ~amd64 ~ia64"
+IUSE=""
+
+RDEPEND="virtual/tetex
+	dev-lang/perl
+	dev-perl/TimeDate
+	dev-perl/Text-Iconv
+	app-text/psutils"
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die
+	epatch ${FILESDIR}/${PN}-0.72a-platex.patch
+	make clean	# ia32 binaries included in distribution
+}
+
+src_install() {
+	make prefix=${D}/usr docdir=${D}/usr/share/doc docdirname=${P} install
+}