gentoo (valentine's day) resync : 14.02.2021

6 files changed, 41 insertions, 45 deletions

diff --git a/app-misc/muttprint/Manifest b/app-misc/muttprint/Manifest
index ab93ea5e004b..06425ea73f6f 100644
--- a/app-misc/muttprint/Manifest
+++ b/app-misc/muttprint/Manifest
@@ -1,7 +1,7 @@
-AUX muttprint-0.73-fix-number-of-pages.patch 437 BLAKE2B d6209d3c1d357e6e82c43021633138e0e245b6c33d52c2dba81d35aa9f2b1dc45642b6d2d2aeade89f15774b018b9ed1d843f9af74f4ec4c0cd3a3633c845037 SHA512 f19944d7969d9e180e86b6558b4255cfcb12dea01f4cd042682381d6dc0949e79eed439ba4daf62a41f53a2b5ed76f8f2d72c802bed879f26a2d2fa5cf054449
-AUX muttprint-0.73-manuals.patch 5842 BLAKE2B 4c92a90f47692193dfb27a3506fbd8ff7c4291b9305e262abb20375993648a22481c6a36d75f5d0d5658c298838cd9715b7973b8b41959af7518043d77bd15b2 SHA512 7f9be903e004ab2e567c7af0a0a10963fe716377d82faf2c5c58edb7a80de363b74cd4ccb70886bb58a28e10a1dd476f41cc372d921cbb9a5f91b19fb3a8274f
-AUX muttprint-0.73-pod-encoding.patch 1305 BLAKE2B 4a53284c3531cf71e9a86b6de10f22aafbdd3731306e446175f268503d1fce68a7bfa43c7af3ac0810868f58688f081b5b3388ec4bc808fccfe781c61fbff86c SHA512 227188f17004b3c713bf81c165154e834a18fae9f3e0a461e4e5e267802ab4259556c51aecf00d62d8027b236a6490cd40d6dbcf55afcfde31e09771efe21b95
-AUX muttprint-0.73-warning.patch 404 BLAKE2B 23f0dbcae883aecbe2f9a26567ca432309e3345a8791930ea7c961c71d7fa452ba2b810715dba56825c972be0b65503c9351a2c3a077eebc8f460cb99bca0fea SHA512 4f39fb455c0f99a68b2c004556377c5c385ecf136ae5a317fc1418497bfa28d0965e8b4572897a74da651b75c17cbebe0e12cb37950f8a45cb3b2c4205f65bd5
+AUX muttprint-0.73-fix-number-of-pages.patch 330 BLAKE2B 7e3290aef08ae2ec7aa15448ff5633082187f138cef419034925a1be8765a977224b8cff8e4cead5bb159fc3ee3a6b47a4b9fda6935baa723f8a4f23a963ace5 SHA512 12151e428b31115589750cd5c3927e2d0594bdb909756eae488d1aad57320885c6ed0e0a0fcc59709af651b8315f7677709d3ff32b6217ca55af6028ffbc7a28
+AUX muttprint-0.73-manuals.patch 5697 BLAKE2B 4be88b14f79aeca2500c056b7ac9b66693583857affb5f62e9b344e4bb12326f610ca197e7d598817e6be84431556c33a01cd7186a9531ff41088e494441c86d SHA512 540bb7f29319585cc3baeffd164f75c76ba6731a61a023ab87b59997fa9abf68a169fc913cc8919a91398be95f14a4beb8a2e09f679c3a37dfe8cd7f12550619
+AUX muttprint-0.73-pod-encoding.patch 719 BLAKE2B 4262f6eb4a8fa81648cd48ce9f9391251d277d3fa444bd07dcae672f7c654b9d35b0ff3cb882b43d776d0eba8eb8f05f9cb78cbb56a7d76ae1d4688be4500583 SHA512 8e90f47ab2d98dddd5c7e4b8e6deaecf873e538ab32b1aae3d8ec17b1cb829fbc62512a4798a34a4440e97fde16b0b31b70d20a69c848b4cc74e05bfc3c22d99
+AUX muttprint-0.73-warning.patch 298 BLAKE2B ad57213be916ed3f0756cc48c12cab060e5e45d3e7204e49eebbc025b3b91572ff8230e498b8e0c7e2832cf023974911f3edfe1ed7903ba3e92dd8a2f418a40e SHA512 b0b2a9229b061cb95f7fdcd94e53104c919d5d3aa699e29c76176b7c1a3c2112fcd9809a6adb713795651a374537df5a361c762e6f8476e58186cb37b06e5b09
 DIST muttprint-0.73.tar.gz 361268 BLAKE2B 0d7a84056df8550368783acec52693dbb68f5be547394cbba8701619ab7e73ce69d68f2d531cfa45b56321db89565d5be4e7b72e0c58bfac977c3143ca7b895f SHA512 607bdbee769e6d3a954979f15f017875a70078462bdbd747ff65dc3ac61fda3a0c32b261430faab8e457d6781b03d9f266ae2d21cdbdd058a7635ba9ddd27834
-EBUILD muttprint-0.73-r4.ebuild 1749 BLAKE2B 7c6777010a6f30df0a00822f7633fac2753386de478b902be59573ccb32b225cba7e15621f9f6f27838322d101673ca367ab2b5ceb5c88cadb0f835fda60ca5e SHA512 9cc56828a72af4684403853f88dd28c59d78173135500f4d52e8009aa9d49f81382db6bf73b5f569c71ccb0e655b7ac05fa4b9070610ebe3907dfdf54b61bd9e
+EBUILD muttprint-0.73-r5.ebuild 1647 BLAKE2B c51982a29e11af478c201e9c46958f20c6073d24f2e4d77009455488e1658c1bc57ba46cef278e6d28fb16084a2e7165e60967ff671ed28beeb663f164a1953c SHA512 e9e3a16a54e1f78c022204fa4725e8c3d973c0f85a927ac50fdc9632fbab51fc1bff32dba21d55e6cd8808be44a1d1fcc7952a889dfa85a6af6fe0035510e1bc
 MISC metadata.xml 308 BLAKE2B fde4441a8f5a4e0d84bcf73daafd749fc02eb642824a78776b39e91e0daaa59767aefab5f2bbc6793d35da66ca710a59955d5cdcbf5c4d0c58040ab884f5726c SHA512 9021c73bc666f5213c3c1246b2544a0fbbb930bfaa3acbf3c79f142199cdb5d0c0fd0131989c7f48a2b4c95c2404411d3afeb6bbdc715a5f7d256ab5b36384c5
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 0e7a4b4f94ff..b4eff1018635 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 57dd12dfa74f..74619f38b26e 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 1a939582c1bf..f226a197c228 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 e17f658732d9..41f6630758e4 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-r5.ebuild
index 0c5c35c17679..cf6dcac23238 100644
--- a/app-misc/muttprint/muttprint-0.73-r4.ebuild
+++ b/app-misc/muttprint/muttprint-0.73-r5.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,29 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
-DEPEND="dev-lang/perl
-	virtual/latex-base
+BDEPEND="
 	dev-texlive/texlive-fontsextra
+	dev-lang/perl
+	virtual/latex-base
 	doc? (
 		app-text/dvipsk
-		app-text/docbook-sgml-utils[jadetex] )"
-
-RDEPEND="dev-lang/perl
+		app-text/docbook-sgml-utils[jadetex]
+	)
+"
+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 +51,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 +60,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 +69,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
 src_compile() {
 	# Parallel build does not work when USE="doc"
 	emake -j1