commit: e3813cd6207fd35886b17935ca8670629a519386 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 11 02:44:01 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 02:44:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3813cd6
app-misc/muttprint: port to EAPI 7 Closes: https://bugs.gentoo.org/677206 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/muttprint-0.73-fix-number-of-pages.patch | 5 ++- .../muttprint/files/muttprint-0.73-manuals.patch | 5 ++- .../files/muttprint-0.73-pod-encoding.patch | 20 +++++------ .../muttprint/files/muttprint-0.73-warning.patch | 5 ++- app-misc/muttprint/muttprint-0.73-r4.ebuild | 40 ++++++++++++---------- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch index 0e7a4b4f94f..b4eff101863 100644 --- a/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch +++ b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch @@ -1,6 +1,5 @@ -diff -Nuar a/muttprint b/muttprint ---- a/muttprint 2016-09-23 10:03:48.870030157 +0200 -+++ b/muttprint 2016-09-23 10:08:39.310036004 +0200 +--- a/muttprint ++++ b/muttprint @@ -1635,7 +1635,7 @@ open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!"; diff --git a/app-misc/muttprint/files/muttprint-0.73-manuals.patch b/app-misc/muttprint/files/muttprint-0.73-manuals.patch index 57dd12dfa74..74619f38b26 100644 --- a/app-misc/muttprint/files/muttprint-0.73-manuals.patch +++ b/app-misc/muttprint/files/muttprint-0.73-manuals.patch @@ -1,6 +1,5 @@ -diff -u -r a/doc/manual/en/manual-en.sgml b/doc/manual/en/manual-en.sgml ---- a/doc/manual/en/manual-en.sgml 2005-05-16 14:38:51.000000000 +0200 -+++ b/doc/manual/en/manual-en.sgml 2011-11-27 23:45:50.970890374 +0100 +--- a/doc/manual/en/manual-en.sgml ++++ b/doc/manual/en/manual-en.sgml @@ -191,6 +191,7 @@ <para>As mentioned above, there must be a small C program compiled. If you use Perl 5.8 and/or Linux, you could skip this step. For this, just execute diff --git a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch index 1a939582c1b..f226a197c22 100644 --- a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch +++ b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch @@ -1,33 +1,29 @@ -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-12-19 23:17:31.939783684 +0100 +--- a/doc/manpages/de/muttprint.pod ++++ b/doc/manpages/de/muttprint.pod @@ -1,3 +1,5 @@ +=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-12-19 23:17:15.219783778 +0100 +--- a/doc/manpages/en/muttprint.pod ++++ b/doc/manpages/en/muttprint.pod @@ -1,3 +1,5 @@ +=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-12-19 23:17:25.029783723 +0100 +--- a/doc/manpages/es/muttprint.pod ++++ b/doc/manpages/es/muttprint.pod @@ -1,3 +1,5 @@ +=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-12-19 23:17:39.779783640 +0100 +--- a/doc/manpages/it/muttprint.pod ++++ b/doc/manpages/it/muttprint.pod @@ -1,3 +1,5 @@ +=encoding latin1 + diff --git a/app-misc/muttprint/files/muttprint-0.73-warning.patch b/app-misc/muttprint/files/muttprint-0.73-warning.patch index e17f658732d..41f6630758e 100644 --- a/app-misc/muttprint/files/muttprint-0.73-warning.patch +++ b/app-misc/muttprint/files/muttprint-0.73-warning.patch @@ -1,6 +1,5 @@ -diff -Nur a/muttprint b/muttprint ---- a/muttprint 2012-04-28 13:46:46.109925472 +0200 -+++ b/muttprint 2012-04-28 13:48:40.919924827 +0200 +--- a/muttprint ++++ b/muttprint @@ -740,6 +740,8 @@ } } diff --git a/app-misc/muttprint/muttprint-0.73-r4.ebuild b/app-misc/muttprint/muttprint-0.73-r4.ebuild index 0c5c35c1767..3d9cae7c05f 100644 --- a/app-misc/muttprint/muttprint-0.73-r4.ebuild +++ b/app-misc/muttprint/muttprint-0.73-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools-utils eutils +inherit autotools DESCRIPTION="Script for pretty printing of your mails" HOMEPAGE="http://muttprint.sourceforge.net"; @@ -14,20 +14,30 @@ LICENSE="GPL-2" KEYWORDS="amd64 ppc ppc64 x86" IUSE="doc" -DEPEND="dev-lang/perl - virtual/latex-base +DEPEND=" dev-texlive/texlive-fontsextra + dev-lang/perl + virtual/latex-base doc? ( app-text/dvipsk - app-text/docbook-sgml-utils[jadetex] )" + app-text/docbook-sgml-utils[jadetex] + ) +" -RDEPEND="dev-lang/perl +RDEPEND=" + dev-texlive/texlive-latexextra + dev-lang/perl dev-perl/TimeDate dev-perl/Text-Iconv virtual/latex-base - dev-texlive/texlive-latexextra" +" -AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}/${P}-warning.patch" + "${FILESDIR}/${P}-manuals.patch" + "${FILESDIR}/${P}-pod-encoding.patch" + "${FILESDIR}/${P}-fix-number-of-pages.patch" +) patch_docs() { sed -i -e 's/db2pdf/docbook2pdf/' "${S}"/configure.ac || die @@ -42,10 +52,7 @@ patch_docs() { } src_prepare() { - epatch "${FILESDIR}/${P}-warning.patch" - epatch "${FILESDIR}/${P}-manuals.patch" - epatch "${FILESDIR}/${P}-pod-encoding.patch" - epatch "${FILESDIR}/${P}-fix-number-of-pages.patch" + default if use doc ; then # Patch docbook and docdir @@ -54,7 +61,8 @@ src_prepare() { # Don't do manuals sed -i -e '/db2pdf/d' "${S}"/configure.ac || die fi - sed -i -e "/^docdir/s/$/-${PV}/" "${S}"/Makefile.am || die + + sed -i -e "/^docdir/s/$/-${PVR}/" "${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 @@ -62,10 +70,6 @@ src_prepare() { eautoreconf } -src_configure() { - econf --docdir="/usr/share/doc/${PF}" -} - src_compile() { # Parallel build does not work when USE="doc" emake -j1
