gentoo resync : 28.04.2021

4 files changed, 22 insertions, 19 deletions

diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
index f37518e06c4a..8b60a6f513f6 100644
--- a/app-text/code2html/Manifest
+++ b/app-text/code2html/Manifest
@@ -1,6 +1,6 @@
-AUX code2html-0.9.1-prefix.patch 1393 BLAKE2B 84fc0e9c60772dab33ddee16fe62e96c36c321a92b973006aef6238a78a8aa7d769b14fe8e74fc993112ce7ff227876b8db467e3c10b60ccadab4f26f8b80a0c SHA512 3331c0590e992b098548cc10deffc270b4ed7cb790b747124a2053ba8a96274bcdaa08eaf8513f24a6ec8d9fb6b9bb93f8690a55d00e767085c005dc2e5f7ca4
-AUX code2html-0.9.1-scalar.patch 1435 BLAKE2B aff200017e0cb68ce17a9d8f7ee7eee6576cec4002b04ff4022f37232267169130fe1ab438258daf8f5a32283d99d4911e1203baa02b71486c9da3aef6c35632 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6
+AUX code2html-0.9.1-prefix.patch 1397 BLAKE2B aafe82f7970ae42c94b4685ca592baba66f66ed04e2991b6d948717a44339c04850eb08dabb60690183ba969be553626bcadb33ca7916e428616a6525b6b7b0b SHA512 eaa1fe1a79cac901db6de60b0bef4f24154c3cdd5b3ad8e5bccac340eb84af0637707e111bd3e1ce56719147b48d3b1508f03753a7622056d2214bc5a99652b2
+AUX code2html-0.9.1-scalar.patch 1362 BLAKE2B 3f4f543aa68717c51cd84604cbdb818804007cce230baac3e9bcded96cc9bf283681e20a5802a21c86a7797eae96e05e9dc76af61726908d8d4622c848fc6c17 SHA512 dce486e436509c1bb923d5187aaa3ef9ce44a3f2d2d626cbc2e0df4b2ccfabd29e8ee86e2b494208fc3d1f226dd38aa5d56288c8a6bfa90db6794698dd8873e6
 DIST code2html-0.9.1-gentoo_patches.tar.bz2 2666 BLAKE2B 31c750aae9dbe9eddc77840a70535a5a6f1d495aa2015efe4afbded2481f2b7b171a95ab20ffcafd38a953170a6da0e8ccf895fded432ca7a16de6cdbc0d58d0 SHA512 cd478b53f0c11b9b4838a842bd8cb344698c85b1c3e09f03a75214f4002f4748a15f995530d6b6c743a4edb784c8aa703786ec10d3bda971b9485153e7090fdc
 DIST code2html-0.9.1.tar.gz 39811 BLAKE2B 57724d636d53066458b806266fc0a61e44919608ad44d65c540d0b6442e93acd822fcdc68c6c3279614b0887a9b7e6553e2de2c1a27679bd34c971ad1a05d70b SHA512 97fb8cadfe64a389711c58b13b7b5d977849f3a242c32a2456f93d7abd39f5d0a4152416f5c73aa05f151316ea0d8486b2b9923a5390eefec3e9d8253cc0b2d3
-EBUILD code2html-0.9.1-r2.ebuild 1025 BLAKE2B 63d8658b18d577abaf642bc6d0ce868a703294c77217806848799f8bb695215ecdc499db739ac189bd8a38d3306e8250011193dc6c715beda1093902789d94e2 SHA512 c321ed2fe69c976e24911434c1b2ddc8613ba4e4f36ebb99390297090c1aa9ab5f1c34741e7e5834e247c0c09d1ab7ec8986a9d57482154729451d84228cdd5a
+EBUILD code2html-0.9.1-r2.ebuild 985 BLAKE2B 3f7a6363d1f01741cc27bec0b1e69a18c8d427f87f148e2105dc1e162e009dace11067f3ef1e34224d752efbbad26803051b406941fc15a3290e46268167db1b SHA512 a7f2594e8d7baba79c74ef6b1cc70d824a2ffbc657869a39f0faea142d1375a0927426978486762f6dcc9a7f6f21bd170cb404ad5489183921a76c7ce52b1127
 MISC metadata.xml 363 BLAKE2B 7c3380eb1a4e1f2e83e72891a54030ee93e271468afff70a22034736f9a62475f2b275f8ec47b2e4d10de4aa5590987a04db1f0ea64b17b07bf163ced3a6ef3f SHA512 52e56f49ca7fa6b899f18be6602bd2e1c2987e5a4663593cc2e857a47e0f55637585801e656f79029e68d277a2b89d83f27953644fc778f6e7d425e2c3adb00f
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
index d56c83132575..37f32dd7a3c8 100644
--- a/app-text/code2html/code2html-0.9.1-r2.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r2.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 eutils prefix
+inherit prefix
 
 DESCRIPTION="Converts source files to colored HTML output"
 HOMEPAGE="http://www.palfrader.org/code2html/"
@@ -13,27 +13,30 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=dev-lang/perl-5"
 
-src_prepare() {
+PATCHES=(
 	# Be consistent in color codes (bug #119406)
-	epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
+	"${WORKDIR}"/${P}-lowercase_color_codes.patch
 
 	# Improved C++ support (bug #133159)
-	epatch "${WORKDIR}"/${P}-cpp_keywords.patch
+	"${WORKDIR}"/${P}-cpp_keywords.patch
 
 	# Improved Ada support (bug #133176)
-	epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+	"${WORKDIR}"/${P}-ada_identifiers.patch
 
 	# For prefix paths
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify code2html
+	"${FILESDIR}"/${P}-prefix.patch
 
 	# For newer Perl, bug 523610
-	epatch "${FILESDIR}"/${P}-scalar.patch
+	"${FILESDIR}"/${P}-scalar.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify code2html
 }
 
 src_install() {
diff --git a/app-text/code2html/files/code2html-0.9.1-prefix.patch b/app-text/code2html/files/code2html-0.9.1-prefix.patch
index cc27296fb71c..fbfc9d6b5356 100644
--- a/app-text/code2html/files/code2html-0.9.1-prefix.patch
+++ b/app-text/code2html/files/code2html-0.9.1-prefix.patch
@@ -1,5 +1,5 @@
---- code2html
-+++ code2html
+--- a/code2html
++++ b/code2html
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
diff --git a/app-text/code2html/files/code2html-0.9.1-scalar.patch b/app-text/code2html/files/code2html-0.9.1-scalar.patch
index eddc89a6a8f7..b8f56f1a7d1a 100644
--- a/app-text/code2html/files/code2html-0.9.1-scalar.patch
+++ b/app-text/code2html/files/code2html-0.9.1-scalar.patch
@@ -1,5 +1,5 @@
---- code2html.orig	2002-01-12 22:17:02.000000000 +0100
-+++ code2html	2014-09-24 13:52:52.000000000 +0200
+--- a/code2html
++++ b/code2html
 @@ -1357,7 +1357,7 @@
  								   my @lines = split ( /\n/, $_[0] );