gentoo resync : 09.07.2022

3 files changed, 38 insertions, 45 deletions

diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest
index 3ef9b2ad26e0..1f1f7b6a4a3b 100644
--- a/net-mail/mhonarc-gentoo/Manifest
+++ b/net-mail/mhonarc-gentoo/Manifest
@@ -1,4 +1,4 @@
-AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 6534 BLAKE2B 32bb00808fd084445442c69c3689cb2d2efbb149e52a6a0f2375a89116eddc239c0d997ab2274e486ff475b0aea9cbbc94b0380c64afb07060dc25edd700b659 SHA512 f4c238e3394df9fccf1cefe697a2f5a53fdda5f02498ed5cd6d9adb301f49b257b8f01bf486a00ebd49b128d8707b8699a6e08cf3e3548709cbd29dca12e3d92
+AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 5666 BLAKE2B 97368c21d6e17a5791bc6e888df3105e437bd82594aa5780ac60c103de011d397fdeaf1f1c4b92cb36ba0dc3c15f175562f4f0400d65ea9ab92a26d3eded1dab SHA512 146680d6558d4b7139ceead0a6c7010af1a91010bccf7b802621cbc02753e516025e4d33b9c2c870b5317c1121b75282f4ed007d9919157450dad5168fc7a891
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
-EBUILD mhonarc-gentoo-2.6.18-r2.ebuild 752 BLAKE2B c2f88a28593eaa69d89fc310a972f30ed01725c0a4d694376767b00e29b389caaba2334c888b51891099630b1c429fb2ded4a19fd5954ed6873ceccc93c46872 SHA512 f5240bed8951ec02cfd0506ec14375c705770f450e7cbf8d8c8dc49460c2f1e87a21c2b29803eb87f9acaf0c23d57b4067ed081657911fb62e478157e0af78d7
+EBUILD mhonarc-gentoo-2.6.18-r3.ebuild 751 BLAKE2B a82c7bdde8fc9ad44f65b76f951cf065cd579e3d1177287b73acedd178715f46a7007768a6ce52b1ec9d69c7d924919856ea47c139797a3e4e74ce44ebe103b5 SHA512 635dcf4440d278a1f380652f8d3728774abc7ebc9b0fa95f57255a7b0d8afa255d5a50783fc6ea12fad16e0093f7b2b0c8a4c8a11b1ca155220aa9eec95f26aa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
index d67c63e4b95f..7f1f894882d5 100644
--- a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
+++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
---- a/lib/mhamain.pl	2006-06-10 02:42:58.000000000 +0000
-+++ b/lib/mhamain.pl	2008-01-27 14:12:48.000000000 +0000
+--- a/lib/mhamain.pl
++++ b/lib/mhamain.pl
 @@ -73,6 +73,8 @@
      TERM TRAP USR1 USR2 VTALRM XCPU XFSZ
  );
@@ -10,7 +9,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  ###############################################################################
  ##	Public routines
  ###############################################################################
-@@ -934,6 +936,16 @@
+@@ -936,6 +938,16 @@
      } else {
  	$ctype = 'text/plain';
      }
@@ -26,8 +25,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
 +    }
  
      ## Insure uniqueness of index
-     $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1)));
-@@ -955,6 +967,7 @@
+     my $t = $index;
+@@ -961,6 +973,7 @@
      $Subject{$index} = $sub;
      $MsgHead{$index} = htmlize_header($fields);
      $ContentType{$index} = $ctype;
@@ -35,7 +34,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      if ($msgid) {
  	$MsgId{$msgid} = $index;
  	$NewMsgId{$msgid} = $index;	# Track new message-ids
-@@ -966,6 +979,7 @@
+@@ -972,6 +985,7 @@
      } else {
  	$IndexNum{$index} = getNewMsgNum();
      }
@@ -43,7 +42,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  
      $Refs{$index} = [ @refs ]  if (@refs);
  
-@@ -1102,7 +1116,7 @@
+@@ -1121,7 +1135,7 @@
  
      my $adding	     = ($ADD && !$force && !$SINGLE);
      my $i_p0 	     = fmt_msgnum($msgnum);
@@ -52,7 +51,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      my $filepathname = join($DIRSEP, $OUTDIR, $filename);
      my $tmppathname;
  
-@@ -1160,7 +1174,9 @@
+@@ -1179,7 +1193,9 @@
  		"<!--X-Message-Id: ",
  		    commentize($Index2MsgId{$index}), " -->\n",
  		"<!--X-Content-Type: ",
