Fix bug #519606. Thanks to Barry Schwartz and Lars

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D628E536)

3 files changed, 115 insertions, 2 deletions

diff --git a/app-misc/muttprint/ChangeLog b/app-misc/muttprint/ChangeLog
index 49943f0dd42b..8adacc8af282 100644
--- a/app-misc/muttprint/ChangeLog
+++ b/app-misc/muttprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/muttprint
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/ChangeLog,v 1.60 2013/09/28 15:32:25 nimiux Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/ChangeLog,v 1.61 2014/08/19 17:22:47 nimiux Exp $
+
+*muttprint-0.73-r2 (19 Aug 2014)
+
+  19 Aug 2014; Chema Alonso <nimiux@gentoo.org> +muttprint-0.73-r2.ebuild,
+  +files/muttprint-0.73-pod-encoding.patch:
+  Fix bug #519606. Thanks to Barry Schwartz and Lars
 
   28 Sep 2013; Chema Alonso <nimiux@gentoo.org> -muttprint-0.72d-r3.ebuild,
   -files/muttprint-0.72d-warning.patch, -files/muttprint-CVE-2008-5368.patch,
diff --git a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch
new file mode 100644
index 000000000000..e51095a8e75a
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch
@@ -0,0 +1,32 @@
+diff -Nuar a/doc/manpages/de/muttprint.pod b/doc/manpages/de/muttprint.pod
+--- a/doc/manpages/de/muttprint.pod	2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/de/muttprint.pod	2014-08-19 19:00:14.939978099 +0200
+@@ -1,3 +1,4 @@
++=encoding latin1
+ =head1 NAME
+ 
+ muttprint - schöner Ausdruck von Mails mit Mutt
+diff -Nuar a/doc/manpages/en/muttprint.pod b/doc/manpages/en/muttprint.pod
+--- a/doc/manpages/en/muttprint.pod	2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/en/muttprint.pod	2014-08-19 19:00:09.349978130 +0200
+@@ -1,3 +1,4 @@
++=encoding latin1
+ =head1 NAME
+ 
+ muttprint - pretty printing of mails with Mutt
+diff -Nuar a/doc/manpages/es/muttprint.pod b/doc/manpages/es/muttprint.pod
+--- a/doc/manpages/es/muttprint.pod	2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/es/muttprint.pod	2014-08-19 19:00:11.109978120 +0200
+@@ -1,3 +1,4 @@
++=encoding latin1
+ =head1 NOMBRE
+ 
+ muttprint - impresión elegante de mensajes de correo con Mutt
+diff -Nuar a/doc/manpages/it/muttprint.pod b/doc/manpages/it/muttprint.pod
+--- a/doc/manpages/it/muttprint.pod	2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/it/muttprint.pod	2014-08-19 19:00:12.679978111 +0200
+@@ -1,3 +1,4 @@
++=encoding latin1
+ =head1 NOME
+ 
+ muttprint - stampa raffinata della posta elettronica con Mutt
diff --git a/app-misc/muttprint/muttprint-0.73-r2.ebuild b/app-misc/muttprint/muttprint-0.73-r2.ebuild
new file mode 100644
index 000000000000..a3eaa9436915
--- /dev/null
+++ b/app-misc/muttprint/muttprint-0.73-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.73-r2.ebuild,v 1.1 2014/08/19 17:22:47 nimiux Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Script for pretty printing of your mails"
+HOMEPAGE="http://muttprint.sourceforge.net"
+SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/perl
+	virtual/latex-base
+	doc? (
+		app-text/dvipsk
+		app-text/docbook-sgml-utils[jadetex] )"
+
+RDEPEND="dev-lang/perl
+	virtual/latex-base
+	dev-texlive/texlive-latexextra"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+patch_docs() {
+	sed -i -e 's/db2pdf/docbook2pdf/' "${S}"/configure.ac || die
+	for l in de en es it sl
+	do
+		sed -i -e "/^docdir/s/$/-${PV}/" \
+			-e 's/db2/docbook2/' -e 's/ -s / -d /' \
+			-e "s|manual-${l}-sed/||" \
+			-e "s/mv manual-${l}-sed.dvi/cp manual-${l}-sed.dvi/" \
+			"${S}"/doc/manual/${l}/Makefile.am || die
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-warning.patch"
+	epatch "${FILESDIR}/${P}-manuals.patch"
+	epatch "${FILESDIR}/${P}-pod-encoding.patch"
+
+	if use doc ; then
+		# Patch docbook and docdir
+		patch_docs
+	else
+		# Don't do manuals
+		sed -i -e '/db2pdf/d' "${S}"/configure.ac || die
+	fi
+	sed -i -e "/^docdir/s/$/-${PV}/" "${S}"/Makefile.am || die
+
+	# The distfile does not include the png files, nor penguin.jpg
+	sed -i -e '/.*png /d' -e '/penguin.jpg /d' "${S}"/pics/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	# Parallel build does not work when USE="doc"
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog
+}