gentoo resync : 22.05.2021

5 files changed, 31 insertions, 28 deletions

diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 28e7c229cc22..0483a99f46eb 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -1,6 +1,6 @@
-AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d429352493f658a453214f73aeeaf5c631d07e932cb3314eeccf275f4b63a2c1f65ef969d852a042a96c1295182bf7f22a0bb SHA512 7052db54d42e634d637de96875f1b54803b2dc5fe990ea269a1071705664b4e431ab9531bedabade5f7de6c3fa33208c862a1ceabc3a472a134bbef37476e8c3
-AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
-AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
+AUX man-1.6-cross-compile.patch 1747 BLAKE2B 4fca1280617283151ddf037d12b97d65ac35adff109d932b9b0b7700de15be195990b56db9c90d1eb8a88a4885f733b9e3383f063ca30a7300fdd9b2274e845f SHA512 6155dc5f530c1d3bbe50291e61555b6f63515e3198388ffa66d1c3d3b359ad1f6d143d99607a27aefdc710867b668a86608eafa68151752cf9cdfb5c25ac192a
+AUX man-1.6f-man2html-compression-2.patch 1741 BLAKE2B 51baebadffcc5f58eb7b980c0eddac550ecc98a682ced9ca0ffae6318a806536e42ae5f13d1d061ddd2d41f6ef792f2eb6eac1c1a00e2a8f730de54a3b6589f5 SHA512 85dfdffaaddefff9bfb7b92ab274dcc2e88d880d11c67b0690ff4a92a2a6d3a3b65ad4d425f09bfd042b041b316ec9cb6d1ba6e0a4c13fdf71c9524c50ffe7d0
+AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1197 BLAKE2B 405f8ef56cb725ff48f2bda2e6f78ef46092d697dda6d0a8e1f85ac02cabe48a3801681694245793feb9955378141355fe47cb7d509c9bbec73358816e6aa640 SHA512 cb314bfc7144ddb1fc6d70dcb4e84503bd6504c1ad984be60b2489cccc0a117c9c3c0fdcee0108cee27ad998ecac6d57bfe3a58a3522b36f270089b80c3c424c
+EBUILD man2html-1.6g.ebuild 1163 BLAKE2B e461a818c1b7b0d619cbf6836ec8e53560186eaecea61130d8b5afeb0c6e71ac06f3cdf32c0befe124cbcda45184c8b3504a45a93dc696436a7380c99059d1f5 SHA512 cc829f792929cdfdc1dbd10ff733cbb457b726d02c8886a08810d6e8bc653e387051f5d248c6587a91f3c013ec1f280a1fffa0f7dedd8361a4634cee7ca600c6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/files/man-1.6-cross-compile.patch b/sys-apps/man2html/files/man-1.6-cross-compile.patch
index 265265077a9c..79aa90af212d 100644
--- a/sys-apps/man2html/files/man-1.6-cross-compile.patch
+++ b/sys-apps/man2html/files/man-1.6-cross-compile.patch
@@ -1,8 +1,8 @@
 Fix up to work with cross-compiling ... most of these tests only
 need to see if the example compiled, not whether it runs ...
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -232,15 +232,13 @@
  
  echo checking for POSIX.1 header files
diff --git a/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch b/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
index b79b3a1872f1..cc9093371bb6 100644
--- a/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
+++ b/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
@@ -1,7 +1,7 @@
 add support for bzip2/lzma to man2html and friends
 
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
+--- a/man2html/glimpse_filters
++++ b/man2html/glimpse_filters
 @@ -1,3 +1,6 @@
 +*.bz2	bzip2 -d -c
 +*.lzma	lzma -d -c
@@ -9,8 +9,8 @@ add support for bzip2/lzma to man2html and friends
  *.gz	gzip -d -c
  *.Z	gzip -d -c
  
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
+--- a/man2html/scripts/cgi-bin/man/man2html
++++ b/man2html/scripts/cgi-bin/man/man2html
 @@ -93,6 +93,12 @@
      *.bz2)
  	bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
@@ -37,8 +37,8 @@ add support for bzip2/lzma to man2html and friends
  else
  	"$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
  fi
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
+--- a/man2html/scripts/cgi-bin/man/mansearch
++++ b/man2html/scripts/cgi-bin/man/mansearch
 @@ -153,7 +153,7 @@
        }
        print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
@@ -48,8 +48,8 @@ add support for bzip2/lzma to man2html and friends
        sub(/\./, "(", textname);
        textname = textname ")";
        print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
+--- a/man2html/scripts/cgi-bin/man/mansec
++++ b/man2html/scripts/cgi-bin/man/mansec
 @@ -128,7 +128,7 @@
  				# Print out alphabetic quick index and other links
        }
diff --git a/sys-apps/man2html/files/man-1.6g-compress.patch b/sys-apps/man2html/files/man-1.6g-compress.patch
index 374d80730074..4a5e84a785b1 100644
--- a/sys-apps/man2html/files/man-1.6g-compress.patch
+++ b/sys-apps/man2html/files/man-1.6g-compress.patch
@@ -2,8 +2,8 @@ allow selection of default cache compressor
 
 http://bugs.gentoo.org/205147
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -1012,6 +1012,10 @@
        done
      done
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index 9027484ba531..b84b64315a1e 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -1,33 +1,35 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="man-${PV}"
 
 DESCRIPTION="Standard commands to read man pages"
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
 SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="!sys-apps/man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
-}
+PATCHES=(
+	"${FILESDIR}"/man-1.6f-man2html-compression-2.patch
+	"${FILESDIR}"/man-1.6-cross-compile.patch
+	"${FILESDIR}"/man-1.6g-compress.patch #205147
+)
 
-echoit() { echo "$@" ; "$@" ; }
 src_configure() {
+	echoit() {
+		echo "$@"
+		"$@"
+	}
+
 	tc-export CC BUILD_CC
 
 	# Just a stub to disable configure check.  man2html doesn't use it.
@@ -48,7 +50,8 @@ src_compile() {
 
 src_install() {
 	# A little faster to run this by hand than `emake install`.
-	cd man2html
+	cd man2html || die
+
 	dobin man2html
 	doman man2html.1
 	dodoc README TODO