@@ -63,7 +62,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  
  	    if (defined($Refs{$index})) {
  		foreach (@{$Refs{$index}}) {
-@@ -1456,8 +1472,9 @@
+@@ -1475,8 +1491,9 @@
      #&defineIndex2MsgId();
      my $msgnum = $IndexNum{$key};
      return (undef, undef)  if ($msgnum eq '');
@@ -74,9 +73,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      delete $ContentType{$key};
      delete $Date{$key};
      delete $From{$key};
-diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
---- a/lib/mhdb.pl	2005-12-20 21:28:15.000000000 +0000
-+++ b/lib/mhdb.pl	2008-01-27 13:25:52.000000000 +0000
+--- a/lib/mhdb.pl
++++ b/lib/mhdb.pl
 @@ -61,6 +61,7 @@
  
  ## Meta-data
@@ -85,10 +83,9 @@ diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
  print_var($db,'Date',        \%Date);
  print_var($db,'Derived',     \%Derived);
  print_var($db,'FollowOld',   \%Follow);
-diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
---- a/lib/mhinit.pl	2005-07-08 06:34:03.000000000 +0000
-+++ b/lib/mhinit.pl	2008-01-27 13:25:52.000000000 +0000
-@@ -247,6 +247,7 @@
+--- a/lib/mhinit.pl
++++ b/lib/mhinit.pl
+@@ -248,6 +248,7 @@
  %Follow  	= ();	# Index key to follow-ups
  %FolCnt   	= ();	# Index key to number of follow-ups
  %ContentType	= ();	# Index key to base content-type of message
@@ -96,9 +93,8 @@ diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
  %Icons    	= ();	# Index key to icon URL for content-type
  %AddIndex 	= ();	# Flags for messages that must be written
  
-diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
---- a/lib/mhmsgfile.pl	2001-09-17 16:10:28.000000000 +0000
-+++ b/lib/mhmsgfile.pl	2008-01-27 14:12:16.000000000 +0000
+--- a/lib/mhmsgfile.pl
++++ b/lib/mhmsgfile.pl
 @@ -123,6 +123,10 @@
      if (defined($href->{'derived'})) {
  	$Derived{$index} = $href->{'derived'};
@@ -110,10 +106,9 @@ diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
  
      $IndexNum{$index} = int($msgnum);
  
-diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
---- a/lib/mhopt.pl	2005-07-08 06:34:03.000000000 +0000
-+++ b/lib/mhopt.pl	2008-01-27 13:25:52.000000000 +0000
-@@ -764,6 +764,7 @@
+--- a/lib/mhopt.pl
++++ b/lib/mhopt.pl
+@@ -798,6 +798,7 @@
      delete($MsgId{''});
      delete($FollowOld{''});
      delete($ContentType{''});
@@ -121,10 +116,9 @@ diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
      delete($Refs{''});
  
      # update DOCURL if default old value
-diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
---- a/lib/mhrcvars.pl	2005-07-08 05:27:52.000000000 +0000
-+++ b/lib/mhrcvars.pl	2008-01-27 14:11:19.000000000 +0000
-@@ -195,7 +195,7 @@
+--- a/lib/mhrcvars.pl
++++ b/lib/mhrcvars.pl
+@@ -225,7 +225,7 @@
  	}
      	if ($var eq 'MSG') {		## Filename of message page
  	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
@@ -133,7 +127,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	    last REPLACESW;
  	}
  	if ($var eq 'MSGHFIELD') {	## Message header field
-@@ -417,7 +417,7 @@
+@@ -447,7 +447,7 @@
  	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
  	    $tmp = qq/name="/ . &fmt_msgnum($IndexNum{$key}) .
  		   qq/" href="/ .
@@ -142,7 +136,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  		   qq/"/;
  	    last REPLACESW;
  	}
-@@ -432,7 +432,7 @@
+@@ -462,7 +462,7 @@
  	    $isurl = 0;
  	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
  	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
@@ -151,7 +145,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	    last REPLACESW;
  	}
      	if ($var eq 'IDXFNAME') {	## Filename of index page
-@@ -730,7 +730,7 @@
+@@ -760,7 +760,7 @@
      $ret = qq|<a name="| .
  	   &fmt_msgnum($IndexNum{$index}) .
  	   qq|" href="| .
@@ -160,9 +154,8 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	   qq|">$ret</a>|
  	if $var eq 'SUBJECT' && $arg eq "" && !$mailto;
  
-diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
---- a/lib/mhutil.pl	2005-07-08 05:27:53.000000000 +0000
-+++ b/lib/mhutil.pl	2008-01-27 14:11:50.000000000 +0000
+--- a/lib/mhutil.pl
++++ b/lib/mhutil.pl
 @@ -28,6 +28,7 @@
  package mhonarc;
  
@@ -171,7 +164,7 @@ diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
  
  ## RFC 2369 header fields to check for URLs
  %HFieldsList = (
-@@ -304,16 +305,20 @@
+@@ -313,16 +314,20 @@
  ##	Routine to get filename of a message number.
  ##
  sub msgnum_filename {
diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild
index 333911aff1b2..544922d5947e 100644
--- a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 
+MY_P="${P/mhonarc-gentoo/MHonArc}"
+
 DESCRIPTION="Perl Mail-to-HTML Converter, Gentoo fork"
 HOMEPAGE="https://www.mhonarc.org/"
-LICENSE="GPL-2"
 SRC_URI="https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!net-mail/mhonarc"
 
-MY_P="${P/mhonarc-gentoo/MHonArc}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-archives-gentoo.patch" )
+PATCHES=( "${FILESDIR}"/${P}-archives-gentoo.patch )
 
 src_install() {
-	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile || die "sed on Makefile failed"
+	sed -e "s|-prefix |-docpath '${ED}/usr/share/doc/${PF}' -prefix '${ED}'|g" -i Makefile || die "sed on Makefile failed"
 	sed -e "s|installsitelib|installvendorlib|g" -i install.me || die "sed on install.me failed"
 
 	perl-module_src_install